[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=eaeb8c1

The following commit has been merged in the master branch:
commit eaeb8c13a8d7266a62f85623b8cfccea14a3acb2
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Jan 10 11:42:44 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"
---
 data/ktelepathy.notifyrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/ktelepathy.notifyrc b/data/ktelepathy.notifyrc
index e59ec3d..6b7cfc9 100644
--- a/data/ktelepathy.notifyrc
+++ b/data/ktelepathy.notifyrc
@@ -1595,7 +1595,7 @@ Name[nds]=Ankamen Anroop
 Name[nl]=Inkomend gesprek
 Name[pa]=ਆ ਰਹੀ ਕਾਲ
 Name[pl]=Rozmowa przychodząca
-Name[pt]=Mensagem recebida
+Name[pt]=Chamada recebida
 Name[pt_BR]=Chamada recebida
 Name[ro]=Apel de intrare
 Name[ru]=Входящий вызов

-- 
ktp-common-internals packaging