[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=5dd3060

The following commit has been merged in the master branch:
commit 5dd30602cb25862984fbc6acaada1823c6c03221
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Dec 27 09:14:33 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"
---
 data/ktelepathy.notifyrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/ktelepathy.notifyrc b/data/ktelepathy.notifyrc
index 1a0a722..05e4492 100644
--- a/data/ktelepathy.notifyrc
+++ b/data/ktelepathy.notifyrc
@@ -495,7 +495,7 @@ Name[nb]=Informasjonsmelding fra lynmelding
 Name[nds]=Kortnarichten-Informatschoon
 Name[nl]=Informatiemelding van Instant Messaging
 Name[pa]=ਤੁਰੰਤ ਸੁਨੇਹਾ ਜਾਣਕਾਰੀ ਸੁਨੇਹਾ
-Name[pl]=Wiadomość informacyjna komunikatora internetowego
+Name[pl]=Informacja z komunikatora internetowego
 Name[pt]=Mensagem informativa instantânea
 Name[pt_BR]=Mensagem informativa instantânea
 Name[ro]=Mesaj informativ de la mesageria instantanee
@@ -539,7 +539,7 @@ Comment[nb]=En generell informasjonsmelding fra lynmeldingssystemet
 Comment[nds]=En allmeen Naricht över de Kortnarichten
 Comment[nl]=Een algemene informatiemelding uit Instant Messaging
 Comment[pa]=ਤੁਰੰਤ ਸੁਨੇਹੇ ਤੋਂ ਆਮ ਜਾਣਕਾਰੀ ਸੁਨੇਹਾ
-Comment[pl]=Ogólna wiadomość informacyjna z komunikatora internetowego
+Comment[pl]=Ogólna wiadomość z komunikatora internetowego
 Comment[pt]=Uma mensagem informativa geral das mensagens instantâneas
 Comment[pt_BR]=Uma mensagem informativa geral das mensagens instantâneas
 Comment[ro]=Mesaj informativ general de la mesageria instantanee

-- 
ktp-common-internals packaging