tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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:
l10n daemon script 2015-10-12 10:38:12 +00:00
parent 1a464d6384
commit c4a499ca01
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/runcommand/kdeconnect_runcommand.json
View file

@ -43,6 +43,7 @@
"Name[pt]": "Executar comandos",
"Name[pt_BR]": "Executar comandos",
"Name[ru]": "Выполнение команд",
"Name[sk]": "Spustiť príkazy",
"Name[sv]": "Kör kommandon",
"Name[tr]": "Komut çalıştır",
"Name[uk]": "Виконання команд",