[SCM] ktp-common-internals packaging branch, master, updated. debian/16.04.2-1-111-g6e00b1c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=3c925da

The following commit has been merged in the master branch:
commit 3c925da8ee75b02b751f7ffbf546affe745726f7
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Jun 11 04:38:02 2017 +0200

    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"
---
 data/ktelepathy.notifyrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/ktelepathy.notifyrc b/data/ktelepathy.notifyrc
index 412e564..8b2c07b 100644
--- a/data/ktelepathy.notifyrc
+++ b/data/ktelepathy.notifyrc
@@ -1284,7 +1284,7 @@ Comment[et]=Privaatsusplugin filtreeris sõnumi välja
 Comment[fi]=Tietosuojaliitännäinen suodatti viestin
 Comment[fr]=Un message a été filtré par le module externe « Respect de la vie privée »
 Comment[ga]=Bhí teachtaireacht scagtha ag an mBreiseán Príobháideachta
-Comment[gl]=Unha mensaxe foi filtrada polo engadido de intimidade
+Comment[gl]=Unha mensaxe foi filtrada polo complemento de intimidade
 Comment[hu]=Az Adatvédelem modul kiszűrt egy üzenetet
 Comment[ia]=Un message esseva filtrate per le plug-in de confidentialitate
 Comment[it]=Un messaggio è stato filtrato dall'estensione di riservatezza

-- 
ktp-common-internals packaging