[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=1efd4c4

The following commit has been merged in the master branch:
commit 1efd4c49fbfd994b4739a0b6734c4f0869453658
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Dec 20 13:11:06 2016 +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                      | 2 --
 config/behavior/kcm_ktp_chat_behavior.desktop                          | 1 -
 config/messages/kcm_ktp_chat_messages.desktop                          | 1 -
 config/otr/kcm_ktp_chat_otr.desktop                                    | 1 -
 filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake       | 2 --
 filters/emoticons/kcm_ktptextui_message_filter_emoticons.desktop       | 1 -
 filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake     | 2 --
 filters/formatting/ktptextui_message_filter_formatting.desktop.cmake   | 1 -
 filters/images/ktptextui_message_filter_images.desktop.cmake           | 1 -
 filters/latex/kcm_ktptextui_message_filter_latex.desktop               | 1 -
 filters/latex/ktptextui_message_filter_latex.desktop.cmake             | 1 -
 filters/otr/ktptextui_message_filter_otr.desktop.cmake                 | 1 -
 .../ktptextui_message_filter_searchexpansion.desktop.cmake             | 1 -
 filters/texttospeech/ktptextui_message_filter_tts.desktop.cmake        | 1 -
 .../urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake   | 1 -
 filters/youtube/ktptextui_message_filter_youtube.desktop.cmake         | 2 --
 logviewer/config/kcm_ktp_logviewer_behavior.desktop                    | 1 -
 logviewer/org.kde.ktplogviewer.desktop                                 | 3 ---
 18 files changed, 24 deletions(-)

diff --git a/config/appearance/kcm_ktp_chat_appearance.desktop b/config/appearance/kcm_ktp_chat_appearance.desktop
index 0f937c7..f3d081f 100644
--- a/config/appearance/kcm_ktp_chat_appearance.desktop
+++ b/config/appearance/kcm_ktp_chat_appearance.desktop
@@ -13,7 +13,6 @@ Categories=Qt;KDE;X-KDE-settings-network;
 
 Name=Chat Window Appearance
 Name[ar]=مظهر نافذة الدّردشة
-Name[ast]=Aspeutu de la 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
@@ -60,7 +59,6 @@ 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 92def40..dd66ba0 100644
--- a/config/behavior/kcm_ktp_chat_behavior.desktop
+++ b/config/behavior/kcm_ktp_chat_behavior.desktop
@@ -13,7 +13,6 @@ Categories=Qt;KDE;X-KDE-settings-network;
 
 Name=Chat Tab Behavior
 Name[ar]=سلوك لسان الدّردشة
-Name[ast]=Comportamientu de la llingüeta 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/messages/kcm_ktp_chat_messages.desktop b/config/messages/kcm_ktp_chat_messages.desktop
index d309492..e0a3651 100644
--- a/config/messages/kcm_ktp_chat_messages.desktop
+++ b/config/messages/kcm_ktp_chat_messages.desktop
@@ -1,7 +1,6 @@
 [Desktop Entry]
 Name=Plugins
 Name[ar]=الملحقات
-Name[ast]=Complementos
 Name[bs]=Dodaci
 Name[ca]=Connectors
 Name[ca at valencia]=Connectors
diff --git a/config/otr/kcm_ktp_chat_otr.desktop b/config/otr/kcm_ktp_chat_otr.desktop
index d71595e..9a33945 100644
--- a/config/otr/kcm_ktp_chat_otr.desktop
+++ b/config/otr/kcm_ktp_chat_otr.desktop
@@ -11,7 +11,6 @@ X-KDE-RootOnly=false
 Categories=Qt;KDE;X-KDE-settings-network;
 
 Comment=Encrypt chat sessions with Off-The-Record encryption
-Comment[ast]=Cifra les 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 7ea8c84..2772390 100644
--- a/filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake
+++ b/filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake
@@ -2,7 +2,6 @@
 Encoding=UTF-8
 Name=Bugzilla Information
 Name[ar]=معلومات بغ‌زيلّا
-Name[ast]=Información Bugzilla
 Name[bs]=Bugzilla informacije
 Name[ca]=Informació del Bugzilla
 Name[ca at valencia]=Informació del Bugzilla
@@ -47,7 +46,6 @@ 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, 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/emoticons/kcm_ktptextui_message_filter_emoticons.desktop b/filters/emoticons/kcm_ktptextui_message_filter_emoticons.desktop
index daa8fc1..1d76083 100644
--- a/filters/emoticons/kcm_ktptextui_message_filter_emoticons.desktop
+++ b/filters/emoticons/kcm_ktptextui_message_filter_emoticons.desktop
@@ -7,7 +7,6 @@ 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 19e5fec..269c4d6 100644
--- a/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake
+++ b/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Name=Emoticons
-Name[ast]=Fustaxes
 Name[bs]=Emotikoni
 Name[ca]=Emoticones
 Name[ca at valencia]=Emoticones
@@ -49,7 +48,6 @@ 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/formatting/ktptextui_message_filter_formatting.desktop.cmake b/filters/formatting/ktptextui_message_filter_formatting.desktop.cmake
index 44773e2..6a8d170 100644
--- a/filters/formatting/ktptextui_message_filter_formatting.desktop.cmake
+++ b/filters/formatting/ktptextui_message_filter_formatting.desktop.cmake
@@ -2,7 +2,6 @@
 Encoding=UTF-8
 Name=Text Formatting
 Name[ar]=تنسيق النّصّ
-Name[ast]=Formatéu del testu
 Name[bs]=Formatiranje teksta
 Name[ca]=Formatació del text
 Name[ca at valencia]=Formatació del text
diff --git a/filters/images/ktptextui_message_filter_images.desktop.cmake b/filters/images/ktptextui_message_filter_images.desktop.cmake
index 6a576bc..b7c6c2d 100644
--- a/filters/images/ktptextui_message_filter_images.desktop.cmake
+++ b/filters/images/ktptextui_message_filter_images.desktop.cmake
@@ -1,7 +1,6 @@
 [Desktop Entry]
 Name=Image Preview
 Name[ar]=معاينة الصّورة
-Name[ast]=Vista previa d'imaxe
 Name[bs]=Pregled slike
 Name[ca]=Vista prèvia de la imatge
 Name[ca at valencia]=Vista prèvia de la imatge
diff --git a/filters/latex/kcm_ktptextui_message_filter_latex.desktop b/filters/latex/kcm_ktptextui_message_filter_latex.desktop
index 9e1e6fa..fc5f098 100644
--- a/filters/latex/kcm_ktptextui_message_filter_latex.desktop
+++ b/filters/latex/kcm_ktptextui_message_filter_latex.desktop
@@ -8,7 +8,6 @@ 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 9c7327c..f43a7d4 100644
--- a/filters/latex/ktptextui_message_filter_latex.desktop.cmake
+++ b/filters/latex/ktptextui_message_filter_latex.desktop.cmake
@@ -16,7 +16,6 @@ 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/otr/ktptextui_message_filter_otr.desktop.cmake b/filters/otr/ktptextui_message_filter_otr.desktop.cmake
index 14623c6..0bb50b2 100644
--- a/filters/otr/ktptextui_message_filter_otr.desktop.cmake
+++ b/filters/otr/ktptextui_message_filter_otr.desktop.cmake
@@ -38,7 +38,6 @@ 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/searchexpansion/ktptextui_message_filter_searchexpansion.desktop.cmake b/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop.cmake
index be2b252..281e704 100644
--- a/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop.cmake
+++ b/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop.cmake
@@ -1,7 +1,6 @@
 [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
diff --git a/filters/texttospeech/ktptextui_message_filter_tts.desktop.cmake b/filters/texttospeech/ktptextui_message_filter_tts.desktop.cmake
index b77f0b6..c05374e 100644
--- a/filters/texttospeech/ktptextui_message_filter_tts.desktop.cmake
+++ b/filters/texttospeech/ktptextui_message_filter_tts.desktop.cmake
@@ -1,7 +1,6 @@
 [Desktop Entry]
 Name=Text To Speech
 Name[ar]=نطق النّصّ
-Name[ast]=Testu a voz
 Name[bs]=Tekst u govor
 Name[ca]=Text a veu
 Name[ca at valencia]=Text a veu
diff --git a/filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake b/filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake
index 97d44ba..79cbbd9 100644
--- a/filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake
+++ b/filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake
@@ -2,7 +2,6 @@
 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 0a712a8..2439562 100644
--- a/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake
+++ b/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake
@@ -1,7 +1,6 @@
 [Desktop Entry]
 Name=YouTube Preview
 Name[ar]=معاينة يوتيوب
-Name[ast]=Vista previa de YouTube
 Name[bs]=YouTube pregled
 Name[ca]=Vista prèvia de YouTube
 Name[ca at valencia]=Vista prèvia de YouTube
@@ -46,7 +45,6 @@ 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, incrustará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
diff --git a/logviewer/config/kcm_ktp_logviewer_behavior.desktop b/logviewer/config/kcm_ktp_logviewer_behavior.desktop
index c9c953a..0789804 100644
--- a/logviewer/config/kcm_ktp_logviewer_behavior.desktop
+++ b/logviewer/config/kcm_ktp_logviewer_behavior.desktop
@@ -13,7 +13,6 @@ Categories=Qt;KDE;X-KDE-settings-network;
 
 Name=LogViewer Behavior
 Name[ar]=سلوك عارض السّجلّات
-Name[ast]=Comportamientu del visor de rexistros
 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 257e823..ead1e47 100644
--- a/logviewer/org.kde.ktplogviewer.desktop
+++ b/logviewer/org.kde.ktplogviewer.desktop
@@ -1,7 +1,6 @@
 [Desktop Entry]
 Name=KDE IM Log Viewer
 Name[ar]=عارض كدي لسجلّات ت‌م
-Name[ast]=Visor de rexistru de MI 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
@@ -49,7 +48,6 @@ Name[zh_CN]=KDE 即时通讯日志查看程序
 Name[zh_TW]=KDE 即時訊息紀錄檢視器
 GenericName=KDE Instant Messenger Log Viewer
 GenericName[ar]=عارض كدي لسجلّات المرسال المباشر
-GenericName[ast]=Visor de rexistru del mensaxeru nel intre 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
@@ -96,7 +94,6 @@ GenericName[zh_CN]=KDE 即时通讯日志查看程序
 GenericName[zh_TW]=KDE 的即時訊息紀錄檢視器
 Comment=Displays your KDE Instant Messenger logs
 Comment[ar]=يعرض سجلّات كدي للمرسال المباشر
-Comment[ast]=Amuesa los tos rexistros del mensaxeru nel intre KDE
 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