[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=356bba1

The following commit has been merged in the master branch:
commit 356bba103ec51e1626c5c8a18728010217282a6d
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Apr 27 10:18:38 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 +
 1 file changed, 1 insertion(+)

diff --git a/ktp-approver.desktop b/ktp-approver.desktop
index 34e08d3..a5e5939 100644
--- a/ktp-approver.desktop
+++ b/ktp-approver.desktop
@@ -26,6 +26,7 @@ Comment[nl]=Goedkeuringgever van KTp
 Comment[pl]=Program zatwierdzający KTp
 Comment[pt]=Aprovação do KTp
 Comment[pt_BR]=Aprovação KTp
+Comment[ro]=KTp Approver
 Comment[ru]=Уведомитель KTp
 Comment[sk]=KTp schvaľovateľ
 Comment[sl]=Odobritelj KTp

-- 
ktp-approver packaging