Commit 9b8313c7 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 7ab28f7d
......@@ -22,6 +22,7 @@ Description[en_GB]=An ioslave for the Sieve mail filtering protocol
Description[es]=Un esclavo de E/S para el protocolo de filtrado de correo Sieve
Description[et]=Sieve kirjade filtreerimise protokolli IO-moodul
Description[fi]=I/O-asiakas Sieve-postinsuodatusyhteyskäytännölle
Description[fr]=Un module d'entrées / sorties pour le protocole de filtrage de courriel Sieve
Description[gl]=Un ioslave para o protocolo de filtrado de correo Sieve.
Description[ia]=Un ioslave (sclavo de i/e) per le protocollo per filtrar posta Sieve
Description[it]=Un IOSlave per il protocollo di filtraggio della posta Sieve
......
Supports Markdown
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