[SCM] ktp-text-ui packaging branch, master, updated. debian/16.04.2-1-88-g820317b

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit c9b2ce1f16c36fc73f700fb87b67a866a02e73a1
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Jun 11 04:38:30 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"
---
 config/messages/kcm_ktp_chat_messages.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/messages/kcm_ktp_chat_messages.desktop b/config/messages/kcm_ktp_chat_messages.desktop
index d309492..b44a990 100644
--- a/config/messages/kcm_ktp_chat_messages.desktop
+++ b/config/messages/kcm_ktp_chat_messages.desktop
@@ -15,7 +15,7 @@ Name[et]=Pluginad
 Name[fi]=Liitännäiset
 Name[fr]=Modules externes
 Name[ga]=Breiseáin
-Name[gl]=Engadidos
+Name[gl]=Complementos
 Name[hu]=Bővítmények
 Name[ia]=Plugins
 Name[it]=Estensioni

-- 
ktp-text-ui packaging