[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=17ee2a6

The following commit has been merged in the master branch:
commit 17ee2a6e6799df4a152a18e23c204be6938c4ce7
Author: l10n daemon script <scripty at kde.org>
Date:   Fri Aug 14 09:51:15 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 bd93796..e3c8be2 100644
--- a/person/org.kde.person/metadata.desktop.cmake
+++ b/person/org.kde.person/metadata.desktop.cmake
@@ -14,6 +14,7 @@ Name[fr]=Personne
 Name[gl]=Persoa
 Name[it]=Persona
 Name[ko]=사람
+Name[lt]=Asmuo
 Name[nl]=Persoon
 Name[pl]=Osoba
 Name[pt]=Pessoa

-- 
ktp-contact-applet packaging