[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=c360f7e

The following commit has been merged in the master branch:
commit c360f7eb98f42a53c3783f19bf7032c5af1b9ac7
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Dec 30 09:34:38 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_integration_module.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/kcm_ktp_integration_module.desktop b/config/kcm_ktp_integration_module.desktop
index 9fc95a3..8ce537c 100644
--- a/config/kcm_ktp_integration_module.desktop
+++ b/config/kcm_ktp_integration_module.desktop
@@ -83,7 +83,7 @@ Comment[it]=Impostazioni generali per messaggistica e VoIP
 Comment[kk]=Лезде хабарласу мен VoIP жалпы баптауы
 Comment[km]=ការ​កំណត់​ទូទៅ​សម្រាប់​ការ​ផ្ញើ​សារ​បន្ទាន់ និង VoIP
 Comment[ko]=인스턴트 메시지 및 VoIP 일반 설정
-Comment[lt]=Bendri Pokalbių ir VoIP nustatymai
+Comment[lt]=Bendri Pokalbių ir VoIP nuostatos
 Comment[nb]=Generelle instillinger for lynmeldinger og VoIP
 Comment[nds]=Allmeen Instellen för Kortnarichten un VoIP
 Comment[nl]=Algemene instellingen voor Instant Messaging en VoIP

-- 
ktp-kded-integration-module packaging