[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=c4b1594

The following commit has been merged in the master branch:
commit c4b1594b3ab74f78c8869a1f2c32fd2a1b1a5d63
Author: l10n daemon script <scripty at kde.org>
Date:   Sun May 31 10:15:18 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"
---
 logviewer/ktp-log-viewer.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/logviewer/ktp-log-viewer.desktop b/logviewer/ktp-log-viewer.desktop
index a51a1c2..d8a60c9 100644
--- a/logviewer/ktp-log-viewer.desktop
+++ b/logviewer/ktp-log-viewer.desktop
@@ -29,7 +29,7 @@ Name[nl]=KDE viewer voor IM-log
 Name[pa]=KDE IM ਲਾਗ ਝਲਕ
 Name[pl]=Przeglądarka dziennika KI KDE
 Name[pt]=Visualizador dos Registos de MI do KDE
-Name[pt_BR]=Visualizador dos registros de MI do KDE
+Name[pt_BR]=Visualizador de registros de MI do KDE
 Name[ro]=Vizualizator de jurnale pentru MI KDE
 Name[ru]=Просмотр журнала общения в KDE
 Name[sk]=Prehliadač záznamu KDE IM

-- 
ktp-text-ui packaging