[SCM] ktp-contact-runner packaging branch, master, updated. debian/15.12.1-2-244-g38a1f58

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-runner.git;a=commitdiff;h=2f9ec1d

The following commit has been merged in the master branch:
commit 2f9ec1d7bd924383f0c803ed2f3d925531ddad8c
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Jul 5 10:01:16 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"
---
 plasma-runner-ktp-contact.desktop.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plasma-runner-ktp-contact.desktop.cmake b/plasma-runner-ktp-contact.desktop.cmake
index 7e248b1..4cf8532 100644
--- a/plasma-runner-ktp-contact.desktop.cmake
+++ b/plasma-runner-ktp-contact.desktop.cmake
@@ -70,7 +70,7 @@ Comment[nds]=En Klöönsnack mit een vun Dien KM-Kontakten starten oder Dien KN-
 Comment[nl]=Begin een chat met een van uw IM-contactpersonen of wijzig uw IM-status
 Comment[pl]=Rozpocznij rozmowę z którymkolwiek z twoich kontaktów lub zmień swoja dostępność
 Comment[pt]=Iniciar uma conversa com qualquer um dos seus contactos MI ou mudar o seu estado
-Comment[pt_BR]=Inicia um bate-papo com um dos seus contatos de MI ou altera o seu status
+Comment[pt_BR]=Inicia uma conversa com um dos seus contatos de MI ou altera o seu status
 Comment[ro]=Începeți o discuție cu oricare dintre contactele de MI sau schimbați-vă starea
 Comment[ru]=Начать общение с любым вашим контактом или изменить ваш статус в системе обмена сообщениями
 Comment[sk]=Spustiť rozhovor s nejakým z vašich IM kontaktov alebo zmeniť váš IM stav

-- 
ktp-contact-runner packaging