[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=98be816

The following commit has been merged in the master branch:
commit 98be816f2b3a877909ec1342ddb23d5c82a27ae0
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Nov 4 17:15:16 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/otr/kcm_ktp_chat_otr.desktop                                     | 2 ++
 filters/formatting/ktptextui_message_filter_formatting.desktop.cmake    | 2 +-
 filters/images/ktptextui_message_filter_images.desktop.cmake            | 2 +-
 filters/otr/ktptextui_message_filter_otr.desktop.cmake                  | 2 ++
 .../urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake    | 2 +-
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/config/otr/kcm_ktp_chat_otr.desktop b/config/otr/kcm_ktp_chat_otr.desktop
index 129f6cf..d71595e 100644
--- a/config/otr/kcm_ktp_chat_otr.desktop
+++ b/config/otr/kcm_ktp_chat_otr.desktop
@@ -14,6 +14,7 @@ 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»
 Comment[cs]=Šifrovat rozhovory pomocí OTR (Off-The-Record encryption)
 Comment[da]=Kryptér chatsessioner med 'uofficielt'-kryptering
 Comment[de]=Chatsitzung mit Off-The-Record-Verschlüsselung sichern
@@ -51,6 +52,7 @@ Name=OTR
 Name[ast]=OTR
 Name[bs]=OTR
 Name[ca]=OTR
+Name[ca at valencia]=OTR
 Name[cs]=OTR
 Name[da]=OTR
 Name[de]=OTR
diff --git a/filters/formatting/ktptextui_message_filter_formatting.desktop.cmake b/filters/formatting/ktptextui_message_filter_formatting.desktop.cmake
index d1d71cd..b72bd3f 100644
--- a/filters/formatting/ktptextui_message_filter_formatting.desktop.cmake
+++ b/filters/formatting/ktptextui_message_filter_formatting.desktop.cmake
@@ -48,7 +48,7 @@ Name[zh_TW]=文字格式
 Comment=Use /, _, * and - to make text italic, underlined, bold or strikeout respectively
 Comment[bs]=Koristite _, * i - da napravite tekst kurzivnim, podebljanim ili precrtanim
 Comment[ca]=Usa /, _, * i - per convertir el text a itàlic, subratllat, negreta o ratllat respectivament
-Comment[ca at valencia]=Usa /, _, * i - per convertir el text a itàlic, subratllat, negreta o tatxat respectivament
+Comment[ca at valencia]=Usa /, _, * i - per convertir el text a itàlic, subratllat, negreta o ratllat respectivament
 Comment[cs]=Použít /,_, * a - pro kurzívu, podtržený, tučný a přeškrtnutý text
 Comment[da]=Brug /, _, * og - til at lave hhv. kursiv, fed eller overstreget
 Comment[de]=Mit „/“, „_“, “*“ und „-“ wird Text geneigt, unterstrichen, fett oder durchgestrichen dargestellt
diff --git a/filters/images/ktptextui_message_filter_images.desktop.cmake b/filters/images/ktptextui_message_filter_images.desktop.cmake
index 2c24dc8..55d0ef1 100644
--- a/filters/images/ktptextui_message_filter_images.desktop.cmake
+++ b/filters/images/ktptextui_message_filter_images.desktop.cmake
@@ -4,7 +4,7 @@ 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 d'imatge
+Name[ca at valencia]=Vista prèvia de la imatge
 Name[cs]=Náhled obrázku
 Name[da]=Forhåndsvisning af billede
 Name[de]=Bildvorschau
diff --git a/filters/otr/ktptextui_message_filter_otr.desktop.cmake b/filters/otr/ktptextui_message_filter_otr.desktop.cmake
index a89183f..e8aedb3 100644
--- a/filters/otr/ktptextui_message_filter_otr.desktop.cmake
+++ b/filters/otr/ktptextui_message_filter_otr.desktop.cmake
@@ -3,6 +3,7 @@ Name=OTR
 Name[ast]=OTR
 Name[bs]=OTR
 Name[ca]=OTR
+Name[ca at valencia]=OTR
 Name[cs]=OTR
 Name[da]=OTR
 Name[de]=OTR
@@ -40,6 +41,7 @@ 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à
 Comment[cs]=Pokud je zpráva OTR, nebude zobrazena
 Comment[da]=Hvis en besked er en OTR-besked, vil den ikke blive vist
 Comment[de]=Wenn eine Nachricht vom Typ OTR ist, wird sie nicht angezeigt
diff --git a/filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake b/filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake
index 1fe776e..cdd30e7 100644
--- a/filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake
+++ b/filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake
@@ -46,7 +46,7 @@ Comment=Shows the actual URL to which a shortened URL is redirecting to
 Comment[ar]=يظهر العنوان الفعليّ الّذي يعيد العنوان المقصّر التّوجيه إليه
 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 que es redirigeix un URL breu
+Comment[ca at valencia]=Mostra l'URL real al qual es redirigeix un URL breu
 Comment[cs]=Zobrazí skutečné URL, na které je přesměrováno zkrácené URL
 Comment[da]=Viser den faktiske URL som en afkortet URL videresender til
 Comment[de]=Zeigt die tatsächliche Adresse (URL), auf die eine gekürzte URL umgeleitet wird

-- 
ktp-text-ui packaging