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

The following commit has been merged in the master branch:
commit d20303c82696bc59256492c43c7e7452d124a0eb
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Jan 5 05:57:17 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"
---
 filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake         | 1 +
 filters/formatting/ktptextui_message_filter_formatting.desktop.cmake     | 1 +
 filters/otr/ktptextui_message_filter_otr.desktop.cmake                   | 1 +
 filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake | 1 +
 filters/youtube/ktptextui_message_filter_youtube.desktop.cmake           | 1 +
 5 files changed, 5 insertions(+)

diff --git a/filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake b/filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake
index fbad377..1455ee6 100644
--- a/filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake
+++ b/filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake
@@ -47,6 +47,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 recibir un enllaz d'un fallu en bugzilla, amuesa la 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, es mostra informació addicional com el títol i l'estat
 Comment[ca at valencia]=En rebre un enllaç a un error del Bugzilla, es mostra informació addicional com el títol i l'estat
diff --git a/filters/formatting/ktptextui_message_filter_formatting.desktop.cmake b/filters/formatting/ktptextui_message_filter_formatting.desktop.cmake
index affef09..bface2a 100644
--- a/filters/formatting/ktptextui_message_filter_formatting.desktop.cmake
+++ b/filters/formatting/ktptextui_message_filter_formatting.desktop.cmake
@@ -47,6 +47,7 @@ Name[x-test]=xxText Formattingxx
 Name[zh_CN]=文本格式化
 Name[zh_TW]=文字格式
 Comment=Use /, _, * and - to make text italic, underlined, bold or strikeout respectively
+Comment[ast]=Usa /, _, * y - pa poner el testu en cursiva, sorrayáu, negrina o tacháu respeutivamente
 Comment[bs]=Koristite _, * i - da napravite tekst kurzivnim, podebljanim ili precrtanim
 Comment[ca]=Usa /, _, * i - per a convertir el text a cursiva, subratllat, negreta o ratllat respectivament
 Comment[ca at valencia]=Usa /, _, * i - per a convertir el text a cursiva, subratllat, negreta o ratllat respectivament
diff --git a/filters/otr/ktptextui_message_filter_otr.desktop.cmake b/filters/otr/ktptextui_message_filter_otr.desktop.cmake
index 0bb50b2..14623c6 100644
--- a/filters/otr/ktptextui_message_filter_otr.desktop.cmake
+++ b/filters/otr/ktptextui_message_filter_otr.desktop.cmake
@@ -38,6 +38,7 @@ Name[x-test]=xxOTRxx
 Name[zh_CN]=非公开加密
 Name[zh_TW]=OTR
 Comment=If a message is an OTR message, it will not be shown
+Comment[ast]=Si un mensaxe ye OTR, nun s'amosará
 Comment[bs]=Ako je poruka OTR poruka, ona neće biti prikazana
 Comment[ca]=Si un missatge és OTR, no es mostrarà
 Comment[ca at valencia]=Si un missatge és OTR, no es mostrarà
diff --git a/filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake b/filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake
index 97d44ba..285d57e 100644
--- a/filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake
+++ b/filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake
@@ -45,6 +45,7 @@ Name[zh_CN]=短 URL
 Name[zh_TW]=短網址
 Comment=Shows the actual URL to which a shortened URL is redirecting to
 Comment[ar]=يظهر العنوان الفعليّ الّذي يعيد العنوان المقصّر التّوجيه إليه
+Comment[ast]=Amuesa la URL a la que redirixe la URL acurtiada
 Comment[bs]=Prikazuje stvarni URL na koji je skraćeni preusmjeren
 Comment[ca]=Mostra l'URL real al qual es redirigeix un URL breu
 Comment[ca at valencia]=Mostra l'URL real al qual es redirigeix un URL breu
diff --git a/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake b/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake
index 0d6f9a6..94c6924 100644
--- a/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake
+++ b/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake
@@ -46,6 +46,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