[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=396d684

The following commit has been merged in the master branch:
commit 396d6847a6426ba37dbc7dd6e2964cb25d76559d
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Apr 8 09:52:29 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"
---
 src/ktp_approver.desktop | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ktp_approver.desktop b/src/ktp_approver.desktop
index bd45693..dfa8bce 100644
--- a/src/ktp_approver.desktop
+++ b/src/ktp_approver.desktop
@@ -46,7 +46,6 @@ 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