[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=7558fdd

The following commit has been merged in the master branch:
commit 7558fdd93cfc72757349c06ec773b5ff8e863003
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Nov 22 09:53:09 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/kdeconnect.notifyrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index 9ce747c..c36bfa6 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -185,7 +185,7 @@ Action=Popup
 
 [Event/missedCall]
 Name=Missed Call
-Name[ast]=Llamad perdida
+Name[ast]=Llamada perdida
 Name[bg]=Пропуснато обаждане
 Name[ca]=Trucada perduda
 Name[ca at valencia]=Trucada perduda

-- 
kdeconnect packaging