[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=30813f4

The following commit has been merged in the master branch:
commit 30813f413d8d9c58c4f9f880863aeba4eafdb130
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Aug 29 09:17:59 2016 +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"
---
 filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake b/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake
index 4163c01..2dd7b27 100644
--- a/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake
+++ b/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake
@@ -16,6 +16,7 @@ X-KTp-PluginInfo-Version=@KTP_MESSAGE_FILTER_FRAMEWORK_VERSION@
 Name=Geopoint Preview
 Name[ca]=Vista prèvia del punt geogràfic
 Name[ca at valencia]=Vista prèvia del punt geogràfic
+Name[en_GB]=Geopoint Preview
 Name[es]=Vista previa de punto geográfico
 Name[et]=Geopunkti eelvaatlus
 Name[nl]=Voorbeeld van geo-punt
@@ -30,6 +31,7 @@ Name[zh_CN]=地理位置预览
 Comment=Show geo URI on a map view.
 Comment[ca]=Mostra la URI geogràfica a la vista d'un mapa.
 Comment[ca at valencia]=Mostra la URI geogràfica a la vista d'un mapa.
+Comment[en_GB]=Show geo URI on a map view.
 Comment[es]=Mostrar un URI geográfico en un visor de mapa.
 Comment[et]=Geo-URI näitamine kaardil
 Comment[nl]=Geo-URI op een kaart tonen.

-- 
ktp-text-ui packaging