[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=fe28295

The following commit has been merged in the master branch:
commit fe282952e8e91ee3a2ad5341d1884f59def4a2e0
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Nov 11 10:33:55 2015 +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/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake   | 1 +
 filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake | 1 +
 filters/latex/ktptextui_message_filter_latex.desktop.cmake         | 1 +
 filters/youtube/ktptextui_message_filter_youtube.desktop.cmake     | 1 +
 4 files changed, 4 insertions(+)

diff --git a/filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake b/filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake
index b8db479..50d3dc4 100644
--- a/filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake
+++ b/filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake
@@ -46,6 +46,7 @@ Name[zh_CN]=Bugzilla 信息
 Name[zh_TW]=Bugzilla 資訊
 Comment=When receiving a link to a bug on bugzilla show additional information such as the title and status
 Comment[ar]=عند استقبال وصلة لعلّة في بغ‌زيلّا، أظهر معلومات إضافيّة كالعنوان والحالة
+Comment[ast]=Al recibise un enllaz a un fallu en bugzilla amuésase información adicional como'l títulu y l'estáu
 Comment[bs]=Kada primite link na grešku na bugzilla, prikažite dodatnu informaciju kao što su naslov i status
 Comment[ca]=En rebre un enllaç a un error del Bugzilla mostra informació addicional com el títol i l'estat
 Comment[ca at valencia]=En rebre un enllaç a un error del Bugzilla mostra informació addicional com el títol i l'estat
diff --git a/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake b/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake
index 6ef84c6..baec6ea 100644
--- a/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake
+++ b/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake
@@ -49,6 +49,7 @@ Name[zh_CN]=表情
 Name[zh_TW]=表情圖示
 Encoding=UTF-8
 Comment=Show emoticons (smiley faces) inside the chat
+Comment[ast]=Amuesa fustaxes dientro la charra
 Comment[bs]=Prikaži emotikone (izraze osjećanja znakovima) u ćaskanju
 Comment[ca]=Mostra les emoticones (cares somrients) dins del xat
 Comment[ca at valencia]=Mostra les emoticones (cares somrients) dins del xat
diff --git a/filters/latex/ktptextui_message_filter_latex.desktop.cmake b/filters/latex/ktptextui_message_filter_latex.desktop.cmake
index 3c66237..83835c6 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/youtube/ktptextui_message_filter_youtube.desktop.cmake b/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake
index 47f15f6..53513ba 100644
--- a/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake
+++ b/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake
@@ -45,6 +45,7 @@ Name[zh_CN]=YouTube 预览
 Name[zh_TW]=YouTube 預覽
 Comment=If any messages contains a link to a YouTube video, it will embed a preview in the chat
 Comment[ar]=إن احتوت أيّ رسالة وصلة إلى فيديو يوتيوب، ستُضمّن معاينة في الدّردشة.
+Comment[ast]=Si cualesquier mensaxe contién un enllaz a un videu de Youtube, empotraráse una previsualización na charra
 Comment[bs]=Ako poruka sadrži vezu na YouTube video, oma će se ugraditi u pregled ćaskanja
 Comment[ca]=Si qualsevol missatge conté un enllaç a un vídeo de YouTube, s'incrustarà una vista prèvia en el xat
 Comment[ca at valencia]=Si qualsevol missatge conté un enllaç a un vídeo de YouTube, s'incrustarà una vista prèvia en el xat

-- 
ktp-text-ui packaging