holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix commited git conflict

Browse Source
This commit is contained in:
Ralf Becker 2023-02-17 19:34:35 +01:00
parent e19cef1c07
commit 47ef464c8a
5 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addressbook/lang/egw_fr.lang
View File

@ -1,9 +1,7 @@
# addressbook fr #
%1 added addressbook fr %1 ajouté %1 added addressbook fr %1 ajouté
%1 contact(s) %2 addressbook fr %1 contact(s) %2 %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 %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) %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 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 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 %1 event(s) %2 addressbook fr %1 événement(s) %2
@ -83,7 +81,6 @@ 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 ? 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 addressbook fr Assistant(e)
assistent phone addressbook fr Téléphone assistant(e) assistent phone addressbook fr Téléphone assistant(e)
audio call addressbook fr Appel audio
birthday common fr Anniversaire birthday common fr Anniversaire
birthdays common fr Anniversaires birthdays common fr Anniversaires
blank addressbook fr Vide blank addressbook fr Vide

1
api/lang/egw_fi.lang
View File

@ -290,6 +290,7 @@ create link common fi Luo linkki
created common fi Luotu created common fi Luotu
created by common fi Luonut created by common fi Luonut
created by %1 common fi Luonut %1 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 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 creator preferences fi Luoja
croatia common fi KROATIA croatia common fi KROATIA

1
api/lang/egw_fr.lang
View File

@ -894,7 +894,6 @@ 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 entry added sucessfully common fr Nouvelle entrée ajoutée avec succès
new favorite common fr Nouveau favoris new favorite common fr Nouveau favoris
new main category common fr Nouvelle catégorie principale new main category common fr Nouvelle catégorie principale
new password common fr Nouveau mot de passe
new search common fr Nouvelle recherche new search common fr Nouvelle recherche
new table created common fr Nouvelle table créée new table created common fr Nouvelle table créée
new value common fr Nouvelle valeur new value common fr Nouvelle valeur

1
api/lang/egw_lv.lang
View File

@ -198,6 +198,7 @@ create link common lv Izveidot saiti
created common lv Izveidota created common lv Izveidota
created by common lv Pateicoties created by common lv Pateicoties
created by %1 common lv Izveidoja %1 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')<i>langfile</i> no iezīmes un palīgtekstiem creates an english ('en') langfile from label and helptexts (for application in name) common lv izveido angļu ('en')<i>langfile</i> no iezīmes un palīgtekstiem
croatia common lv HORVĀTIJA croatia common lv HORVĀTIJA
css class for the table-tag common lv CSS klase tabulas tagam css class for the table-tag common lv CSS klase tabulas tagam

1
api/lang/egw_pt.lang
View File

@ -43,7 +43,6 @@
80 (http) admin pt 80 (http) 80 (http) admin pt 80 (http)
a pattern to be searched for common pt Um padrão a pesquisar a pattern to be searched for common pt Um padrão a pesquisar
abort common pt Abortar abort common pt Abortar
about common pt Sobre
about %1 common pt Sobre a aplicação %1 about %1 common pt Sobre a aplicação %1
about egroupware common pt Sobre o EGroupware about egroupware common pt Sobre o EGroupware
access common pt Acesso access common pt Acesso