Commit f145ef88 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 c1c206eb
......@@ -11,6 +11,7 @@
"Description[ca@valencia]": "Envia i rep SMS",
"Description[ca]": "Envia i rep SMS",
"Description[cs]": "Posílat a přijímat SMS",
"Description[es]": "Enviar y recibir SMS",
"Description[fr]": "Envoyer et recevoir des SMS",
"Description[it]": "Invia e ricevi SMS",
"Description[nl]": "SMS verzenden en ontvangen",
......
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