[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=feb0386

The following commit has been merged in the master branch:
commit feb0386bff5fa848fda33a948153f5ee51727434
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Mar 14 10:20:12 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"
---
 person/org.kde.person/metadata.desktop.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/person/org.kde.person/metadata.desktop.cmake b/person/org.kde.person/metadata.desktop.cmake
index 9f16007..40c561e 100644
--- a/person/org.kde.person/metadata.desktop.cmake
+++ b/person/org.kde.person/metadata.desktop.cmake
@@ -4,6 +4,7 @@ Name[ast]=Persona
 Name[ca]=Persona
 Name[cs]=Osoba
 Name[da]=Person
+Name[de]=Person
 Name[el]=Πρόσωπο
 Name[en_GB]=Person
 Name[es]=Persona

-- 
ktp-contact-applet packaging