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-29 09:16:57 +00:00
parent b37582308a
commit a0aa62dd04
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

@ -10,6 +10,7 @@
"Description": "Locks your systems", "Description": "Locks your systems",
"Description[ca]": "Bloqueja els vostres sistemes", "Description[ca]": "Bloqueja els vostres sistemes",
"Description[de]": "Sperrt Ihre Systeme", "Description[de]": "Sperrt Ihre Systeme",
"Description[es]": "Bloquear sus sistemas",
"Description[gl]": "Bloquea os seus sistemas.", "Description[gl]": "Bloquea os seus sistemas.",
"Description[nl]": "Vergrendeld uw systemen", "Description[nl]": "Vergrendeld uw systemen",
"Description[pl]": "Zablokuj swoje systemy", "Description[pl]": "Zablokuj swoje systemy",
@ -25,6 +26,7 @@
"Name": "LockDevice", "Name": "LockDevice",
"Name[ca]": "Bloqueja el dispositiu", "Name[ca]": "Bloqueja el dispositiu",
"Name[de]": "Gerätesperrung", "Name[de]": "Gerätesperrung",
"Name[es]": "Bloquear dispositivo",
"Name[gl]": "Bloqueo do dispositivo", "Name[gl]": "Bloqueo do dispositivo",
"Name[nl]": "Apparaat vergrendelen", "Name[nl]": "Apparaat vergrendelen",
"Name[pl]": "ZablokujUrządzenie", "Name[pl]": "ZablokujUrządzenie",

2
plugins/remotecontrol/kdeconnect_remotecontrol.json
View file

@ -9,6 +9,7 @@
], ],
"Description": "Control Remote systems", "Description": "Control Remote systems",
"Description[ca]": "Sistemes de control remot", "Description[ca]": "Sistemes de control remot",
"Description[es]": "Controlar sistemas remotos",
"Description[gl]": "Controla sistemas remotos.", "Description[gl]": "Controla sistemas remotos.",
"Description[nl]": "Systemen op afstand bedienen", "Description[nl]": "Systemen op afstand bedienen",
"Description[pl]": "Sterowanie zdalnymi systemami", "Description[pl]": "Sterowanie zdalnymi systemami",
@ -23,6 +24,7 @@
"License": "GPL", "License": "GPL",
"Name": "RemoteControl", "Name": "RemoteControl",
"Name[ca]": "Control remot", "Name[ca]": "Control remot",
"Name[es]": "Control remoto",
"Name[gl]": "Mando a distancia", "Name[gl]": "Mando a distancia",
"Name[nl]": "Afstandsbediening", "Name[nl]": "Afstandsbediening",
"Name[pl]": "ZdalneSterowanie", "Name[pl]": "ZdalneSterowanie",