[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=54e11e3

The following commit has been merged in the master branch:
commit 54e11e32ad96d306eb3ca77ad8243f3ab94aeaf5
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Apr 27 10:19:30 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_otr.desktop                        | 6 ++++++
 filters/otr/ktptextui_message_filter_otr.desktop.cmake | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/config/kcm_ktp_chat_otr.desktop b/config/kcm_ktp_chat_otr.desktop
index 95b60d4..048307c 100644
--- a/config/kcm_ktp_chat_otr.desktop
+++ b/config/kcm_ktp_chat_otr.desktop
@@ -22,6 +22,7 @@ Comment[es]=Cifrar las sesiones de charla con el cifrado OTR
 Comment[et]=Vestlusseansside krüptimine Off-The-Record krüptimisega
 Comment[fi]=Salaa keskusteluistuntosi Off-The-Record-salauksella
 Comment[fr]=Chiffrez vos conversations avec le chiffrement Off-The-Record
+Comment[gl]=Cifra as sesións de conversa mediante cifrado non rexistrado.
 Comment[hu]=Csevegés munkamenet titkosítása nem rögzített (Off-The-Record) titkosítással
 Comment[it]=Cifra sessioni di chat con la cifratura Off-The-Record
 Comment[nb]=Krypter prateøkter med Off-The-Record-kryptering
@@ -30,6 +31,8 @@ Comment[nn]=Krypter prateøkter med Off-The-Record-kryptering
 Comment[pl]=Szyfrowanie sesji rozmowy za pomocą Off-The-Record
 Comment[pt]=Encriptar as sessões de conversão com encriptação OTR (Off-The-Record - Não Oficial)
 Comment[pt_BR]=Criptografa as sessões de bate-papo com criptografia OTR (Off-The-Record)
+Comment[ro]=Criptează sesiunile de discuție cu criptare Off-The-Record
+Comment[ru]=Шифрование разговоров по протоколу OTR
 Comment[sk]=Zašifruje rozhovory pomocou Off-The-Record (OTR) šifrovania
 Comment[sl]=Šifriranje klepetov s pomočjo šifriranja Off-The-Record
 Comment[sr]=Шифрујте сесије ћаскања ОТР‑ом
@@ -53,6 +56,7 @@ Name[es]=OTR
 Name[et]=OTR
 Name[fi]=OTR
 Name[fr]=OTR
+Name[gl]=OTR
 Name[hu]=OTR
 Name[it]=OTR
 Name[nb]=OTR
@@ -61,6 +65,8 @@ Name[nn]=OTR
 Name[pl]=OTR
 Name[pt]=OTR
 Name[pt_BR]=OTR
+Name[ro]=OTR
+Name[ru]=OTR
 Name[sk]=OTR
 Name[sl]=OTR
 Name[sr]=ОТР
diff --git a/filters/otr/ktptextui_message_filter_otr.desktop.cmake b/filters/otr/ktptextui_message_filter_otr.desktop.cmake
index 5e5d67a..a96d980 100644
--- a/filters/otr/ktptextui_message_filter_otr.desktop.cmake
+++ b/filters/otr/ktptextui_message_filter_otr.desktop.cmake
@@ -11,6 +11,7 @@ Name[es]=OTR
 Name[et]=OTR
 Name[fi]=OTR
 Name[fr]=OTR
+Name[gl]=OTR
 Name[hu]=OTR
 Name[it]=OTR
 Name[nb]=OTR
@@ -19,6 +20,8 @@ Name[nn]=OTR
 Name[pl]=OTR
 Name[pt]=OTR
 Name[pt_BR]=OTR
+Name[ro]=OTR
+Name[ru]=OTR
 Name[sk]=OTR
 Name[sl]=OTR
 Name[sr]=ОТР
@@ -42,6 +45,7 @@ Comment[es]=Si un mensaje es un mensaje OTR, no se mostrará
 Comment[et]=Kui tegu on OTR-sõnumiga, seda ei näidata.
 Comment[fi]=Jos viesti on OTR-viesti, sitä ei näytetä
 Comment[fr]=Si un message est un message OTR, il ne sera pas affiché
+Comment[gl]=Se unha mensaxe é «OTR», non se mostrará.
 Comment[hu]=Ha az üzenet egy OTR üzenet, nem lesz megjelenítve
 Comment[it]=Se un messaggio è un messaggio OTR, non sarà mostrato
 Comment[nb]=Hvis en melding er en OTR-melding blir den ikke vist
@@ -49,6 +53,7 @@ Comment[nl]=Als een bericht een OTR-bericht is, zal het niet getoond worden
 Comment[pl]=Jeśli wiadomość jest wiadomością OTR, to nie zostanie pokazana
 Comment[pt]=Se uma dada mensagem for em OTR, não será apresentada
 Comment[pt_BR]=Se uma determinada mensagem for em OTR, não será apresentada
+Comment[ru]=Если сообщение зашифровано по протоколу OTR, то оно не будет показано
 Comment[sk]=Ak správa je OTR správa, nebude zobrazená
 Comment[sl]=Če je sporočilo vrste OTR, ne bo prikazano
 Comment[sr]=Ако је порука ОТР порука, неће бити приказана.

-- 
ktp-text-ui packaging