[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

Maximiliano Curia maxy at moszumanska.debian.org
Fri Oct 14 14:28:54 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=e6a759a

The following commit has been merged in the master branch:
commit e6a759a071b4b670a7f250cb66117e9cc19bb82e
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Sep 1 12:31:29 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"
---
 app/org.kde.kdeconnect.app.desktop                  | 3 +++
 kcm/kcm_kdeconnect.desktop                          | 1 +
 kcm/kdeconnect.desktop                              | 1 +
 plugins/lockdevice/kdeconnect_lockdevice.json       | 2 ++
 plugins/mprisremote/kdeconnect_mprisremote.json     | 2 ++
 plugins/notifications/kdeconnect_notifications.json | 1 +
 plugins/remotecontrol/kdeconnect_remotecontrol.json | 2 ++
 7 files changed, 12 insertions(+)

diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop
index 838f8ff..29c5fef 100644
--- a/app/org.kde.kdeconnect.app.desktop
+++ b/app/org.kde.kdeconnect.app.desktop
@@ -16,6 +16,7 @@ Name[sv]=Programmet KDE-anslut
 Name[tr]=KDE Bağlantı Uygulaması
 Name[uk]=Програма KDE Connect
 Name[x-test]=xxKDE Connect Applicationxx
+Name[zh_CN]=KDE Connect 应用程序
 GenericName=Device Synchronization
 GenericName[ca]=Sincronització de dispositius
 GenericName[cs]=Synchronizace zařízení
@@ -33,6 +34,7 @@ GenericName[sv]=Enhetssynkronisering
 GenericName[tr]=Aygıt Eşzamanlaması
 GenericName[uk]=Синхронізація із пристроями
 GenericName[x-test]=xxDevice Synchronizationxx
+GenericName[zh_CN]=设备同步
 Comment=Make all your devices one
 Comment[ca]=Fa que tots els vostres dispositius siguin un
 Comment[cs]=Sjednoťte svá zařízení
@@ -50,6 +52,7 @@ Comment[sv]=Gör alla enheter till en
 Comment[tr]=Tüm aygıtlarınızı birleştirin
 Comment[uk]=Поєднайте усі ваші пристрої
 Comment[x-test]=xxMake all your devices onexx
+Comment[zh_CN]=连接您所有设备
 Exec=kcapp
 Icon=kdeconnect
 Type=Application
diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop
index 874e3ec..4c6469c 100755
--- a/kcm/kcm_kdeconnect.desktop
+++ b/kcm/kcm_kdeconnect.desktop
@@ -55,6 +55,7 @@ Comment[sv]=Anslut och synkronisera dina apparater
 Comment[tr]=Aygıtlarınıza bağlanın ve eşitleyin
 Comment[uk]=З’єднання і синхронізація ваших пристроїв
 Comment[x-test]=xxConnect and sync your devicesxx
+Comment[zh_CN]=连接并同步您的设备
 
 X-KDE-Keywords=Network,Android,Devices
 X-KDE-Keywords[bg]=Мрежа,Андроид,Устройства
diff --git a/kcm/kdeconnect.desktop b/kcm/kdeconnect.desktop
index a35f2d4..1bbf54f 100755
--- a/kcm/kdeconnect.desktop
+++ b/kcm/kdeconnect.desktop
@@ -47,5 +47,6 @@ GenericName[sv]=Anslut och synkronisera dina apparater
 GenericName[tr]=Aygıtlarınıza bağlanın ve eşitleyin
 GenericName[uk]=З’єднання і синхронізація ваших пристроїв
 GenericName[x-test]=xxConnect and sync your devicesxx
+GenericName[zh_CN]=连接并同步您的设备
 Categories=Qt;KDE;Settings;HardwareSettings;
 NotShowIn=KDE;
diff --git a/plugins/lockdevice/kdeconnect_lockdevice.json b/plugins/lockdevice/kdeconnect_lockdevice.json
index c8e085a..bbc33a8 100644
--- a/plugins/lockdevice/kdeconnect_lockdevice.json
+++ b/plugins/lockdevice/kdeconnect_lockdevice.json
@@ -24,6 +24,7 @@
         "Description[tr]": "Sistemlerinizi kilitler", 
         "Description[uk]": "Блокує вашу систему", 
         "Description[x-test]": "xxLocks your systemsxx", 
+        "Description[zh_CN]": "锁定您的系统", 
         "EnabledByDefault": true, 
         "Icon": "applications-miscelaneaous", 
         "Id": "kdeconnect_lockdevice", 
@@ -45,6 +46,7 @@
         "Name[tr]": "AygıtıKilitle", 
         "Name[uk]": "LockDevice", 
         "Name[x-test]": "xxLockDevicexx", 
+        "Name[zh_CN]": "锁定设备", 
         "ServiceTypes": [
             "KdeConnect/Plugin"
         ], 
diff --git a/plugins/mprisremote/kdeconnect_mprisremote.json b/plugins/mprisremote/kdeconnect_mprisremote.json
index a6b4c15..9f852f1 100644
--- a/plugins/mprisremote/kdeconnect_mprisremote.json
+++ b/plugins/mprisremote/kdeconnect_mprisremote.json
@@ -24,6 +24,7 @@
         "Description[tr]": "MPRIS servislerini kontrol et", 
         "Description[uk]": "Керування службами MPRIS", 
         "Description[x-test]": "xxControl MPRIS servicesxx", 
+        "Description[zh_CN]": "控制 MPRIS 服务", 
         "EnabledByDefault": true, 
         "Icon": "applications-multimedia", 
         "Id": "kdeconnect_mprisremote", 
@@ -45,6 +46,7 @@
         "Name[tr]": "MprisRemote", 
         "Name[uk]": "MprisRemote", 
         "Name[x-test]": "xxMprisRemotexx", 
+        "Name[zh_CN]": "远程 Mpris", 
         "ServiceTypes": [
             "KdeConnect/Plugin"
         ], 
diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json
index cdf9dfe..878622d 100644
--- a/plugins/notifications/kdeconnect_notifications.json
+++ b/plugins/notifications/kdeconnect_notifications.json
@@ -24,6 +24,7 @@
         "Description[tr]": "Telefon bildirimlerini bilgisayarınızla eşitler ve eşzamanlı tutar", 
         "Description[uk]": "Показ сповіщень з телефону на вашому комп’ютері та підтримання синхронізації даних сповіщень", 
         "Description[x-test]": "xxShow phone notifications on your computer and keep them in syncxx", 
+        "Description[zh_CN]": "在电脑显示手机通知并保持同步", 
         "EnabledByDefault": true, 
         "Icon": "preferences-desktop-notification", 
         "Id": "kdeconnect_notifications", 
diff --git a/plugins/remotecontrol/kdeconnect_remotecontrol.json b/plugins/remotecontrol/kdeconnect_remotecontrol.json
index e43b6ba..7f56b8f 100644
--- a/plugins/remotecontrol/kdeconnect_remotecontrol.json
+++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json
@@ -23,6 +23,7 @@
         "Description[tr]": "Uzak Sistemleri Kontrol Et", 
         "Description[uk]": "Системи віддаленого керування", 
         "Description[x-test]": "xxControl Remote systemsxx", 
+        "Description[zh_CN]": "控制远程系统", 
         "EnabledByDefault": true, 
         "Icon": "applications-multimedia", 
         "Id": "kdeconnect_remotecontrol", 
@@ -43,6 +44,7 @@
         "Name[tr]": "UzaktanKumanda", 
         "Name[uk]": "RemoteControl", 
         "Name[x-test]": "xxRemoteControlxx", 
+        "Name[zh_CN]": "远程控制", 
         "ServiceTypes": [
             "KdeConnect/Plugin"
         ], 

-- 
kdeconnect packaging



More information about the pkg-kde-commits mailing list