Commit 14994132 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 b2a53c6d
......@@ -13,6 +13,7 @@
"Description[cs]": "Posílat a přijímat SMS",
"Description[fr]": "Envoyer et recevoir des SMS",
"Description[nl]": "SMS verzenden en ontvangen",
"Description[nn]": "Send og ta imot SMS-ar",
"Description[pt]": "Enviar e receber SMS's",
"Description[pt_BR]": "Envia e recebe SMS",
"Description[sv]": "Skicka och ta emot SMS",
......
......@@ -17,6 +17,7 @@
"Description[it]": "Controlla il volume di sistema dal tuo telefono",
"Description[ko]": "휴대폰에서 시스템 음량 제어",
"Description[nl]": "Bestuur het systeemvolume vanaf uw telefoon",
"Description[nn]": "Juster systemlydstyrken frå telefonen",
"Description[pt]": "Controle o volume do sistema a partir do seu telemóvel",
"Description[pt_BR]": "Controle o volume do sistema com o seu telefone",
"Description[sv]": "Kontrollera systemvolymen från telefonen",
......@@ -35,6 +36,7 @@
"Name[it]": "Volume di sistema",
"Name[ko]": "시스템 음량",
"Name[nl]": "Systeemvolume",
"Name[nn]": "Systemlydstyrke",
"Name[pt]": "Volume do sistema",
"Name[pt_BR]": "Volume do sistema",
"Name[sv]": "Systemvolym",
......
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