[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:25:19 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=4e5e8cf
The following commit has been merged in the master branch:
commit 4e5e8cf3cccdc94a0aa18586e2ee3c580eb16da4
Author: l10n daemon script <scripty at kde.org>
Date: Wed Apr 8 09:52:53 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"
---
config/kcm_ktp_chat_appearance.desktop | 2 --
config/kcm_ktp_chat_behavior.desktop | 1 -
config/kcm_ktp_chat_messages.desktop | 1 -
config/kcm_ktp_chat_otr.desktop | 2 --
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/images/ktptextui_message_filter_images.desktop.cmake | 1 -
filters/latex/kcm_ktptextui_message_filter_latex.desktop | 1 -
filters/otr/ktptextui_message_filter_otr.desktop.cmake | 2 --
.../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 | 1 -
logviewer/ktp-log-viewer.desktop | 3 ---
15 files changed, 20 deletions(-)
diff --git a/config/kcm_ktp_chat_appearance.desktop b/config/kcm_ktp_chat_appearance.desktop
index 27f9751..a05dd1c 100644
--- a/config/kcm_ktp_chat_appearance.desktop
+++ b/config/kcm_ktp_chat_appearance.desktop
@@ -12,7 +12,6 @@ X-KDE-RootOnly=false
Categories=Qt;KDE;X-KDE-settings-network;
Name=Chat Window Appearance
-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
@@ -57,7 +56,6 @@ Name[x-test]=xxChat Window Appearancexx
Name[zh_CN]=聊天窗口外观
Name[zh_TW]=聊天視窗外觀
Comment=Choose a Style for your Chat Window and customize it
-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 la finestra de xat i personalitzeu-la
Comment[ca at valencia]=Seleccioneu un estil per la finestra de xat i personalitzeu-la
diff --git a/config/kcm_ktp_chat_behavior.desktop b/config/kcm_ktp_chat_behavior.desktop
index 6d5366b..8be95d5 100644
--- a/config/kcm_ktp_chat_behavior.desktop
+++ b/config/kcm_ktp_chat_behavior.desktop
@@ -12,7 +12,6 @@ X-KDE-RootOnly=false
Categories=Qt;KDE;X-KDE-settings-network;
Name=Chat Tab Behavior
-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/kcm_ktp_chat_messages.desktop b/config/kcm_ktp_chat_messages.desktop
index d801aa2..ccc3e5c 100644
--- a/config/kcm_ktp_chat_messages.desktop
+++ b/config/kcm_ktp_chat_messages.desktop
@@ -1,6 +1,5 @@
[Desktop Entry]
Name=Plugins
-Name[ast]=Complementos
Name[bs]=Dodaci
Name[ca]=Connectors
Name[ca at valencia]=Connectors
diff --git a/config/kcm_ktp_chat_otr.desktop b/config/kcm_ktp_chat_otr.desktop
index 0e4dac3..95b60d4 100644
--- a/config/kcm_ktp_chat_otr.desktop
+++ b/config/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[cs]=Šifrovat rozhovory pomocí OTR (Off-The-Record encryption)
@@ -43,7 +42,6 @@ Comment[x-test]=xxEncrypt chat sessions with Off-The-Record encryptionxx
Comment[zh_CN]=用非正式加密算法加密聊天会话
Comment[zh_TW]=使用私下加密（Off-The-Record）來加密聊天階段
Name=OTR
-Name[ast]=OTR
Name[bs]=OTR
Name[ca]=OTR
Name[cs]=OTR
diff --git a/filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake b/filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake
index 8645559..f180c11 100644
--- a/filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake
+++ b/filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake
@@ -1,7 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Name=Bugzilla Information
-Name[ast]=Información 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 849286e..200038a 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
diff --git a/filters/formatting/ktptextui_message_filter_formatting.desktop.cmake b/filters/formatting/ktptextui_message_filter_formatting.desktop.cmake
index 64b9319..aa79c1b 100644
--- a/filters/formatting/ktptextui_message_filter_formatting.desktop.cmake
+++ b/filters/formatting/ktptextui_message_filter_formatting.desktop.cmake
@@ -1,7 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Name=Text Formatting
-Name[ast]=Formatéu del testu
Name[bs]=Formatiranje teksta
Name[ca]=Formatació de text
Name[ca at valencia]=Formatació de text
diff --git a/filters/images/ktptextui_message_filter_images.desktop.cmake b/filters/images/ktptextui_message_filter_images.desktop.cmake
index 6baee2d..9beb35e 100644
--- a/filters/images/ktptextui_message_filter_images.desktop.cmake
+++ b/filters/images/ktptextui_message_filter_images.desktop.cmake
@@ -1,6 +1,5 @@
[Desktop Entry]
Name=Image Preview
-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 d'imatge
diff --git a/filters/latex/kcm_ktptextui_message_filter_latex.desktop b/filters/latex/kcm_ktptextui_message_filter_latex.desktop
index 949743a..bc2a06f 100644
--- a/filters/latex/kcm_ktptextui_message_filter_latex.desktop
+++ b/filters/latex/kcm_ktptextui_message_filter_latex.desktop
@@ -7,7 +7,6 @@ X-KDE-ParentApp=latex
X-KDE-ParentComponents=latex
Name=LaTeX
-Name[ast]=LaTeX
Name[bs]=LaTeX
Name[ca]=LaTeX
Name[ca at valencia]=LaTeX
diff --git a/filters/otr/ktptextui_message_filter_otr.desktop.cmake b/filters/otr/ktptextui_message_filter_otr.desktop.cmake
index b9868a2..5e5d67a 100644
--- a/filters/otr/ktptextui_message_filter_otr.desktop.cmake
+++ b/filters/otr/ktptextui_message_filter_otr.desktop.cmake
@@ -1,6 +1,5 @@
[Desktop Entry]
Name=OTR
-Name[ast]=OTR
Name[bs]=OTR
Name[ca]=OTR
Name[cs]=OTR
@@ -32,7 +31,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[cs]=Pokud je zpráva OTR, nebude zobrazena
diff --git a/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop.cmake b/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop.cmake
index 63cb81d..85c9d43 100644
--- a/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop.cmake
+++ b/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop.cmake
@@ -1,6 +1,5 @@
[Desktop Entry]
Name=Web Shortcuts
-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 3530391..75f0d46 100644
--- a/filters/texttospeech/ktptextui_message_filter_tts.desktop.cmake
+++ b/filters/texttospeech/ktptextui_message_filter_tts.desktop.cmake
@@ -1,6 +1,5 @@
[Desktop Entry]
Name=Text To Speech
-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 5d48c47..45989e6 100644
--- a/filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake
+++ b/filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake
@@ -1,7 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Name=Short URLs
-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 2fb6b7b..02e9f75 100644
--- a/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake
+++ b/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake
@@ -1,6 +1,5 @@
[Desktop Entry]
Name=YouTube Preview
-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
diff --git a/logviewer/ktp-log-viewer.desktop b/logviewer/ktp-log-viewer.desktop
index 1674566..84d737a 100644
--- a/logviewer/ktp-log-viewer.desktop
+++ b/logviewer/ktp-log-viewer.desktop
@@ -1,6 +1,5 @@
[Desktop Entry]
Name=KDE IM Log Viewer
-Name[ast]=Visor de rexistru de MI KDE
Name[bs]=Pregledač dnevnika za KDE IM Log
Name[ca]=Visor del registre de MI del KDE
Name[ca at valencia]=Visor del registre de MI del KDE
@@ -46,7 +45,6 @@ Name[x-test]=xxKDE IM Log Viewerxx
Name[zh_CN]=KDE 即时通讯日志查看程序
Name[zh_TW]=KDE 即時訊息紀錄檢視器
GenericName=KDE Instant Messenger Log Viewer
-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
@@ -91,7 +89,6 @@ GenericName[x-test]=xxKDE Instant Messenger Log Viewerxx
GenericName[zh_CN]=KDE 即时通讯日志查看程序
GenericName[zh_TW]=KDE 的即時訊息紀錄檢視器
Comment=Displays your KDE Instant Messenger logs
-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