[SCM] ktp-contact-applet packaging branch, master, updated. debian/16.04.2-1-67-g066859a

Maximiliano Curia maxy at moszumanska.debian.org
Tue Sep 12 14:08:32 UTC 2017


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

The following commit has been merged in the master branch:
commit d7918e757cc551428a03c2c5849c73b116596d26
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Apr 8 04:18:14 2017 +0200

    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 b314ff6..9d72156 100644
--- a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
+++ b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
@@ -15,6 +15,7 @@ Name[fi]=Pikaviestintä
 Name[fr]=Messagerie instantanée
 Name[gl]=Mensaxaría instantánea
 Name[hu]=Azonnali üzenetküldés
+Name[ia]=Messageria instantanee
 Name[it]=Messaggistica istantanea
 Name[ko]=인스턴트 메시징
 Name[lt]=Tikralaikiai pokalbiai
@@ -53,6 +54,7 @@ Comment[fi]=Näyttää läsnäolon ja yhteystiedot
 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[ia]=Monstra tu presentia e contactos
 Comment[it]=Mostra la tua presenza e i tuoi contatti
 Comment[ko]=온라인 상태와 대화 상대 표시
 Comment[lt]=Rodo jūsų būseną ir kontaktus
diff --git a/person/org.kde.person/metadata.desktop.cmake b/person/org.kde.person/metadata.desktop.cmake
index 856053e..d46af0d 100644
--- a/person/org.kde.person/metadata.desktop.cmake
+++ b/person/org.kde.person/metadata.desktop.cmake
@@ -15,6 +15,7 @@ Name[fi]=Henkilö
 Name[fr]=Personne
 Name[gl]=Persoa
 Name[hu]=Partner
+Name[ia]=Persona
 Name[it]=Persona
 Name[ko]=사람
 Name[lt]=Asmuo
@@ -52,6 +53,7 @@ Comment[fi]=Helppo pääsy henkilöön
 Comment[fr]=Rendre une personne facilement accessible
 Comment[gl]=Permite acceder facilmente a unha persoa.
 Comment[hu]=Egyszerűbben elérhetővé tesz egy partnert
+Comment[ia]=Face un persona facilmente accessibile
 Comment[it]=Rende una persona facilmente accessibile
 Comment[ko]=특정 사람과 빠르게 대화합니다
 Comment[lt]=Leidžia greitai pasiekti asmenį

-- 
ktp-contact-applet packaging



More information about the pkg-kde-commits mailing list