[SCM] ktp-common-internals packaging branch, master, updated. debian/16.04.2-1-111-g6e00b1c

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b1618d5bd00b38cd3fa4ede5a7eded20121a8ace
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Feb 6 06:05:15 2017 +0100

    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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/ktelepathy.notifyrc b/data/ktelepathy.notifyrc
index 6917db1..412e564 100644
--- a/data/ktelepathy.notifyrc
+++ b/data/ktelepathy.notifyrc
@@ -1270,7 +1270,7 @@ Name[x-test]=xxMessage Droppedxx
 Name[zh_CN]=消息被丢弃
 Name[zh_TW]=訊息已丟棄
 Comment=A message was filtered by the Privacy Plugin
-Comment[ast]=Peñeróse una mensaxe pol complementu Privacidá
+Comment[ast]=Peñeróse un mensaxe pol complementu Privacidá
 Comment[bs]=Poruka je filtrirana pomoću priključka za privatnost
 Comment[ca]=El connector de privadesa ha filtrat un missatge
 Comment[ca at valencia]=El connector de privadesa ha filtrat un missatge

-- 
ktp-common-internals packaging