[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=b86e7f6

The following commit has been merged in the master branch:
commit b86e7f6301ae0e84fcdb05133177c781b5a60f4a
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Apr 21 13:23:33 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"
---
 kpeople/actionsplugin/ktp_kpeople_plugin.json            | 16 ++++++++--------
 .../datasourceplugin/im_persons_data_source_plugin.json  | 16 ++++++++--------
 kpeople/uiplugins/chatplugin/kpeople_chat_plugin.json    | 16 ++++++++--------
 kpeople/uiplugins/imdetailswidgetplugin.json             | 14 +++++++-------
 4 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/kpeople/actionsplugin/ktp_kpeople_plugin.json b/kpeople/actionsplugin/ktp_kpeople_plugin.json
index 700598b..4734285 100644
--- a/kpeople/actionsplugin/ktp_kpeople_plugin.json
+++ b/kpeople/actionsplugin/ktp_kpeople_plugin.json
@@ -1,18 +1,18 @@
 {
-    "Encoding": "UTF-8",
+    "Encoding": "UTF-8", 
     "KPlugin": {
         "Authors": [
             {
-                "Email": "daivdedmundson at kde.org",
+                "Email": "daivdedmundson at kde.org", 
                 "Name": "David Edmundson"
             }
-        ],
-        "EnabledByDefault": true,
-        "Id": "ktp",
-        "License": "LGPL",
+        ], 
+        "EnabledByDefault": true, 
+        "Id": "ktp", 
+        "License": "LGPL", 
         "ServiceTypes": [
             "KPeople/Plugin"
-        ],
+        ], 
         "Version": "0.1"
     }
-}
+}
\ No newline at end of file
diff --git a/kpeople/datasourceplugin/im_persons_data_source_plugin.json b/kpeople/datasourceplugin/im_persons_data_source_plugin.json
index a0272d0..a30435e 100644
--- a/kpeople/datasourceplugin/im_persons_data_source_plugin.json
+++ b/kpeople/datasourceplugin/im_persons_data_source_plugin.json
@@ -1,18 +1,18 @@
 {
-    "Encoding": "UTF-8",
+    "Encoding": "UTF-8", 
     "KPlugin": {
         "Authors": [
             {
-                "Email": "mklapetek at kde.org",
+                "Email": "mklapetek at kde.org", 
                 "Name": "Martin Klapetek"
             }
-        ],
-        "EnabledByDefault": true,
-        "Id": "IMProvider",
-        "License": "LGPL",
+        ], 
+        "EnabledByDefault": true, 
+        "Id": "IMProvider", 
+        "License": "LGPL", 
         "ServiceTypes": [
             "KPeople/DataSource"
-        ],
+        ], 
         "Version": "0.1"
     }
-}
+}
\ No newline at end of file
diff --git a/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.json b/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.json
index 60bd449..4443c87 100644
--- a/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.json
+++ b/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.json
@@ -1,18 +1,18 @@
 {
-    "Encoding": "UTF-8",
+    "Encoding": "UTF-8", 
     "KPlugin": {
         "Authors": [
             {
-                "Email": "nileshsuthar at live.in",
+                "Email": "nileshsuthar at live.in", 
                 "Name": "Nilesh Suthar"
             }
-        ],
-        "EnabledByDefault": true,
-        "Id": "kpeople",
-        "License": "LGPL",
+        ], 
+        "EnabledByDefault": true, 
+        "Id": "kpeople", 
+        "License": "LGPL", 
         "ServiceTypes": [
             "KPeople/Plugin"
-        ],
+        ], 
         "Version": "0.1"
     }
-}
+}
\ No newline at end of file
diff --git a/kpeople/uiplugins/imdetailswidgetplugin.json b/kpeople/uiplugins/imdetailswidgetplugin.json
index b9a8bcc..0a60826 100644
--- a/kpeople/uiplugins/imdetailswidgetplugin.json
+++ b/kpeople/uiplugins/imdetailswidgetplugin.json
@@ -2,16 +2,16 @@
     "KPlugin": {
         "Authors": [
             {
-                "Email": "davidedmundson at kde.org",
+                "Email": "davidedmundson at kde.org", 
                 "Name": "David Edmundson"
             }
-        ],
-        "Id": "imdetailswidgetplugin",
-        "License": "LGPL",
+        ], 
+        "Id": "imdetailswidgetplugin", 
+        "License": "LGPL", 
         "ServiceTypes": [
             "KPeopleWidgets/Plugin"
-        ],
+        ], 
         "Version": "0.1"
-    },
+    }, 
     "X-KPeople-Weight": "2"
-}
+}
\ No newline at end of file

-- 
ktp-common-internals packaging