Commit a98533b8 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 1e9a1f93
......@@ -14,6 +14,7 @@
"Description[de]": "Senden und Empfangen von SMS",
"Description[es]": "Enviar y recibir SMS",
"Description[fr]": "Envoyer et recevoir des SMS",
"Description[gl]": "Enviar e recibir SMS",
"Description[it]": "Invia e ricevi SMS",
"Description[nl]": "SMS verzenden en ontvangen",
"Description[nn]": "Send og ta imot SMS-ar",
......
......@@ -14,6 +14,7 @@
"Description[cs]": "Ovládejte hlasitost systému z vašeho telefonu",
"Description[es]": "Controle el volumen del sistema desde su teléfono",
"Description[fr]": "Contrôler le volume du système depuis votre téléphone",
"Description[gl]": "Controlar o volume do sistema desde o teléfono",
"Description[it]": "Controlla il volume di sistema dal tuo telefono",
"Description[ko]": "휴대폰에서 시스템 음량 제어",
"Description[nl]": "Bestuur het systeemvolume vanaf uw telefoon",
......@@ -34,6 +35,7 @@
"Name[cs]": "Hlasitost systému",
"Name[es]": "Volumen del sistema",
"Name[fr]": "Volume du système",
"Name[gl]": "Volume do sistema",
"Name[it]": "Volume di sistema",
"Name[ko]": "시스템 음량",
"Name[nl]": "Systeemvolume",
......
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