[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=b00b702

The following commit has been merged in the master branch:
commit b00b70226063b4bd0b5c886087f8b69b582cd590
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Dec 30 09:34:23 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"
---
 data/ktelepathy.notifyrc                                    | 8 ++++----
 kpeople/actionsplugin/ktp_kpeople_plugin.json               | 3 ++-
 kpeople/datasourceplugin/im_persons_data_source_plugin.json | 3 ++-
 kpeople/uiplugins/chatplugin/kpeople_chat_plugin.json       | 3 ++-
 kpeople/uiplugins/imdetailswidgetplugin.json                | 3 ++-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/data/ktelepathy.notifyrc b/data/ktelepathy.notifyrc
index 05e4492..e8b8a97 100644
--- a/data/ktelepathy.notifyrc
+++ b/data/ktelepathy.notifyrc
@@ -1258,7 +1258,7 @@ Comment[it]=Un messaggio è stato filtrato dall'estensione di riservatezza
 Comment[kk]=Бір хабарлама Дербестік плагиннің сүзгісінен өтпеді
 Comment[km]=សារ​ត្រូវ​បាន​ត្រង​ដោយ​កម្មវិធី​ជំនួយ​ភាព​ឯកជន
 Comment[ko]=개인 정보 보호 플러그인에서 메시지를 거부함
-Comment[lt]=Privatumo įskiepio filtras atmetė žinutę
+Comment[lt]=Privatumo papildinio filtras atmetė žinutę
 Comment[nb]=En melding ble filtrert bort av programtillegget for personvern
 Comment[nds]=En Naricht wöör vun dat Privaatrebeetmoduul utschutert
 Comment[nl]=Er is een bericht gefilterd door de privacyplugin
@@ -1835,7 +1835,7 @@ Name[nl]=Installatieverzoek voor een set emoticons
 Name[pl]=Żądanie instalacji zestawu emotikon
 Name[pt]=Pedido de Instalação do Conjunto de Ícones Emotivos
 Name[pt_BR]=Pedido de instalação de conjunto de emoticons
-Name[ro]=Solicitare de instalare a setului de zîmbăreți
+Name[ro]=Solicitare de instalare a setului de zâmbăreți
 Name[ru]=Запрос установки набора смайликов
 Name[sk]=Požiadavka inštalácie sady emotikonov
 Name[sl]=Zahteva po namestitvi nabora izraznih ikon
@@ -1883,7 +1883,7 @@ Name[nl]=Set emoticons met succes geïnstalleerd
 Name[pl]=Zestaw emotikon został pomyślnie zainstalowany
 Name[pt]=Conjunto de Ícones Emotivos Instalado com Sucesso
 Name[pt_BR]=Conjunto de emoticons instalado com sucesso
-Name[ro]=Setul de zîmbăreți s-a instalat cu succes
+Name[ro]=Setul de zâmbăreți s-a instalat cu succes
 Name[ru]=Набор смайликов успешно установлен
 Name[sk]=Sada emotikonov úspešne nainštalovaná.
 Name[sl]=Nabor izraznih ikon je bil uspešno nameščen
@@ -1932,7 +1932,7 @@ Name[nl]=Installatie van een set emoticons is mislukt
 Name[pl]=Nieudana instalacja zestawu emotikon
 Name[pt]=A instalação do Conjunto de Ícones Emotivos foi mal-sucedida
 Name[pt_BR]=Falha na instalação do conjunto de emoticons
-Name[ro]=Instalarea setului de zîmbăreți a eșuat
+Name[ro]=Instalarea setului de zâmbăreți a eșuat
 Name[ru]=Сбой установки набора смайликов
 Name[sk]=Inštalácia sady emotikonov zlyhala
 Name[sl]=Namestitev nabora izraznih ikon je spodletela
diff --git a/kpeople/actionsplugin/ktp_kpeople_plugin.json b/kpeople/actionsplugin/ktp_kpeople_plugin.json
index 4734285..d8915c2 100644
--- a/kpeople/actionsplugin/ktp_kpeople_plugin.json
+++ b/kpeople/actionsplugin/ktp_kpeople_plugin.json
@@ -4,7 +4,8 @@
         "Authors": [
             {
                 "Email": "daivdedmundson at kde.org", 
-                "Name": "David Edmundson"
+                "Name": "David Edmundson", 
+                "Name[x-test]": "xxDavid Edmundsonxx"
             }
         ], 
         "EnabledByDefault": true, 
diff --git a/kpeople/datasourceplugin/im_persons_data_source_plugin.json b/kpeople/datasourceplugin/im_persons_data_source_plugin.json
index a30435e..95e4f36 100644
--- a/kpeople/datasourceplugin/im_persons_data_source_plugin.json
+++ b/kpeople/datasourceplugin/im_persons_data_source_plugin.json
@@ -4,7 +4,8 @@
         "Authors": [
             {
                 "Email": "mklapetek at kde.org", 
-                "Name": "Martin Klapetek"
+                "Name": "Martin Klapetek", 
+                "Name[x-test]": "xxMartin Klapetekxx"
             }
         ], 
         "EnabledByDefault": true, 
diff --git a/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.json b/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.json
index 4443c87..39bc96e 100644
--- a/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.json
+++ b/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.json
@@ -4,7 +4,8 @@
         "Authors": [
             {
                 "Email": "nileshsuthar at live.in", 
-                "Name": "Nilesh Suthar"
+                "Name": "Nilesh Suthar", 
+                "Name[x-test]": "xxNilesh Sutharxx"
             }
         ], 
         "EnabledByDefault": true, 
diff --git a/kpeople/uiplugins/imdetailswidgetplugin.json b/kpeople/uiplugins/imdetailswidgetplugin.json
index 0a60826..e650f4a 100644
--- a/kpeople/uiplugins/imdetailswidgetplugin.json
+++ b/kpeople/uiplugins/imdetailswidgetplugin.json
@@ -3,7 +3,8 @@
         "Authors": [
             {
                 "Email": "davidedmundson at kde.org", 
-                "Name": "David Edmundson"
+                "Name": "David Edmundson", 
+                "Name[x-test]": "xxDavid Edmundsonxx"
             }
         ], 
         "Id": "imdetailswidgetplugin", 

-- 
ktp-common-internals packaging