Commit 542e503b 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 9c910424
......@@ -18,7 +18,7 @@ Name[gl]=Enviar por KDE Connect
Name[it]=Invia tramite KDE Connect
Name[ko]=KDE Connect로 통해 보내기
Name[lt]=Siųsti per KDE Connect
Name[nl]=Via KDE Connect versturen
Name[nl]=Via KDE Connect verzenden
Name[nn]=Send via KDE Connect
Name[pl]=Wyślij przez KDE Connect
Name[pt]=Enviar pelo KDE Connect
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