Commit c95f769a 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 0f643d9c
......@@ -37,6 +37,7 @@
"Name[cs]": "Přijímat vzdálené příkazy",
"Name[da]": "Vært for eksterne kommandoer",
"Name[es]": "Órdenes en servidor remoto",
"Name[et]": "Kaugkäsud",
"Name[fi]": "Etäkomennot",
"Name[it]": "Comandi remoti host",
"Name[nl]": "Commando's op afstand hosten",
......
......@@ -15,6 +15,7 @@
"Description[da]": "Vis bekendtgørelser for opkald og SMS'er",
"Description[de]": "Benachrichtigungen für Anrufe und SMS anzeigen",
"Description[es]": "Mostrar notificaciones de llamadas y SMS",
"Description[et]": "Kõnede ja SMS-ide märguannete näitamine",
"Description[fi]": "Näytä puhelujen ja tekstiviestien ilmoitukset",
"Description[it]": "Mostra notifiche per le chiamate e per gli SMS",
"Description[nl]": "Meldingen tonen van oproepen en SMSjes",
......
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