[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=2fa2655

The following commit has been merged in the master branch:
commit 2fa2655c05134b0e86ac3ed5aeb9438fbb75d9f2
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Apr 12 10:30:02 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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/kcm_ktp_integration_module.desktop b/config/kcm_ktp_integration_module.desktop
index 9e36885..16e6dea 100644
--- a/config/kcm_ktp_integration_module.desktop
+++ b/config/kcm_ktp_integration_module.desktop
@@ -14,6 +14,7 @@ X-KDE-System-Settings-Parent-Category=im-and-voip
 Categories=Qt;KDE;X-KDE-settings-network;
 
 Name=General
+Name[ar]=عامّ
 Name[bs]=Općenito
 Name[ca]=General
 Name[ca at valencia]=General

-- 
ktp-kded-integration-module packaging