Commit 19bea396 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 4daf129c
......@@ -32,6 +32,7 @@
"Description[ca]": "Envia i rep SMS",
"Description[cs]": "Posílat a přijímat SMS",
"Description[de]": "Senden und Empfangen von SMS",
"Description[en_GB]": "Send and receive SMS",
"Description[es]": "Enviar y recibir SMS",
"Description[fr]": "Envoyer et recevoir des SMS",
"Description[gl]": "Enviar e recibir SMS",
......@@ -53,6 +54,7 @@
"Name[ca]": "SMS",
"Name[cs]": "SMS",
"Name[de]": "SMS",
"Name[en_GB]": "SMS",
"Name[es]": "SMS",
"Name[fr]": "SMS",
"Name[gl]": "SMS",
......
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