[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=e57e384

The following commit has been merged in the master branch:
commit e57e384f410534e71d920e2dce10e02295b2c7e8
Author: l10n daemon script <scripty at kde.org>
Date:   Tue May 26 13:50:29 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"
---
 contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake | 2 ++
 person/org.kde.person/metadata.desktop.cmake               | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
index 4e19a03..1afbd18 100644
--- a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
+++ b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
@@ -28,6 +28,7 @@ Name[sr at ijekavian]=Брзо гласништво
 Name[sr at ijekavianlatin]=Brzo glasništvo
 Name[sr at latin]=Brzo glasništvo
 Name[sv]=Direktmeddelande
+Name[tr]=Anında Mesajlaşma
 Name[uk]=Миттєвий обмін повідомленнями
 Name[x-test]=xxInstant Messagingxx
 Name[zh_CN]=即时通讯
@@ -59,6 +60,7 @@ Comment[sr at ijekavian]=Приказ вашег присуства и контак
 Comment[sr at ijekavianlatin]=Prikaz vašeg prisustva i kontakata
 Comment[sr at latin]=Prikaz vašeg prisustva i kontakata
 Comment[sv]=Visar din närvaro och kontakter
+Comment[tr]=Kimliğini ve bağlantılarını görüntüler
 Comment[uk]=Показувати дані щодо вашої присутності та контактів
 Comment[x-test]=xxDisplays your presence and contactsxx
 Comment[zh_CN]=显示您的状态和联系人
diff --git a/person/org.kde.person/metadata.desktop.cmake b/person/org.kde.person/metadata.desktop.cmake
index beac218..8e314c2 100644
--- a/person/org.kde.person/metadata.desktop.cmake
+++ b/person/org.kde.person/metadata.desktop.cmake
@@ -26,6 +26,7 @@ Name[sr at ijekavian]=Особа
 Name[sr at ijekavianlatin]=Osoba
 Name[sr at latin]=Osoba
 Name[sv]=Person
+Name[tr]=Kişi
 Name[uk]=Особа
 Name[x-test]=xxPersonxx
 Name[zh_CN]=个人
@@ -55,6 +56,7 @@ Comment[sr at ijekavian]=Чини особу лако доступном
 Comment[sr at ijekavianlatin]=Čini osobu lako dostupnom
 Comment[sr at latin]=Čini osobu lako dostupnom
 Comment[sv]=Gör en person lätt tillgänglig
+Comment[tr]=Bir kişiyi kolay erişilebilir yapar
 Comment[uk]=Спрощує доступ до особи
 Comment[x-test]=xxMakes a person easily accessiblexx
 Comment[zh_CN]=访问他人变得简单

-- 
ktp-contact-applet packaging