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

The following commit has been merged in the master branch:
commit d37cfbbbaae90cc632b8ba22f864da4b025791f3
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Apr 8 04:18:33 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/otr/kcm_ktp_chat_otr.desktop                              | 1 +
 filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake | 2 ++
 filters/otr/ktptextui_message_filter_otr.desktop.cmake           | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/config/otr/kcm_ktp_chat_otr.desktop b/config/otr/kcm_ktp_chat_otr.desktop
index d524c79..4b922a3 100644
--- a/config/otr/kcm_ktp_chat_otr.desktop
+++ b/config/otr/kcm_ktp_chat_otr.desktop
@@ -64,6 +64,7 @@ Name[fi]=OTR
 Name[fr]=OTR
 Name[gl]=OTR
 Name[hu]=OTR
+Name[ia]=OTR
 Name[it]=OTR
 Name[ko]=OTR
 Name[nb]=OTR
diff --git a/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake b/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake
index 0077c30..93d2f8c 100644
--- a/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake
+++ b/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake
@@ -25,6 +25,7 @@ Name[et]=Geopunkti eelvaatlus
 Name[fi]=Sijainnin esikatselu
 Name[gl]=Vista previa do punto xeográfico
 Name[hu]=Geopont előnézet
+Name[ia]=Vista preliminar de Geopoint
 Name[it]=Anteprima di punto geografico
 Name[ko]=지점 미리 보기
 Name[nl]=Voorbeeld van geo-punt
@@ -54,6 +55,7 @@ Comment[et]=Geo-URI näitamine kaardil
 Comment[fi]=Näytä sijainnin URI karttanäkymässä.
 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.
 Comment[it]=Mostra l'URI geografico su una mappa.
 Comment[ko]=지도 보기에 지리 URI를 표시합니다.
 Comment[nl]=Geo-URI op een kaart tonen.
diff --git a/filters/otr/ktptextui_message_filter_otr.desktop.cmake b/filters/otr/ktptextui_message_filter_otr.desktop.cmake
index 14623c6..c70eb26 100644
--- a/filters/otr/ktptextui_message_filter_otr.desktop.cmake
+++ b/filters/otr/ktptextui_message_filter_otr.desktop.cmake
@@ -15,6 +15,7 @@ Name[fi]=OTR
 Name[fr]=OTR
 Name[gl]=OTR
 Name[hu]=OTR
+Name[ia]=OTR
 Name[it]=OTR
 Name[ko]=OTR
 Name[nb]=OTR
@@ -53,6 +54,7 @@ Comment[fi]=Jos viesti on OTR-viesti, sitä ei näytetä
 Comment[fr]=Si un message est un message OTR, il ne sera pas affiché
 Comment[gl]=Se unha mensaxe é «OTR», non se mostrará.
 Comment[hu]=Ha az üzenet egy OTR üzenet, nem lesz megjelenítve
+Comment[ia]=Si un message es un message OTR, non essara monstrate
 Comment[it]=Se un messaggio è un messaggio OTR, non sarà mostrato
 Comment[ko]=OTR 메시지이면 표시되지 않습니다
 Comment[nb]=Hvis en melding er en OTR-melding blir den ikke vist

-- 
ktp-text-ui packaging