Commit 58e2f142 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 595e8d9a
......@@ -97,7 +97,6 @@
"Name[fr]": "Partager et recevoir",
"Name[gl]": "Compartir e recibir",
"Name[hu]": "Megosztás és fogadás",
"Name[id]": "Share and receive",
"Name[it]": "Condividi e ricevi",
"Name[ja]": "共有と受信",
"Name[ko]": "공유하고 받기",
......@@ -41,6 +41,7 @@
"Description[fi]": "Lähetä ja vastaanota tekstiviestejä",
"Description[fr]": "Envoyer et recevoir des SMS",
"Description[gl]": "Enviar e recibir SMS",
"Description[id]": "Kirim dan terima SMS",
"Description[it]": "Invia e riceve SMS",
"Description[ja]": "SMS を送受信",
"Description[nl]": "SMS verzenden en ontvangen",
......@@ -6,6 +6,7 @@ Name[en_GB]=KDE Connect SMS URL Handler
Name[es]=Controlador de URL de SMS de KDE Connect
Name[gl]=Xestor de URL de SMS de KDE Connect
Name[nl]=URL behandelaar van KDE-Connect-SMS
Name[nn]=SMS-URL-handsamar for KDE Connect
Name[pt]=Tratamento de URL's de SMS do KDE Connect
Name[pt_BR]=Tratamento de URLs de SMS do KDE Connect
Name[sv]=KDE-anslut hanterare av SMS-webbadress
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