Commit a0c6047a 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 4bd207e8
......@@ -11,6 +11,7 @@
"Description[ca]": "Envia i rep SMS",
"Description[nl]": "SMS verzenden en ontvangen",
"Description[pt]": "Enviar e receber SMS's",
"Description[pt_BR]": "Envia e recebe SMS",
"Description[uk]": "Надсилання і отримання SMS",
"Description[x-test]": "xxSend and receive SMSxx",
"EnabledByDefault": true,
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment