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

The following commit has been merged in the master branch:
commit 7c9b29505a2506e567ff517a858bb30586a7e491
Author: l10n daemon script <scripty at kde.org>
Date:   Fri Jul 31 09:57:04 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 8b5587d..30885e9 100644
--- a/plugins/morse/ktpaccountskcm_plugin_morse.desktop.cmake
+++ b/plugins/morse/ktpaccountskcm_plugin_morse.desktop.cmake
@@ -16,6 +16,7 @@ Comment[fr]=Interface utilisateur personnalisée pour la configuration de compte
 Comment[gl]=Interface de usuario de configuración personalizada da conta para contas que empreguen o xestor de conexións Morse.
 Comment[hu]=Egyedi beállítófelület a Morse kapcsolatkezelőt használó azonosítókhoz.
 Comment[it]=Interfaccia utente personalizzata di configurazione account per account che usano il gestore di connessioni Morse.
+Comment[ko]=Morse 연결 관리자를 사용하는 계정 설정 사용자 인터페이스입니다.
 Comment[nb]=Brukerflate for å sette opp egendefinerte kontoer ved bruk av Morse tilkoblingsbehandler.
 Comment[nl]=Gebruikersinterface voor aangepaste accountconfiguratie voor accounts die de Morse verbindingenbeheerder gebruiken.
 Comment[pl]=Dostosowana nakładka graficzna do ustawiania kont dla kont wykorzystujących usługę połączeń Morse.

-- 
ktp-accounts-kcm packaging