[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/16.04.2-1-53-gf68d114

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=2347198

The following commit has been merged in the master branch:
commit 234719897c08db31c9631a44cf34ae268fbcd8e6
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Jan 3 12:34:54 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"
---
 src/settings-im-and-voip.desktop | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/settings-im-and-voip.desktop b/src/settings-im-and-voip.desktop
index 6b6bffa..ecff00f 100644
--- a/src/settings-im-and-voip.desktop
+++ b/src/settings-im-and-voip.desktop
@@ -7,6 +7,7 @@ X-KDE-Weight=200
 Icon=telepathy-kde
 
 Name=Instant Messaging and VoIP
+Name[ast]=Mensaxería nel intre y VoIP
 Name[bs]=Instant poruke i  VoIP
 Name[ca]=Missatgeria instantània i VoIP
 Name[ca at valencia]=Missatgeria instantània i VoIP
@@ -52,6 +53,7 @@ Name[x-test]=xxInstant Messaging and VoIPxx
 Name[zh_CN]=即时通讯和语音
 Name[zh_TW]=即時訊息與 VoIP
 X-KDE-Keywords=KTp,Chat, Telepathy, IM
+X-KDE-Keywords[ast]=KTp,Charra,Charrar, Telepathy, IM
 X-KDE-Keywords[bs]=KTp,Chat, Telepathy, IM
 X-KDE-Keywords[ca]=KTp,Xat, Telepathy, MI
 X-KDE-Keywords[ca at valencia]=KTp,Xat, Telepathy, MI

-- 
ktp-accounts-kcm packaging