Commit 7cb10856 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 555de7a6
......@@ -45,6 +45,7 @@ GenericName=Editor for email filter Sieve scripts
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[en_GB]=Editor for email filter Sieve scripts
GenericName[it]=Editor di script per i filtri Sieve della posta elettronica
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
......
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