Commit 6bd8a31c authored by Script Kiddy's avatar Script Kiddy

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 be8a846c
......@@ -83,6 +83,7 @@ Comment[ca]=Edita els filtres «Sieve» per a IMAP
Comment[ca@valencia]=Edita els filtres «Sieve» per a IMAP
Comment[cs]=Upravit filtry IMAP Sieve
Comment[es]=Editar filtros IMAP de Sieve
Comment[fr]=Modifier les filtres Sieve IMAP
Comment[it]=Modifica i filtri Sieve per IMAP
Comment[nl]=IMAP Sievefilters bewerken
Comment[pl]=Edytuj filtry IMAP Sieve
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