[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=699be2f

The following commit has been merged in the master branch:
commit 699be2f8858eff99a1932ddbd815ab311dfa19f2
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Jan 2 10:36:03 2016 +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               | 4 ++++
 kpeople/datasourceplugin/im_persons_data_source_plugin.json | 2 ++
 kpeople/uiplugins/chatplugin/kpeople_chat_plugin.json       | 4 ++++
 kpeople/uiplugins/imdetailswidgetplugin.json                | 4 ++++
 4 files changed, 14 insertions(+)

diff --git a/kpeople/actionsplugin/ktp_kpeople_plugin.json b/kpeople/actionsplugin/ktp_kpeople_plugin.json
index d8915c2..ac54592 100644
--- a/kpeople/actionsplugin/ktp_kpeople_plugin.json
+++ b/kpeople/actionsplugin/ktp_kpeople_plugin.json
@@ -5,6 +5,10 @@
             {
                 "Email": "daivdedmundson at kde.org", 
                 "Name": "David Edmundson", 
+                "Name[sr at ijekavian]": "Дејвид Едмундсон", 
+                "Name[sr at ijekavianlatin]": "Dejvid Edmundson", 
+                "Name[sr at latin]": "Dejvid Edmundson", 
+                "Name[sr]": "Дејвид Едмундсон", 
                 "Name[x-test]": "xxDavid Edmundsonxx"
             }
         ], 
diff --git a/kpeople/datasourceplugin/im_persons_data_source_plugin.json b/kpeople/datasourceplugin/im_persons_data_source_plugin.json
index 95e4f36..d15cf7e 100644
--- a/kpeople/datasourceplugin/im_persons_data_source_plugin.json
+++ b/kpeople/datasourceplugin/im_persons_data_source_plugin.json
@@ -5,6 +5,8 @@
             {
                 "Email": "mklapetek at kde.org", 
                 "Name": "Martin Klapetek", 
+                "Name[sr at ijekavian]": "Мартин Клапетек", 
+                "Name[sr]": "Мартин Клапетек", 
                 "Name[x-test]": "xxMartin Klapetekxx"
             }
         ], 
diff --git a/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.json b/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.json
index 39bc96e..1bb94ac 100644
--- a/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.json
+++ b/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.json
@@ -5,6 +5,10 @@
             {
                 "Email": "nileshsuthar at live.in", 
                 "Name": "Nilesh Suthar", 
+                "Name[sr at ijekavian]": "Нилеш Сутар", 
+                "Name[sr at ijekavianlatin]": "Nileš Sutar", 
+                "Name[sr at latin]": "Nileš Sutar", 
+                "Name[sr]": "Нилеш Сутар", 
                 "Name[x-test]": "xxNilesh Sutharxx"
             }
         ], 
diff --git a/kpeople/uiplugins/imdetailswidgetplugin.json b/kpeople/uiplugins/imdetailswidgetplugin.json
index e650f4a..3c8def6 100644
--- a/kpeople/uiplugins/imdetailswidgetplugin.json
+++ b/kpeople/uiplugins/imdetailswidgetplugin.json
@@ -4,6 +4,10 @@
             {
                 "Email": "davidedmundson at kde.org", 
                 "Name": "David Edmundson", 
+                "Name[sr at ijekavian]": "Дејвид Едмундсон", 
+                "Name[sr at ijekavianlatin]": "Dejvid Edmundson", 
+                "Name[sr at latin]": "Dejvid Edmundson", 
+                "Name[sr]": "Дејвид Едмундсон", 
                 "Name[x-test]": "xxDavid Edmundsonxx"
             }
         ], 

-- 
ktp-common-internals packaging