[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=71874db

The following commit has been merged in the master branch:
commit 71874dbffb6a4fb120b9681a517ec4a82d75852f
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Sep 12 11:52:20 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/kdeconnect.desktop                          |  2 +
 kdeconnect-non-plasma.desktop                   |  4 ++
 plugins/findmyphone/kdeconnect_findmyphone.json | 56 ++++++++++++-------------
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/kcm/kdeconnect.desktop b/kcm/kdeconnect.desktop
index 3a85e71..078694b 100755
--- a/kcm/kdeconnect.desktop
+++ b/kcm/kdeconnect.desktop
@@ -8,7 +8,9 @@ Name[ca]=Arranjament del KDE Connect
 Name[cs]=Nastavení KDE Connect
 Name[es]=Ajustes de KDE Connect
 Name[fi]=KDE Connectin asetukset
+Name[hu]=A KDE Connect beállításai
 Name[nl]=Instellingen van KDE Connect
+Name[pl]=Ustawienia KDE Connect
 Name[pt]=Configuração do KDE Connect
 Name[pt_BR]=Configurações do KDE Connect
 Name[sv]=Inställning av KDE-anslut
diff --git a/kdeconnect-non-plasma.desktop b/kdeconnect-non-plasma.desktop
index 0ea49f9..4bbd85d 100755
--- a/kdeconnect-non-plasma.desktop
+++ b/kdeconnect-non-plasma.desktop
@@ -4,7 +4,9 @@ Name[ca]=Controlador del KDE Connect
 Name[cs]=Monitor KDE Connect
 Name[es]=Monitor de KDE Connect
 Name[fi]=KDE Connect -valvonta
+Name[hu]=KDE Connect monitor
 Name[nl]=KDE-Connectmonitor
+Name[pl]=Monitor KDE Connect
 Name[pt]=Monitor do KDE Connect
 Name[pt_BR]=Monitor do KDE Connect
 Name[sv]=KDE-anslut övervakning
@@ -16,7 +18,9 @@ Comment[ca]=Mostra la informació dels vostres dispositius
 Comment[cs]=Zobrazit informace o vašich zařízeních
 Comment[es]=Mostrar información sobre sus dispositivos
 Comment[fi]=Näyttää tietoa laitteistasi
+Comment[hu]=Információk megjelenítése az eszközeiről
 Comment[nl]=Toon informatie over uw apparaten
+Comment[pl]=Wyświetl informacje o twoich urządzeniach
 Comment[pt]=Mostrar informações sobre os seus dispositivos
 Comment[pt_BR]=Mostra informações sobre seus dispositivos
 Comment[sv]=Visa information om enheter
diff --git a/plugins/findmyphone/kdeconnect_findmyphone.json b/plugins/findmyphone/kdeconnect_findmyphone.json
index 075e8d1..731f7d5 100644
--- a/plugins/findmyphone/kdeconnect_findmyphone.json
+++ b/plugins/findmyphone/kdeconnect_findmyphone.json
@@ -1,29 +1,29 @@
 {
-   "KPlugin" : {
-   "Encoding" : "UTF-8",
-      "Name" : "Find My Phone",
-      "Description" : "Find your lost phone by making it play an alarm sound    ",
-      "Id" : "kdeconnect_findmyphone",
-      "Version" : "0.1",
-      "Authors" : [
-         {
-            "Name" : "Apoorv Parle",
-            "Email" : "apparle at gmail.com"
-         },
-         {
-            "Name" : "David Edmundson",
-            "Email" : "davidedmundson at kde.org"
-         }
-      ],
-      "License" : "GPL",
-      "EnabledByDefault" : true,
-      "ServiceTypes" : [
-         "KdeConnect/Plugin"
-      ],
-      "Website" : "http://kde.org",
-      "Icon" : "edit-find"
-   },
-   "X-KdeConnect-OutgoingPackageType" : [
-      "kdeconnect.findmyphone"
-   ]
-}
+    "KPlugin": {
+        "Authors": [
+            {
+                "Email": "apparle at gmail.com", 
+                "Name": "Apoorv Parle"
+            }, 
+            {
+                "Email": "davidedmundson at kde.org", 
+                "Name": "David Edmundson"
+            }
+        ], 
+        "Description": "Find your lost phone by making it play an alarm sound    ", 
+        "EnabledByDefault": true, 
+        "Encoding": "UTF-8", 
+        "Icon": "edit-find", 
+        "Id": "kdeconnect_findmyphone", 
+        "License": "GPL", 
+        "Name": "Find My Phone", 
+        "ServiceTypes": [
+            "KdeConnect/Plugin"
+        ], 
+        "Version": "0.1", 
+        "Website": "http://kde.org"
+    }, 
+    "X-KdeConnect-OutgoingPackageType": [
+        "kdeconnect.findmyphone"
+    ]
+}
\ No newline at end of file

-- 
kdeconnect packaging