[SCM] ktp-text-ui packaging branch, master, updated. debian/16.04.2-1-88-g820317b

Maximiliano Curia maxy at moszumanska.debian.org
Tue Sep 12 14:10:05 UTC 2017


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

The following commit has been merged in the master branch:
commit 7bc697175d1cec680b142044584f324595aeb8fb
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Jan 4 06:15:18 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/behavior/kcm_ktp_chat_behavior.desktop                          | 1 +
 config/otr/kcm_ktp_chat_otr.desktop                                    | 1 +
 filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake       | 1 +
 filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake     | 1 +
 filters/formatting/ktptextui_message_filter_formatting.desktop.cmake   | 1 +
 filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake       | 2 ++
 filters/highlight/ktptextui_message_filter_highlight.desktop.cmake     | 1 +
 filters/images/ktptextui_message_filter_images.desktop.cmake           | 2 ++
 .../urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake   | 1 +
 filters/youtube/ktptextui_message_filter_youtube.desktop.cmake         | 1 +
 logviewer/config/kcm_ktp_logviewer_behavior.desktop                    | 1 +
 logviewer/org.kde.ktplogviewer.desktop                                 | 3 +++
 13 files changed, 17 insertions(+)

diff --git a/config/appearance/kcm_ktp_chat_appearance.desktop b/config/appearance/kcm_ktp_chat_appearance.desktop
index bb7f354..0360312 100644
--- a/config/appearance/kcm_ktp_chat_appearance.desktop
+++ b/config/appearance/kcm_ktp_chat_appearance.desktop
@@ -60,6 +60,7 @@ Name[zh_CN]=聊天窗口外观
 Name[zh_TW]=聊天視窗外觀
 Comment=Choose a Style for your Chat Window and customize it
 Comment[ar]=اختر نمطًا لنافذة الدّردشة وخصّصه
+Comment[ast]=Escueyi un estilu pa la to ventana de charra y personalízalu
 Comment[bs]=Izaberite stil za prozor ćaskanja i prilagodite ga
 Comment[ca]=Seleccioneu un estil per a la finestra de xat i personalitzeu-la
 Comment[ca at valencia]=Seleccioneu un estil per a la finestra de xat i personalitzeu-la
diff --git a/config/behavior/kcm_ktp_chat_behavior.desktop b/config/behavior/kcm_ktp_chat_behavior.desktop
index dd66ba0..c893460 100644
--- a/config/behavior/kcm_ktp_chat_behavior.desktop
+++ b/config/behavior/kcm_ktp_chat_behavior.desktop
@@ -13,6 +13,7 @@ Categories=Qt;KDE;X-KDE-settings-network;
 
 Name=Chat Tab Behavior
 Name[ar]=سلوك لسان الدّردشة
+Name[ast]=Comportamientu de llingüetes de charra
 Name[bs]=Ponašanje kartice za ćaskanje
 Name[ca]=Comportament de la pestanya de xat
 Name[ca at valencia]=Comportament de la pestanya de xat
diff --git a/config/otr/kcm_ktp_chat_otr.desktop b/config/otr/kcm_ktp_chat_otr.desktop
index 9a33945..d524c79 100644
--- a/config/otr/kcm_ktp_chat_otr.desktop
+++ b/config/otr/kcm_ktp_chat_otr.desktop
@@ -11,6 +11,7 @@ X-KDE-RootOnly=false
 Categories=Qt;KDE;X-KDE-settings-network;
 
 Comment=Encrypt chat sessions with Off-The-Record encryption
+Comment[ast]=Cifra sesiones de charra col cifráu OTR
 Comment[bs]=Šifrirajte sesije časkanja sa Off-The-Record šifrovanjem
 Comment[ca]=Encripta les sessions de xat amb l'encriptatge «Off-The-Record»
 Comment[ca at valencia]=Encripta les sessions de xat amb l'encriptatge «Off-The-Record»
diff --git a/filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake b/filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake
index 2772390..fbad377 100644
--- a/filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake
+++ b/filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake
@@ -2,6 +2,7 @@
 Encoding=UTF-8
 Name=Bugzilla Information
 Name[ar]=معلومات بغ‌زيلّا
