[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=15334c6

The following commit has been merged in the master branch:
commit 15334c6485def404ffa22ffd13fc8aa38996e4f9
Author: l10n daemon script <scripty at kde.org>
Date:   Tue May 26 13:50:14 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"
---
 plugins/morse/ktpaccountskcm_plugin_morse.desktop.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/morse/ktpaccountskcm_plugin_morse.desktop.cmake b/plugins/morse/ktpaccountskcm_plugin_morse.desktop.cmake
index 18b5d03..ed7a68f 100644
--- a/plugins/morse/ktpaccountskcm_plugin_morse.desktop.cmake
+++ b/plugins/morse/ktpaccountskcm_plugin_morse.desktop.cmake
@@ -30,6 +30,7 @@ Comment[sr at ijekavian]=Корисничко сучеље за подешавањ
 Comment[sr at ijekavianlatin]=Korisničko sučelje za podešavanje posebnih naloga pod menadžerom veze Morse.
 Comment[sr at latin]=Korisničko sučelje za podešavanje posebnih naloga pod menadžerom veze Morse.
 Comment[sv]=Användargränssnitt för anpassad kontoinställning av konton som använder anslutningshanteraren Morse.
+Comment[tr]=Morse bağlantı yöneticisi kullanan hesaplar için özel hesap yapılandırma kullanıcı arayüzü.
 Comment[uk]=Інтерфейс користувача для нетипового налаштовування облікового запису за допомогою керування з’єднаннями Morse.
 Comment[x-test]=xxCustom account configuration user interface for accounts using the Morse connection manager.xx
 Comment[zh_CN]=通过 Morse 连接管理器自定义账户的配置界面

-- 
ktp-accounts-kcm packaging