Commit 44715803 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 83df9f1f
......@@ -4,6 +4,7 @@
"Description": "Send file to other device using KDE Connect",
"Description[ca]": "Envia fitxers a un altre dispositiu mitjançant el KDE Connect",
"Description[gl]": "Enviar o ficheiro a outro dispositivo usando KDE Connect",
"Description[it]": "Invia file a un altro dispositivo utilizzando KDE Connect",
"Description[nl]": "Bestand naar ander apparaat versturen met KDE Connect",
"Description[pt]": "Envia o ficheiro para outro dispositivo através do KDE Connect",
"Description[pt_BR]": "Envia o arquivo para outro dispositivo usando o KDE Connect",
......@@ -18,6 +19,7 @@
"Name": "Send file via KDE Connect",
"Name[ca]": "Envia el fitxer a través del KDE Connect",
"Name[gl]": "Enviar o ficheiro por KDE Connect",
"Name[it]": "Invia file tramite KDE Connect",
"Name[nl]": "Bestand via KDE Connect versturen",
"Name[pt]": "Enviar o ficheiro pelo KDE Connect",
"Name[pt_BR]": "Enviar arquivo via KDE Connect",
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