[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=43f97d2

The following commit has been merged in the master branch:
commit 43f97d2f54834769061e99c66dd257090fef002e
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Jan 14 10:15:52 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"
---
 data/ktelepathy.notifyrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/ktelepathy.notifyrc b/data/ktelepathy.notifyrc
index 6b7cfc9..9d434ac 100644
--- a/data/ktelepathy.notifyrc
+++ b/data/ktelepathy.notifyrc
@@ -514,7 +514,7 @@ Name[x-test]=xxInstant messaging info messagexx
 Name[zh_CN]=即时通讯信息消息
 Name[zh_TW]=即時訊息一般資訊
 Comment=A general info message from instant messaging
-Comment[ast]=Un mensaxes d'información xeneral de la mensxería nel intre
+Comment[ast]=Un mensaxe d'información xeneral de la mensxería nel intre
 Comment[bs]=Opšta informativna poruka kod instant poruka
 Comment[ca]=Un missatge informatiu general de la missatgeria instantània
 Comment[ca at valencia]=Un missatge informatiu general de la missatgeria instantània
@@ -1952,7 +1952,7 @@ Flags=Persistent
 
 [Event/contactInfo]
 Name=Contact status changed
-Name[ast]=L'estáu del contautu camudó
+Name[ast]=Camudó l'estáu del contautu
 Name[bs]=Status kontakta promijenjen
 Name[ca]=L'estat d'un contacte ha canviat
 Name[ca at valencia]=L'estat d'un contacte ha canviat

-- 
ktp-common-internals packaging