From 236c1c0305bf81603d57844303c665533a7fc570 Mon Sep 17 00:00:00 2001 From: ralf Date: Fri, 17 Feb 2023 20:09:52 +0100 Subject: [PATCH] Revert "fix commited git conflict" This reverts commit 47ef464c8a62fee016ca3ad8c72dad901f9daac2. --- addressbook/lang/egw_fr.lang | 3 +++ api/lang/egw_fi.lang | 1 - api/lang/egw_fr.lang | 1 + api/lang/egw_lv.lang | 1 - api/lang/egw_pt.lang | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/addressbook/lang/egw_fr.lang b/addressbook/lang/egw_fr.lang index bcec51c5fb..3c08fba4f7 100644 --- a/addressbook/lang/egw_fr.lang +++ b/addressbook/lang/egw_fr.lang @@ -1,7 +1,9 @@ +# addressbook fr # %1 added addressbook fr %1 ajouté %1 contact(s) %2 addressbook fr %1 contact(s) %2 %1 contact(s) %2, %3 failed because of %4 !!! addressbook fr %1 contact(s) %2, %3 en échec pour %4 !!! %1 contact(s) %2, %3 failed because of insufficent rights !!! addressbook fr %1 contact(s) %2, %3 en erreur (droits d'accès insuffisants). +%1 contact(s) added as %2 addressbook fr %1 contact(s) ajouté(s) comme %2 %1 contacts updated (%2 errors). addressbook fr %1 contacts mis à jour (%2 erreurs). %1 entries %2, %3 failed. addressbook fr %1 événement(s) %2, %3 en échec. %1 event(s) %2 addressbook fr %1 événement(s) %2 @@ -81,6 +83,7 @@ are you shure you want to delete this contact? addressbook fr Etes-vous sûr de are you sure you want to delete this field? addressbook fr Etes-vous sûr de vouloir effacer ce champ ? assistent addressbook fr Assistant(e) assistent phone addressbook fr Téléphone assistant(e) +audio call addressbook fr Appel audio birthday common fr Anniversaire birthdays common fr Anniversaires blank addressbook fr Vide diff --git a/api/lang/egw_fi.lang b/api/lang/egw_fi.lang index a9de0afcaa..1e2a6abe73 100644 --- a/api/lang/egw_fi.lang +++ b/api/lang/egw_fi.lang @@ -290,7 +290,6 @@ create link common fi Luo linkki created common fi Luotu created by common fi Luonut created by %1 common fi Luonut %1 -created by common fi Luonut creates an english ('en') langfile from label and helptexts (for application in name) common fi Luodaan englanninkielinen ('en') kielitiedosto otsikosta ja ohjetekstit creator preferences fi Luoja croatia common fi KROATIA diff --git a/api/lang/egw_fr.lang b/api/lang/egw_fr.lang index 7431512ba8..b484243a64 100644 --- a/api/lang/egw_fr.lang +++ b/api/lang/egw_fr.lang @@ -894,6 +894,7 @@ new egroupware release %1 available common fr La nouvelle version %1 de EGroupwa new entry added sucessfully common fr Nouvelle entrée ajoutée avec succès new favorite common fr Nouveau favoris new main category common fr Nouvelle catégorie principale +new password common fr Nouveau mot de passe new search common fr Nouvelle recherche new table created common fr Nouvelle table créée new value common fr Nouvelle valeur diff --git a/api/lang/egw_lv.lang b/api/lang/egw_lv.lang index 0b10baefc6..80a77e31e7 100644 --- a/api/lang/egw_lv.lang +++ b/api/lang/egw_lv.lang @@ -198,7 +198,6 @@ create link common lv Izveidot saiti created common lv Izveidota created by common lv Pateicoties created by %1 common lv Izveidoja %1 -created by common lv Pateicoties creates an english ('en') langfile from label and helptexts (for application in name) common lv izveido angļu ('en')langfile no iezīmes un palīgtekstiem croatia common lv HORVĀTIJA css class for the table-tag common lv CSS klase tabulas tagam diff --git a/api/lang/egw_pt.lang b/api/lang/egw_pt.lang index 00fca7a75a..2325521e1c 100644 --- a/api/lang/egw_pt.lang +++ b/api/lang/egw_pt.lang @@ -43,6 +43,7 @@ 80 (http) admin pt 80 (http) a pattern to be searched for common pt Um padrão a pesquisar abort common pt Abortar +about common pt Sobre about %1 common pt Sobre a aplicação %1 about egroupware common pt Sobre o EGroupware access common pt Acesso