[SCM] ktp-approver packaging branch, master, updated. debian/15.12.1-1-299-g62cbbd7

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit a17efecbf95c7150095aaf7c22bbdbfb9766f5ed
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Apr 30 10:12:07 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"
---
 ktp-approver.desktop     | 1 +
 src/ktp_approver.desktop | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/ktp-approver.desktop b/ktp-approver.desktop
index a5e5939..536b3ad 100644
--- a/ktp-approver.desktop
+++ b/ktp-approver.desktop
@@ -2,6 +2,7 @@
 Type=ServiceType
 X-KDE-ServiceType=KTpApprover
 Comment=KTp Approver
+Comment[ast]=Aprobador KTp
 Comment[bs]=KTp potvrđivač
 Comment[ca]=Aprovador de KTp
 Comment[ca at valencia]=Aprovador de KTp
diff --git a/src/ktp_approver.desktop b/src/ktp_approver.desktop
index dfa8bce..c2b6956 100644
--- a/src/ktp_approver.desktop
+++ b/src/ktp_approver.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Instant Messaging Approver
+Name[ast]=Aprobador de mansaxería nel intre
 Name[bs]=Potvrđivač instant poruka
 Name[ca]=Aprovador de missatgeria instantània
 Name[ca at valencia]=Aprovador de missatgeria instantània
@@ -46,6 +47,7 @@ Name[x-test]=xxInstant Messaging Approverxx
 Name[zh_CN]=即时通讯接收
 Name[zh_TW]=即時訊息確認器
 Comment=Shows notifications for incoming IM/Call requests and allows you to open a handler to answer
+Comment[ast]=Amuesa notificaciones pa mensaxes/llamaes entrantes y permítete abrir un remanador pa contestar
 Comment[bs]=Prikazuje obavještenja za dolazne zahtjeve  IM / poziv i omogućava vam da otvorite rukovaoca da odgovori
 Comment[ca]=Mostra les notificacions de les peticions de MI/trucades entrants i us permet obrir un gestor per contestar
 Comment[ca at valencia]=Mostra les notificacions de les peticions de MI/trucades entrants i vos permet obrir un gestor per contestar

-- 
ktp-approver packaging