Commit a4bf8a39 authored by Script Kiddy's avatar Script Kiddy
Browse files

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent ea0e7eef
Pipeline #23944 passed with stage
in 11 minutes and 45 seconds
......@@ -11,6 +11,7 @@ Name[el]=Επεξεργαστής Sieve
Name[en_GB]=Sieve Editor
Name[es]=Editor de Sieve
Name[et]=Sieve redaktor
Name[eu]=Sieve editorea
Name[fi]=Sieve-muokkain
Name[fr]=Éditeur Sieve
Name[gl]=Editor de Sieve
......@@ -48,6 +49,7 @@ GenericName[de]=Editor für Sieve-Skripte zum Filtern von E-Mails
GenericName[en_GB]=Editor for email filter Sieve scripts
GenericName[es]=Editor para filtrado de correo con giones Sieve
GenericName[et]=E-posti filtri Sieve skriptide redaktor
GenericName[eu]=E-posta iragazteko Sieve scripten editorea
GenericName[fi]=Sähköpostin Sieve-komentosarjamuokkain
GenericName[fr]=Éditeur de scripts « Sieve » de filtrage de courriels
GenericName[gl]=Editor de scripts de Sieve para filtrar mensaxes de correo electrónico
......@@ -73,6 +75,7 @@ Comment[de]=IMAP-Sieve-Filter bearbeiten
Comment[en_GB]=Edit IMAP Sieve filters
Comment[es]=Editar filtros IMAP de Sieve
Comment[et]=IMAP Sieve filtrite muutmine
Comment[eu]=Editatu IMAP Sieve iragaziak
Comment[fi]=Muokkaa IMAPin Sieve-suodattimia
Comment[fr]=Modifier les filtres Sieve IMAP
Comment[gl]=Editar os filtros de Sieve de IMAP.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment