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 2018-09-03 05:46:27 +02:00
parent 91d54b9db1
commit 5fb5af164c
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/systemvolume/kdeconnect_systemvolume.json
View file

@ -18,6 +18,7 @@
"Description[ko]": "휴대폰에서 시스템 음량 제어",
"Description[nl]": "Bestuur het systeemvolume vanaf uw telefoon",
"Description[pt]": "Controle o volume do sistema a partir do seu telemóvel",
"Description[pt_BR]": "Controle o volume do sistema com o seu telefone",
"Description[sv]": "Kontrollera systemvolymen från telefonen",
"Description[uk]": "Керування системним томом з вашого телефону",
"Description[x-test]": "xxControl the system volume from your phonexx",
@ -35,6 +36,7 @@
"Name[ko]": "시스템 음량",
"Name[nl]": "Systeemvolume",
"Name[pt]": "Volume do sistema",
"Name[pt_BR]": "Volume do sistema",
"Name[sv]": "Systemvolym",
"Name[uk]": "Системний том",
"Name[x-test]": "xxSystem volumexx",