[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:28:50 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=a0aa62d
The following commit has been merged in the master branch:
commit a0aa62dd041d9eb4ebb191d24eab475bcebc917f
Author: l10n daemon script <scripty at kde.org>
Date: Wed Jul 29 09:16:57 2015 +0000
SVN_SILENT made messages (.desktop file) - always resolve ours
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"
---
plugins/lockdevice/kdeconnect_lockdevice.json | 2 ++
plugins/remotecontrol/kdeconnect_remotecontrol.json | 2 ++
2 files changed, 4 insertions(+)
diff --git a/plugins/lockdevice/kdeconnect_lockdevice.json b/plugins/lockdevice/kdeconnect_lockdevice.json
index 0a909ac..80013cd 100644
--- a/plugins/lockdevice/kdeconnect_lockdevice.json
+++ b/plugins/lockdevice/kdeconnect_lockdevice.json
@@ -10,6 +10,7 @@
"Description": "Locks your systems",
"Description[ca]": "Bloqueja els vostres sistemes",
"Description[de]": "Sperrt Ihre Systeme",
+ "Description[es]": "Bloquear sus sistemas",
"Description[gl]": "Bloquea os seus sistemas.",
"Description[nl]": "Vergrendeld uw systemen",
"Description[pl]": "Zablokuj swoje systemy",
@@ -25,6 +26,7 @@
"Name": "LockDevice",
"Name[ca]": "Bloqueja el dispositiu",
"Name[de]": "Gerätesperrung",
+ "Name[es]": "Bloquear dispositivo",
"Name[gl]": "Bloqueo do dispositivo",
"Name[nl]": "Apparaat vergrendelen",
"Name[pl]": "ZablokujUrządzenie",
diff --git a/plugins/remotecontrol/kdeconnect_remotecontrol.json b/plugins/remotecontrol/kdeconnect_remotecontrol.json
index 4600a86..53f3ecf 100644
--- a/plugins/remotecontrol/kdeconnect_remotecontrol.json
+++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json
@@ -9,6 +9,7 @@
],
"Description": "Control Remote systems",
"Description[ca]": "Sistemes de control remot",
+ "Description[es]": "Controlar sistemas remotos",
"Description[gl]": "Controla sistemas remotos.",
"Description[nl]": "Systemen op afstand bedienen",
"Description[pl]": "Sterowanie zdalnymi systemami",
@@ -23,6 +24,7 @@
"License": "GPL",
"Name": "RemoteControl",
"Name[ca]": "Control remot",
+ "Name[es]": "Control remoto",
"Name[gl]": "Mando a distancia",
"Name[nl]": "Afstandsbediening",
"Name[pl]": "ZdalneSterowanie",
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list