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-07-29 05:30:47 +02:00
parent 69698f3407
commit 3223397566
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
plugins/systemvolume/kdeconnect_systemvolume.json
View file

@ -4,15 +4,28 @@
"Authors": [ "Authors": [
{ {
"Email": "nicolas.fella@gmx.de", "Email": "nicolas.fella@gmx.de",
"Name": "Nicolas Fella" "Name": "Nicolas Fella",
"Name[x-test]": "xxNicolas Fellaxx"
} }
], ],
"Description": "Control the system volume from your phone", "Description": "Control the system volume from your phone",
"Description[ca]": "Controla el volum del sistema des del telèfon",
"Description[nl]": "Bestuur het systeemvolume vanaf uw telefoon",
"Description[pt]": "Controle o volume do sistema a partir do seu telemóvel",
"Description[sv]": "Kontrollera systemvolymen från telefonen",
"Description[uk]": "Керування системним томом з вашого телефону",
"Description[x-test]": "xxControl the system volume from your phonexx",
"EnabledByDefault": true, "EnabledByDefault": true,
"Icon": "audio-volume-high", "Icon": "audio-volume-high",
"Id": "kdeconnect_systemvolume", "Id": "kdeconnect_systemvolume",
"License": "GPL", "License": "GPL",
"Name": "System volume", "Name": "System volume",
"Name[ca]": "Volum del sistema",
"Name[nl]": "Systeemvolume",
"Name[pt]": "Volume do sistema",
"Name[sv]": "Systemvolym",
"Name[uk]": "Системний том",
"Name[x-test]": "xxSystem volumexx",
"ServiceTypes": [ "ServiceTypes": [
"KdeConnect/Plugin" "KdeConnect/Plugin"
], ],