[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=be9f794

The following commit has been merged in the master branch:
commit be9f7943c6fb7cb232148fc75dda5b9f4d161c70
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Jan 30 06:02:21 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"
---
 data/ktelepathy.notifyrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/ktelepathy.notifyrc b/data/ktelepathy.notifyrc
index b592895..6917db1 100644
--- a/data/ktelepathy.notifyrc
+++ b/data/ktelepathy.notifyrc
@@ -1771,7 +1771,7 @@ Name[es]=Estilo de charla instalado con éxito
 Name[et]=Vestlusstiil paigaldati edukalt
 Name[fi]=Keskustelutyylin asennus onnistui
 Name[fr]=Le module « Chatstyle » a été installé avec succès
-Name[gl]=Instalouse Chatstyle sen problemas
+Name[gl]=Instalouse Chatstyle
 Name[hu]=A csevegőstílus sikeresen telepítve
 Name[ia]=In installava con successo Chatstyle
 Name[it]=Stile di chat installato correttamente
@@ -1919,7 +1919,7 @@ Name[es]=Juego de iconos instalado con éxito
 Name[et]=Emotikonikogu paigaldati edukalt
 Name[fi]=Hymiöjoukon asennus onnistui
 Name[fr]=Ensemble d'émoticônes installé avec succès
-Name[gl]=Instalouse Emoticonset sen problemas
+Name[gl]=Instalouse Emoticonset
 Name[hu]=A hangulatjelkészlet sikeresen telepítve
 Name[ia]=In installava con successo Emoticonset
 Name[it]=Tema di emoticon installato correttamente

-- 
ktp-common-internals packaging