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

Maximiliano Curia maxy at moszumanska.debian.org
Sat May 28 00:20:00 UTC 2016


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

The following commit has been merged in the master branch:
commit 3520c52ffd4924ff64ada36effc05bd2c8cb4d33
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Jun 22 10:28:57 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 8e314c2..07c6afc 100644
--- a/person/org.kde.person/metadata.desktop.cmake
+++ b/person/org.kde.person/metadata.desktop.cmake
@@ -36,6 +36,7 @@ Comment[ast]=Fai d'accesu cenciellu una persona
 Comment[ca]=Fa accessible una persona fàcilment
 Comment[cs]=Usnadňuje přístup k osobám
 Comment[da]=Gør en person nemt tilgængelig
+Comment[de]=Ermöglicht den einfachen Zugriff auf eine Person
 Comment[el]=Καθιστά ένα πρόσωπο προσβάσιμο εύκολα
 Comment[en_GB]=Makes a person easily accessible
 Comment[es]=Hace a una persona fácilmente accesible

-- 
ktp-contact-applet packaging



More information about the pkg-kde-commits mailing list