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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit a794d51c4e461e7581b4839fa6e2bf03ff24b3be
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Jul 21 15:07:44 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"
---
 kcm/kcm_kdeconnect.desktop                          | 2 +-
 plugins/battery/kdeconnect_battery.json             | 1 +
 plugins/clipboard/kdeconnect_clipboard.json         | 1 +
 plugins/notifications/kdeconnect_notifications.json | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop
index 09d519a..874e3ec 100755
--- a/kcm/kcm_kdeconnect.desktop
+++ b/kcm/kcm_kdeconnect.desktop
@@ -75,7 +75,7 @@ X-KDE-Keywords[nl]=Netwerk,Android,Apparaten
 X-KDE-Keywords[pl]=Sieć,Android,Urządzenia
 X-KDE-Keywords[pt]=Rede,Android,Dispositivos
 X-KDE-Keywords[pt_BR]=Rede,Android,Dispositivos
-X-KDE-Keywords[ru]=Network,Android,Devices,сеть,Андроид, устройства
+X-KDE-Keywords[ru]=Network,Android,Devices,сеть,Андроид,устройства
 X-KDE-Keywords[sk]=Sieť,Android,Zariadenia
 X-KDE-Keywords[sv]=Nätverk, Android, apparater
 X-KDE-Keywords[tr]=Ağ,Android,Cihazlar,Aygıtlar
diff --git a/plugins/battery/kdeconnect_battery.json b/plugins/battery/kdeconnect_battery.json
index 98410fe..bb29e18 100644
--- a/plugins/battery/kdeconnect_battery.json
+++ b/plugins/battery/kdeconnect_battery.json
@@ -45,6 +45,7 @@
         "Name[pl]": "Monitor baterii", 
         "Name[pt]": "Monitor da bateria", 
         "Name[pt_BR]": "Monitor de bateria", 
+        "Name[ru]": "Индикатор батареи", 
         "Name[sk]": "Monitor batérie", 
         "Name[sv]": "Batteriövervakare", 
         "Name[tr]": "Pil izleyici", 
diff --git a/plugins/clipboard/kdeconnect_clipboard.json b/plugins/clipboard/kdeconnect_clipboard.json
index d2bc73c..4bb8541 100644
--- a/plugins/clipboard/kdeconnect_clipboard.json
+++ b/plugins/clipboard/kdeconnect_clipboard.json
@@ -45,6 +45,7 @@
         "Name[pl]": "Schowek", 
         "Name[pt]": "Área de Transferência", 
         "Name[pt_BR]": "Área de transferência", 
+        "Name[ru]": "Буфер обмена", 
         "Name[sk]": "Schránka", 
         "Name[sv]": "Klippbord", 
         "Name[tr]": "Geçici taşıma panosu", 
diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json
index f36afad..cdf9dfe 100644
--- a/plugins/notifications/kdeconnect_notifications.json
+++ b/plugins/notifications/kdeconnect_notifications.json
@@ -42,6 +42,7 @@
         "Name[pl]": "Powiadomienia synchronizacji", 
         "Name[pt]": "Sincronização de notificações", 
         "Name[pt_BR]": "Sincronização de notificações", 
+        "Name[ru]": "Синхронизация уведомлений", 
         "Name[sk]": "Synchronizácia pripomienok", 
         "Name[sv]": "Underrättelsesynkronisering", 
         "Name[tr]": "Bildirim eşitleme", 

-- 
kdeconnect packaging