[SCM] ktp-approver packaging branch, master, updated. debian/16.04.2-1-46-g6136066

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 26e40965eff73aa9ec90fb8a46b0238295de09e3
Author: l10n daemon script <scripty at kde.org>
Date:   Fri Sep 9 09:27:21 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"
---
 ktp-approver.desktop     | 4 ++--
 src/ktp_approver.desktop | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ktp-approver.desktop b/ktp-approver.desktop
index 536b3ad..69e9b5a 100644
--- a/ktp-approver.desktop
+++ b/ktp-approver.desktop
@@ -4,8 +4,8 @@ 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
+Comment[ca]=Aprovador del KTp
+Comment[ca at valencia]=Aprovador del KTp
 Comment[cs]=Schvalovač KTp
 Comment[da]=KTP godkender
 Comment[de]=KTp-Freigabe
diff --git a/src/ktp_approver.desktop b/src/ktp_approver.desktop
index 14b32b0..3c38c46 100644
--- a/src/ktp_approver.desktop
+++ b/src/ktp_approver.desktop
@@ -49,8 +49,8 @@ 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
+Comment[ca]=Mostra les notificacions de les peticions de MI/trucades entrants i permet obrir un gestor per a contestar
+Comment[ca at valencia]=Mostra les notificacions de les peticions de MI/trucades entrants i permet obrir un gestor per a contestar
 Comment[cs]=Zobrazuje upozornění pro příchozí IM/Hovory a umožňuje vám otevřít správce pro odpověď
 Comment[da]=Viser bekendtgørelser for indkommende IM- og opkaldsanmodninger og lader dig åbne en håndtering til at svare med
 Comment[de]=Zeigt Benachrichtigungen über eingehende Nachrichten/Anrufe und erlaubt, diese zu beantworten

-- 
ktp-approver packaging