[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=32ccc09

The following commit has been merged in the master branch:
commit 32ccc099d5f3b89966a147f8f2c506dac8025e63
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Jan 3 12:35:10 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"
---
 config/appearance/kcm_ktp_chat_appearance.desktop                        | 1 +
 config/messages/kcm_ktp_chat_messages.desktop                            | 1 +
 filters/emoticons/kcm_ktptextui_message_filter_emoticons.desktop         | 1 +
 filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake       | 1 +
 filters/latex/kcm_ktptextui_message_filter_latex.desktop                 | 1 +
 filters/latex/ktptextui_message_filter_latex.desktop.cmake               | 1 +
 .../ktptextui_message_filter_searchexpansion.desktop.cmake               | 1 +
 7 files changed, 7 insertions(+)

diff --git a/config/appearance/kcm_ktp_chat_appearance.desktop b/config/appearance/kcm_ktp_chat_appearance.desktop
index f3d081f..bb7f354 100644
--- a/config/appearance/kcm_ktp_chat_appearance.desktop
+++ b/config/appearance/kcm_ktp_chat_appearance.desktop
@@ -13,6 +13,7 @@ Categories=Qt;KDE;X-KDE-settings-network;
 
 Name=Chat Window Appearance
 Name[ar]=مظهر نافذة الدّردشة
+Name[ast]=Aspeutu de ventana de charra
 Name[bs]=Izgled chat prozora
 Name[ca]=Aparença de la finestra de xat
 Name[ca at valencia]=Aparença de la finestra de xat
diff --git a/config/messages/kcm_ktp_chat_messages.desktop b/config/messages/kcm_ktp_chat_messages.desktop
index e0a3651..d309492 100644
--- a/config/messages/kcm_ktp_chat_messages.desktop
+++ b/config/messages/kcm_ktp_chat_messages.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Plugins
 Name[ar]=الملحقات
+Name[ast]=Complementos
 Name[bs]=Dodaci
 Name[ca]=Connectors
 Name[ca at valencia]=Connectors
diff --git a/filters/emoticons/kcm_ktptextui_message_filter_emoticons.desktop b/filters/emoticons/kcm_ktptextui_message_filter_emoticons.desktop
index 1d76083..daa8fc1 100644
--- a/filters/emoticons/kcm_ktptextui_message_filter_emoticons.desktop
+++ b/filters/emoticons/kcm_ktptextui_message_filter_emoticons.desktop
@@ -7,6 +7,7 @@ X-KDE-ParentApp=emoticons
 X-KDE-ParentComponents=emoticons
 
 Name=Emoticons
+Name[ast]=Fustaxes
 Name[bs]=Emotikoni
 Name[ca]=Emoticones
 Name[ca at valencia]=Emoticones
diff --git a/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake b/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake
index 269c4d6..e72c229 100644
--- a/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake
+++ b/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Emoticons
+Name[ast]=Fustaxes
 Name[bs]=Emotikoni
 Name[ca]=Emoticones
 Name[ca at valencia]=Emoticones
diff --git a/filters/latex/kcm_ktptextui_message_filter_latex.desktop b/filters/latex/kcm_ktptextui_message_filter_latex.desktop
index fc5f098..9e1e6fa 100644
--- a/filters/latex/kcm_ktptextui_message_filter_latex.desktop
+++ b/filters/latex/kcm_ktptextui_message_filter_latex.desktop
@@ -8,6 +8,7 @@ X-KDE-ParentComponents=latex
 
 Name=LaTeX
 Name[ar]=لاتخ
+Name[ast]=LaTeX
 Name[bs]=LaTeX
 Name[ca]=LaTeX
 Name[ca at valencia]=LaTeX
diff --git a/filters/latex/ktptextui_message_filter_latex.desktop.cmake b/filters/latex/ktptextui_message_filter_latex.desktop.cmake
index f43a7d4..9c7327c 100644
--- a/filters/latex/ktptextui_message_filter_latex.desktop.cmake
+++ b/filters/latex/ktptextui_message_filter_latex.desktop.cmake
@@ -16,6 +16,7 @@ X-KTp-PluginInfo-Version=@KTP_MESSAGE_FILTER_FRAMEWORK_VERSION@
 
 Name=LaTeX Renderer
 Name[ar]=مصيّر لاتخ
+Name[ast]=Renderizador LaTeX
 Name[bs]=LaTeX Obrađivač
 Name[ca]=Renderitzador LaTeX
 Name[ca at valencia]=Renderitzador LaTeX
diff --git a/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop.cmake b/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop.cmake
index 281e704..be2b252 100644
--- a/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop.cmake
+++ b/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop.cmake
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Web Shortcuts
 Name[ar]=اختصارات الوِبّ
+Name[ast]=Atayos web
 Name[bs]=Web prečice
 Name[ca]=Dreceres web
 Name[ca at valencia]=Dreceres web

-- 
ktp-text-ui packaging