Commit 7f1c511e 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 4a9cf6b0
......@@ -43,7 +43,7 @@ Icon=kmail
X-DocPath=sieveeditor/index.html
GenericName=Editor for email filter Sieve scripts
GenericName[ca]=Editor per als scripts de «Sieve» del filtratge de correu
GenericName[ca@valencia]=Editor per als scripts de «Sieve» de filtratge de correu
GenericName[ca@valencia]=Editor per als scripts de «Sieve» del filtratge de correu
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
......
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