Commit 9e988c6d 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 cb67dc31
......@@ -46,6 +46,7 @@ GenericName[ca]=Editor per als scripts de «Sieve» de filtratge de correu
GenericName[ca@valencia]=Editor per als scripts de «Sieve» de filtratge de correu
GenericName[nl]=Bewerker voor Sieve-scripts met e-mailfilters
GenericName[pt]=Editor de programas de filtros de e-mail Sieve
GenericName[sv]=Editor av Sieve-skript för filtrering av e-post
GenericName[uk]=Редактор скриптів фільтрування електронної пошти
GenericName[x-test]=xxEditor for email filter Sieve scriptsxx
Comment=Edit IMAP Sieve filters
......
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