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-07-24 09:52:53 +00:00
parent 647d09b6fc
commit bf51ceb600
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/lockdevice/kdeconnect_lockdevice.json
View file

@ -12,6 +12,7 @@
"Description[gl]": "Bloquea os seus sistemas.", "Description[gl]": "Bloquea os seus sistemas.",
"Description[nl]": "Vergrendeld uw systemen", "Description[nl]": "Vergrendeld uw systemen",
"Description[pt]": "Bloqueia os seus sistemas", "Description[pt]": "Bloqueia os seus sistemas",
"Description[pt_BR]": "Bloqueia seus sistemas",
"Description[sv]": "Låser dina system", "Description[sv]": "Låser dina system",
"Description[uk]": "Блокує вашу систему", "Description[uk]": "Блокує вашу систему",
"Description[x-test]": "xxLocks your systemsxx", "Description[x-test]": "xxLocks your systemsxx",
@ -24,6 +25,7 @@
"Name[gl]": "Bloqueo do dispositivo", "Name[gl]": "Bloqueo do dispositivo",
"Name[nl]": "Apparaat vergrendelen", "Name[nl]": "Apparaat vergrendelen",
"Name[pt]": "Bloqueio de Dispositivo", "Name[pt]": "Bloqueio de Dispositivo",
"Name[pt_BR]": "Bloqueio de dispositivo",
"Name[sv]": "Lås enhet", "Name[sv]": "Lås enhet",
"Name[uk]": "LockDevice", "Name[uk]": "LockDevice",
"Name[x-test]": "xxLockDevicexx", "Name[x-test]": "xxLockDevicexx",

2
plugins/remotecontrol/kdeconnect_remotecontrol.json
View file

@ -12,6 +12,7 @@
"Description[gl]": "Controla sistemas remotos.", "Description[gl]": "Controla sistemas remotos.",
"Description[nl]": "Systemen op afstand bedienen", "Description[nl]": "Systemen op afstand bedienen",
"Description[pt]": "Comandar sistemas à distância", "Description[pt]": "Comandar sistemas à distância",
"Description[pt_BR]": "Controle remoto de sistemas",
"Description[sv]": "Styr fjärrsystem", "Description[sv]": "Styr fjärrsystem",
"Description[uk]": "Системи віддаленого керування", "Description[uk]": "Системи віддаленого керування",
"Description[x-test]": "xxControl Remote systemsxx", "Description[x-test]": "xxControl Remote systemsxx",
@ -24,6 +25,7 @@
"Name[gl]": "Mando a distancia", "Name[gl]": "Mando a distancia",
"Name[nl]": "Afstandsbediening", "Name[nl]": "Afstandsbediening",
"Name[pt]": "Comando à Distância", "Name[pt]": "Comando à Distância",
"Name[pt_BR]": "Controle remoto",
"Name[sv]": "Fjärrkontroll", "Name[sv]": "Fjärrkontroll",
"Name[uk]": "RemoteControl", "Name[uk]": "RemoteControl",
"Name[x-test]": "xxRemoteControlxx", "Name[x-test]": "xxRemoteControlxx",