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

Maximiliano Curia maxy at moszumanska.debian.org
Tue Sep 12 14:07:01 UTC 2017


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

The following commit has been merged in the master branch:
commit c97583244a2ba911c9798ab42d2151768160aa94
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Jan 2 05:43:52 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"
---
 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 c4bd64c..933b84b 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 del KTp
 Comment[ca at valencia]=Aprovador del KTp
diff --git a/src/ktp_approver.desktop b/src/ktp_approver.desktop
index b24295e..022ec0a 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 mensaxerí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
@@ -47,6 +48,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 avisos pa solicitues MI/llamaes entrantes y permítete abrir un remanador pa responder
 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 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

-- 
ktp-approver packaging



More information about the pkg-kde-commits mailing list