[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:28:49 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=bf51ceb
The following commit has been merged in the master branch:
commit bf51ceb600267276317b92a1f2bbb0135fd47ad2
Author: l10n daemon script <scripty at kde.org>
Date: Fri Jul 24 09:52:53 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 4a5a564..6b52471 100644
--- a/plugins/lockdevice/kdeconnect_lockdevice.json
+++ b/plugins/lockdevice/kdeconnect_lockdevice.json
@@ -12,6 +12,7 @@
"Description[gl]": "Bloquea os seus sistemas.",
"Description[nl]": "Vergrendeld uw systemen",
"Description[pt]": "Bloqueia os seus sistemas",
+ "Description[pt_BR]": "Bloqueia seus sistemas",
"Description[sv]": "Låser dina system",
"Description[uk]": "Блокує вашу систему",
"Description[x-test]": "xxLocks your systemsxx",
@@ -24,6 +25,7 @@
"Name[gl]": "Bloqueo do dispositivo",
"Name[nl]": "Apparaat vergrendelen",
"Name[pt]": "Bloqueio de Dispositivo",
+ "Name[pt_BR]": "Bloqueio de dispositivo",
"Name[sv]": "Lås enhet",
"Name[uk]": "LockDevice",
"Name[x-test]": "xxLockDevicexx",
diff --git a/plugins/remotecontrol/kdeconnect_remotecontrol.json b/plugins/remotecontrol/kdeconnect_remotecontrol.json
index ed7b581..134a73e 100644
--- a/plugins/remotecontrol/kdeconnect_remotecontrol.json
+++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json
@@ -12,6 +12,7 @@
"Description[gl]": "Controla sistemas remotos.",
"Description[nl]": "Systemen op afstand bedienen",
"Description[pt]": "Comandar sistemas à distância",
+ "Description[pt_BR]": "Controle remoto de sistemas",
"Description[sv]": "Styr fjärrsystem",
"Description[uk]": "Системи віддаленого керування",
"Description[x-test]": "xxControl Remote systemsxx",
@@ -24,6 +25,7 @@
"Name[gl]": "Mando a distancia",
"Name[nl]": "Afstandsbediening",
"Name[pt]": "Comando à Distância",
+ "Name[pt_BR]": "Controle remoto",
"Name[sv]": "Fjärrkontroll",
"Name[uk]": "RemoteControl",
"Name[x-test]": "xxRemoteControlxx",
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list