Commit e11eca64 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 646aecc4
Pipeline #11304 failed with stage
in 6 minutes and 33 seconds
......@@ -3,6 +3,7 @@
"Category": "Utilities",
"Description": "Send file to other device using KDE Connect",
"Description[ca]": "Envia fitxers a un altre dispositiu mitjançant el KDE Connect",
"Description[en_GB]": "Send file to other device using KDE Connect",
"Description[et]": "Faili saatmine teise seadmesse KDE Connecti kaudu",
"Description[gl]": "Enviar o ficheiro a outro dispositivo usando KDE Connect",
"Description[it]": "Invia file a un altro dispositivo utilizzando KDE Connect",
......@@ -21,6 +22,7 @@
],
"Name": "Send file via KDE Connect",
"Name[ca]": "Envia el fitxer a través del KDE Connect",
"Name[en_GB]": "Send file via KDE Connect",
"Name[et]": "Faili saatmine KDE Connecti kaudu",
"Name[gl]": "Enviar o ficheiro por KDE Connect",
"Name[it]": "Invia file tramite 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