[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:30 UTC 2017


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

The following commit has been merged in the master branch:
commit ce0a885a451b57fda1b3c949039333e9265907a9
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Nov 7 09:47:21 2016 +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               | 1 +
 2 files changed, 3 insertions(+)

diff --git a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
index 6a928d2..782c1a9 100644
--- a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
+++ b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
@@ -17,6 +17,7 @@ Name[gl]=Mensaxaría instantánea
 Name[hu]=Azonnali üzenetküldés
 Name[it]=Messaggistica istantanea
 Name[ko]=인스턴트 메시징
+Name[lt]=Tikralaikiai pokalbiai
 Name[nb]=Lynmelding
 Name[nl]=Instant Messaging
 Name[nn]=Lynmeldingar
@@ -54,6 +55,7 @@ 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[lt]=Rodo jūsų būseną ir kontaktus
 Comment[nl]=Toont uw aanwezigheid en contactpersonen
 Comment[nn]=Vis lynmeldings­kontaktar
 Comment[pl]=Wyświetla twoją dostępność i kontakty
diff --git a/person/org.kde.person/metadata.desktop.cmake b/person/org.kde.person/metadata.desktop.cmake
index d61bdfc..c002f78 100644
--- a/person/org.kde.person/metadata.desktop.cmake
+++ b/person/org.kde.person/metadata.desktop.cmake
@@ -52,6 +52,7 @@ 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[lt]=Leidžia greitai pasiekti asmenį
 Comment[nl]=Maakt een persoon gemakkelijk toegankelijk
 Comment[nn]=Gjer ein person lett tilgjengeleg
 Comment[pl]=Czyni ludzi łatwo dostępnymi

-- 
ktp-contact-applet packaging



More information about the pkg-kde-commits mailing list