[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=0f3c1ef

The following commit has been merged in the master branch:
commit 0f3c1ef7c75c3a108b5f73488f27bc3929a26043
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Mar 14 04:17:58 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/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop
index caac54a..ceb3e3c 100644
--- a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop
+++ b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop
@@ -16,6 +16,7 @@ Name[bs]=Izostavi čuvar ekrana
 Name[ca]=Inhibeix l'estalvi de pantalla
 Name[cs]=Potlačit spořič
 Name[da]=Forhindr pauseskærm
+Name[de]=Bildschirmschoner unterbinden
 Name[es]=Inhibir salvapantallas
 Name[fi]=Estä näytönsäästäjän käynnistyminen
 Name[fr]=Inhiber l'économiseur d'écran

-- 
kdeconnect packaging