[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=da846ec

The following commit has been merged in the master branch:
commit da846ec2948ba3bb328bed0d858e74c137cf5c79
Author: l10n daemon script <scripty at kde.org>
Date:   Tue May 26 13:50:43 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/otr/ktptextui_message_filter_otr.desktop.cmake | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/config/otr/kcm_ktp_chat_otr.desktop b/config/otr/kcm_ktp_chat_otr.desktop
index b51f770..17aa7cc 100644
--- a/config/otr/kcm_ktp_chat_otr.desktop
+++ b/config/otr/kcm_ktp_chat_otr.desktop
@@ -41,6 +41,7 @@ Comment[sr at ijekavian]=Шифрујте сесије ћаскања ОТР‑ом
 Comment[sr at ijekavianlatin]=Šifrujte sesije ćaskanja OTR‑om
 Comment[sr at latin]=Šifrujte sesije ćaskanja OTR‑om
 Comment[sv]=Kryptera chattsessioner med Off-The-Record kryptering
+Comment[tr]=Oturumları Kayıt Dışı şifrelemesi ile şifrele
 Comment[uk]=Шифрування сеансів спілкування за допомогою методу OTR (Off-The-Record)
 Comment[x-test]=xxEncrypt chat sessions with Off-The-Record encryptionxx
 Comment[zh_CN]=用非正式加密算法加密聊天会话
@@ -76,6 +77,7 @@ Name[sr at ijekavian]=ОТР
 Name[sr at ijekavianlatin]=OTR
 Name[sr at latin]=OTR
 Name[sv]=OTR
+Name[tr]=OTR
 Name[uk]=OTR
 Name[x-test]=xxOTRxx
 Name[zh_CN]=非公开加密
diff --git a/filters/otr/ktptextui_message_filter_otr.desktop.cmake b/filters/otr/ktptextui_message_filter_otr.desktop.cmake
index 9eeb0a3..aedd3fc 100644
--- a/filters/otr/ktptextui_message_filter_otr.desktop.cmake
+++ b/filters/otr/ktptextui_message_filter_otr.desktop.cmake
@@ -30,6 +30,7 @@ Name[sr at ijekavian]=ОТР
 Name[sr at ijekavianlatin]=OTR
 Name[sr at latin]=OTR
 Name[sv]=OTR
+Name[tr]=OTR
 Name[uk]=OTR
 Name[x-test]=xxOTRxx
 Name[zh_CN]=非公开加密
@@ -63,6 +64,7 @@ Comment[sr at ijekavian]=Ако је порука ОТР порука, неће б
 Comment[sr at ijekavianlatin]=Ako je poruka OTR poruka, neće biti prikazana.
 Comment[sr at latin]=Ako je poruka OTR poruka, neće biti prikazana.
 Comment[sv]=Om ett meddelande är ett OTR-meddelande, kommer det inte att visas
+Comment[tr]=Bir ileti kayıt dışı ise gösterilmeyecektir
 Comment[uk]=Якщо повідомлення є повідомленням OTR, його не буде показано
 Comment[x-test]=xxIf a message is an OTR message, it will not be shownxx
 Comment[zh_CN]=如果消息是非公开消息，该消息将不会显示

-- 
ktp-text-ui packaging