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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 945c6f8f2ef91af38c0ceee09cd4600d30612465
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Jul 20 13:38:29 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"
---
 chat/org.kde.ktp-chat/metadata.desktop.cmake               | 2 +-
 contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/chat/org.kde.ktp-chat/metadata.desktop.cmake b/chat/org.kde.ktp-chat/metadata.desktop.cmake
index a10e2c3..ae0d4c9 100644
--- a/chat/org.kde.ktp-chat/metadata.desktop.cmake
+++ b/chat/org.kde.ktp-chat/metadata.desktop.cmake
@@ -73,7 +73,7 @@ Comment[nds]=Eenfach Klönen ut Dien Arbeitrebeet
 Comment[nl]=Eenvoudige chats vanuit uw werkruimte
 Comment[nn]=Enkel prat frå arbeidsflata
 Comment[pa]=ਤੁਹਾਡੇ ਵਰਕਸਪੇਸ ਤੋਂ ਆਮ ਗੱਲਾਬਾਤਾਂ
-Comment[pl]=Proste rozmowy z twojej przestrzeni roboczej
+Comment[pl]=Rozmowy z twojej przestrzeni pracy
 Comment[pt]=Conversas simples a partir da sua área de trabalho
 Comment[pt_BR]=Conversas simples a partir do seu ambiente de trabalho
 Comment[ro]=Discuții simple de pe spațiul de lucru
diff --git a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
index b8ed184..e625122 100644
--- a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
+++ b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
@@ -56,7 +56,7 @@ Comment[it]=Mostra la tua presenza e i tuoi contatti
 Comment[ko]=온라인 상태와 대화 상대 표시
 Comment[nl]=Toont uw aanwezigheid en contactpersonen
 Comment[nn]=Vis lynmeldingskontaktar
-Comment[pl]=Wyświetla twoją dostępności i kontakty
+Comment[pl]=Wyświetla twoją dostępność i kontakty
 Comment[pt]=Mostra a sua presença e contactos
 Comment[pt_BR]=Mostra a sua presença e contatos
 Comment[ro]=Vă afișează prezența și contactele

-- 
ktp-contact-applet packaging