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-08-11 13:21:00 +00:00
parent f3411bb8dd
commit ce354aae44
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/lockdevice/kdeconnect_lockdevice.json
View file

@ -9,6 +9,7 @@
],
"Description": "Locks your systems",
"Description[ca]": "Bloqueja els vostres sistemes",
"Description[cs]": "Zamkne vaše systémy",
"Description[de]": "Sperrt Ihre Systeme",
"Description[es]": "Bloquear sus sistemas",
"Description[fi]": "Lukitsee järjestelmäsi",
@ -20,6 +21,7 @@
"Description[pt_BR]": "Bloqueia seus sistemas",
"Description[sk]": "Zamkne vaše systémy",
"Description[sv]": "Låser dina system",
"Description[tr]": "Sistemlerinizi kilitler",
"Description[uk]": "Блокує вашу систему",
"Description[x-test]": "xxLocks your systemsxx",
"EnabledByDefault": true,
@ -28,6 +30,7 @@
"License": "GPL",
"Name": "LockDevice",
"Name[ca]": "Bloqueja el dispositiu",
"Name[cs]": "Uzamknout zařízení",
"Name[de]": "Gerätesperrung",
"Name[es]": "Bloquear dispositivo",
"Name[fi]": "Lukitse laite",
@ -39,6 +42,7 @@
"Name[pt_BR]": "Bloqueio de dispositivo",
"Name[sk]": "Zamknúť zariadenie",
"Name[sv]": "Lås enhet",
"Name[tr]": "AygıtıKilitle",
"Name[uk]": "LockDevice",
"Name[x-test]": "xxLockDevicexx",
"ServiceTypes": [

4
plugins/remotecontrol/kdeconnect_remotecontrol.json
View file

@ -9,6 +9,7 @@
],
"Description": "Control Remote systems",
"Description[ca]": "Sistemes de control remot",
"Description[cs]": "Ovládejte vzdálené systémy",
"Description[es]": "Controlar sistemas remotos",
"Description[fi]": "Ohjaa järjestelmiä etänä",
"Description[gl]": "Controla sistemas remotos.",
@ -19,6 +20,7 @@
"Description[pt_BR]": "Controle remoto de sistemas",
"Description[sk]": "Ovládať vzdialené systémy",
"Description[sv]": "Styr fjärrsystem",
"Description[tr]": "Uzak Sistemleri Kontrol Et",
"Description[uk]": "Системи віддаленого керування",
"Description[x-test]": "xxControl Remote systemsxx",
"EnabledByDefault": true,
@ -27,6 +29,7 @@
"License": "GPL",
"Name": "RemoteControl",
"Name[ca]": "Control remot",
"Name[cs]": "Dálkové ovládání",
"Name[es]": "Control remoto",
"Name[fi]": "Kauko-ohjain",
"Name[gl]": "Mando a distancia",
@ -37,6 +40,7 @@
"Name[pt_BR]": "Controle remoto",
"Name[sk]": "Diaľkové ovládanie",
"Name[sv]": "Fjärrkontroll",
"Name[tr]": "UzaktanKumanda",
"Name[uk]": "RemoteControl",
"Name[x-test]": "xxRemoteControlxx",
"ServiceTypes": [