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

The following commit has been merged in the master branch:
commit 5988620d77e575a7febcbb8876b9ab635b039e8e
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Jun 28 08:25:06 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"
---
 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 7e2d854..f095bac 100644
--- a/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake
+++ b/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake
@@ -24,6 +24,7 @@ Name[en_GB]=Geopoint Preview
 Name[es]=Vista previa de punto geográfico
 Name[et]=Geopunkti eelvaatlus
 Name[fi]=Sijainnin esikatselu
+Name[fr]=Aperçu de point géographique
 Name[gl]=Vista previa do punto xeográfico
 Name[hu]=Geopont előnézet
 Name[ia]=Vista preliminar de Geopoint
@@ -56,6 +57,7 @@ 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[fi]=Näytä sijainnin URI karttanäkymässä.
+Comment[fr]=Afficher les URI géographiques sur la vue en carte.
 Comment[gl]=Mostrar o URL xeográfico nunha vista de mapa.
 Comment[hu]=Földrajzi URI megjelenítése térképnézetben.
 Comment[ia]=Monstra URI de geo sur un vista de mappa.

-- 
ktp-text-ui packaging