+Name[ast]=Información de Bugzilla
 Name[bs]=Bugzilla informacije
 Name[ca]=Informació del Bugzilla
 Name[ca at valencia]=Informació del Bugzilla
diff --git a/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake b/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake
index e72c229..4298e34 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 (cares que sorrín) 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/formatting/ktptextui_message_filter_formatting.desktop.cmake b/filters/formatting/ktptextui_message_filter_formatting.desktop.cmake
index 6a8d170..affef09 100644
--- a/filters/formatting/ktptextui_message_filter_formatting.desktop.cmake
+++ b/filters/formatting/ktptextui_message_filter_formatting.desktop.cmake
@@ -2,6 +2,7 @@
 Encoding=UTF-8
 Name=Text Formatting
 Name[ar]=تنسيق النّصّ
+Name[ast]=Formatéu de testu
 Name[bs]=Formatiranje teksta
 Name[ca]=Formatació del text
 Name[ca at valencia]=Formatació del text
diff --git a/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake b/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake
index 367c934..1c89da4 100644
--- a/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake
+++ b/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake
@@ -14,6 +14,7 @@ X-KDE-PluginInfo-EnabledByDefault=false
 X-KTp-PluginInfo-Version=@KTP_MESSAGE_FILTER_FRAMEWORK_VERSION@
 
 Name=Geopoint Preview
+Name[ast]=Previsualización de xeopuntu
 Name[ca]=Vista prèvia del punt geogràfic
 Name[ca at valencia]=Vista prèvia del punt geogràfic
 Name[en_GB]=Geopoint Preview
@@ -38,6 +39,7 @@ Name[x-test]=xxGeopoint Previewxx
 Name[zh_CN]=地理位置预览
 Name[zh_TW]=Geopoint 預覽
 Comment=Show geo URI on a map view.
+Comment[ast]=Amuesa la URI xeo nuna vista de mapa.
 Comment[ca]=Mostra la URI geogràfica a la vista d'un mapa.
 Comment[ca at valencia]=Mostra la URI geogràfica a la vista d'un mapa.
 Comment[en_GB]=Show geo URI on a map view.
diff --git a/filters/highlight/ktptextui_message_filter_highlight.desktop.cmake b/filters/highlight/ktptextui_message_filter_highlight.desktop.cmake
index af961a4..5754b66 100644
--- a/filters/highlight/ktptextui_message_filter_highlight.desktop.cmake
+++ b/filters/highlight/ktptextui_message_filter_highlight.desktop.cmake
@@ -61,6 +61,7 @@ Name[x-test]=xxHighlightxx
 Name[zh_CN]=高亮
 Name[zh_TW]=高亮度
 Comment=If any incoming messages contain your nickname, it will highlight them in red
+Comment[ast]=Resaltaráse en bermeyo cualesquier mensaxe entrante contenga'l to nomatu
 Comment[bs]=Ako dolazna poruka sadrži vaš nadimak, bit će naznačena crvenom bojom
 Comment[ca]=Si qualsevol missatge entrant conté el vostre sobrenom, es ressaltarà en vermell.
 Comment[ca at valencia]=Si qualsevol missatge entrant conté el vostre sobrenom, es ressaltarà en roig.
diff --git a/filters/images/ktptextui_message_filter_images.desktop.cmake b/filters/images/ktptextui_message_filter_images.desktop.cmake
index b7c6c2d..4b22a38 100644
--- a/filters/images/ktptextui_message_filter_images.desktop.cmake
+++ b/filters/images/ktptextui_message_filter_images.desktop.cmake
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Image Preview
 Name[ar]=معاينة الصّورة
+Name[ast]=Previsualización d'imáxenes
 Name[bs]=Pregled slike
 Name[ca]=Vista prèvia de la imatge
 Name[ca at valencia]=Vista prèvia de la imatge
@@ -47,6 +48,7 @@ Name[zh_CN]=图片预览
 Name[zh_TW]=影像預覽
 Encoding=UTF-8
 Comment=Embed a thumbnail of any image URL sent in a chat
