Commit 0fa1abee 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 90d413d6
......@@ -2,6 +2,7 @@
Name=Email Providers
Name[ca]=Proveïdors de correu electrònic
Name[ca@valencia]=Proveïdors de correu electrònic
Name[cs]=Poskytovatelé e-mailu
Name[de]=E-Mail-Anbieter
Name[en_GB]=Email Providers
Name[es]=Proveedores de correo
......
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