[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=1da898f

The following commit has been merged in the master branch:
commit 1da898fc4d30c1f2735af20479ccccf796076367
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Aug 16 10:08:03 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 5c55079..5ab4c5b 100644
--- a/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake
+++ b/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake
@@ -25,6 +25,7 @@ Name[sl]=Predogled Geopoint
 Name[sv]=Förhandsgranskning av geografisk punkt
 Name[uk]=Перегляд геоточки
 Name[x-test]=xxGeopoint Previewxx
+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.
@@ -37,3 +38,4 @@ Comment[sl]=Pokaži geo URI na prikazu zemljevida.
 Comment[sv]=Visa geografisk webbadress i en kartvy.
 Comment[uk]=Показувати геоадресу на перегляді карти.
 Comment[x-test]=xxShow geo URI on a map view.xx
+Comment[zh_CN]=在地图视图上显示地理 URI。

-- 
ktp-text-ui packaging