+Comment[ast]=Empotra una miniatura de cualesquier URL d'imaxe unviada nuna charra
 Comment[bs]=Unesite sličicu neke URL slike poslane u ćaskanju
 Comment[ca]=Incrusta una miniatura de qualsevol URL d'imatge enviat al xat
 Comment[ca at valencia]=Incrusta una miniatura de qualsevol URL d'imatge enviat al xat
diff --git a/filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake b/filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake
index 79cbbd9..97d44ba 100644
--- a/filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake
+++ b/filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake
@@ -2,6 +2,7 @@
 Encoding=UTF-8
 Name=Short URLs
 Name[ar]=وصلات مقصّرة
+Name[ast]=Acurtiar URLs
 Name[bs]=Kratke URL adrese
 Name[ca]=URL breus
 Name[ca at valencia]=URL breus
diff --git a/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake b/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake
index 2439562..0d6f9a6 100644
--- a/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake
+++ b/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=YouTube Preview
 Name[ar]=معاينة يوتيوب
+Name[ast]=Previsualización de YouTube
 Name[bs]=YouTube pregled
 Name[ca]=Vista prèvia de YouTube
 Name[ca at valencia]=Vista prèvia de YouTube
diff --git a/logviewer/config/kcm_ktp_logviewer_behavior.desktop b/logviewer/config/kcm_ktp_logviewer_behavior.desktop
index 0789804..056da96 100644
--- a/logviewer/config/kcm_ktp_logviewer_behavior.desktop
+++ b/logviewer/config/kcm_ktp_logviewer_behavior.desktop
@@ -13,6 +13,7 @@ Categories=Qt;KDE;X-KDE-settings-network;
 
 Name=LogViewer Behavior
 Name[ar]=سلوك عارض السّجلّات
+Name[ast]=Comportamientu del visor de rexistru
 Name[bs]=Ponašanje preglednika dnevnika
 Name[ca]=Comportament del visor del registre
 Name[ca at valencia]=Comportament del visor del registre
diff --git a/logviewer/org.kde.ktplogviewer.desktop b/logviewer/org.kde.ktplogviewer.desktop
index ead1e47..cfed357 100644
--- a/logviewer/org.kde.ktplogviewer.desktop
+++ b/logviewer/org.kde.ktplogviewer.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=KDE IM Log Viewer
 Name[ar]=عارض كدي لسجلّات ت‌م
+Name[ast]=Visor de rexistros MI de KDE
 Name[bs]=Pregledač dnevnika za KDE IM Log
 Name[ca]=Visor de registres de MI pel KDE
 Name[ca at valencia]=Visor de registres de MI pel KDE
@@ -48,6 +49,7 @@ Name[zh_CN]=KDE 即时通讯日志查看程序
 Name[zh_TW]=KDE 即時訊息紀錄檢視器
 GenericName=KDE Instant Messenger Log Viewer
 GenericName[ar]=عارض كدي لسجلّات المرسال المباشر
+GenericName[ast]=Visor de rexistros del mensaxeru nel intre de KDE
 GenericName[bs]=Pregledač dnevnika za KDE instant poruke
 GenericName[ca]=Visor del registre de missatgeria instantània del KDE
 GenericName[ca at valencia]=Visor del registre de missatgeria instantània del KDE
@@ -94,6 +96,7 @@ GenericName[zh_CN]=KDE 即时通讯日志查看程序
 GenericName[zh_TW]=KDE 的即時訊息紀錄檢視器
 Comment=Displays your KDE Instant Messenger logs
 Comment[ar]=يعرض سجلّات كدي للمرسال المباشر
+Comment[ast]=Amuesa los rexistros del to mensaxeru nel intre
 Comment[bs]=Prikazuje Vaše KDE Instant Messenger dnevnike
 Comment[ca]=Mostra el registre de missatgeria instantània del KDE
 Comment[ca at valencia]=Mostra el registre de missatgeria instantània del KDE

-- 
ktp-text-ui packaging



More information about the pkg-kde-commits mailing list