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"
This commit is contained in:
parent
e11eca64af
commit
b0134a5881
1 changed files with 2 additions and 0 deletions
|
@ -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[en_GB]": "Send file to other device using KDE Connect",
|
||||
"Description[es]": "Enviar archivo a otro dispositivo usando 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",
|
||||
|
@ -23,6 +24,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[es]": "Enviar archivo con KDE Connect",
|
||||
"Name[et]": "Faili saatmine KDE Connecti kaudu",
|
||||
"Name[gl]": "Enviar o ficheiro por KDE Connect",
|
||||
"Name[it]": "Invia file tramite KDE Connect",
|
||||
|
|
Loading…
Reference in a new issue