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

The following commit has been merged in the master branch:
commit ea5b0e931d5a51f3bfbd5403739d756589272b56
Author: l10n daemon script <scripty at kde.org>
Date:   Fri Jul 31 09:57:19 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 78cffce..d98c59f 100644
--- a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
+++ b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
@@ -14,6 +14,7 @@ Name[fr]=Messagerie instantanée
 Name[gl]=Mensaxaría instantánea
 Name[hu]=Azonnali üzenetküldés
 Name[it]=Messaggistica istantanea
+Name[ko]=인스턴트 메시징
 Name[nb]=Lynmelding
 Name[nl]=Instant Messaging
 Name[pl]=Komunikator internetowy
@@ -47,6 +48,7 @@ Comment[fr]=Affiche votre présence et vos contacts
 Comment[gl]=Mostra a súa presenza e contactos.
 Comment[hu]=Megjeleníti a jelenlétét és partnereit
 Comment[it]=Mostra la tua presenza e i tuoi contatti
+Comment[ko]=온라인 상태와 대화 상대 표시
 Comment[nl]=Toont uw aanwezigheid en contactpersonen
 Comment[pl]=Wyświetla twoją dostępności i kontakty
 Comment[pt]=Mostra a sua presença e contactos
diff --git a/person/org.kde.person/metadata.desktop.cmake b/person/org.kde.person/metadata.desktop.cmake
index 07c6afc..bd93796 100644
--- a/person/org.kde.person/metadata.desktop.cmake
+++ b/person/org.kde.person/metadata.desktop.cmake
@@ -13,6 +13,7 @@ Name[fi]=Henkilö
 Name[fr]=Personne
 Name[gl]=Persoa
 Name[it]=Persona
+Name[ko]=사람
 Name[nl]=Persoon
 Name[pl]=Osoba
 Name[pt]=Pessoa
@@ -44,6 +45,7 @@ Comment[fi]=Helppo pääsy henkilöön
 Comment[fr]=Rendre une personne facilement accessible
 Comment[gl]=Permite acceder facilmente a unha persoa.
 Comment[it]=Rende una persona facilmente accessibile
+Comment[ko]=특정 사람과 빠르게 대화합니다
 Comment[nl]=Maakt een persoon gemakkelijk toegankelijk
 Comment[pl]=Czyni osobę łatwo dostępną
 Comment[pt]=Torna uma pessoa facilmente acessível

-- 
ktp-contact-applet packaging