[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=50ebf6e

The following commit has been merged in the master branch:
commit 50ebf6e9916b7cf455b354edba75488e7118819a
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Dec 30 09:34:54 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"
---
 filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake b/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake
index baec6ea..92df3ba 100644
--- a/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake
+++ b/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake
@@ -76,7 +76,7 @@ Comment[pa]=ਗੱਲਬਾਤ ਵਿੱਚ ਈਮੋਸ਼ਨ (ਮੁਖੜੇ) 
 Comment[pl]=Pokaż emotikony (buźki) wewnątrz okna rozmowy
 Comment[pt]=Mostrar os ícones emotivos nas conversas
 Comment[pt_BR]=Mostra emoticons (carinhas) dentro da conversa
-Comment[ro]=Arată emoticoni (fețe zîmbitoare) în interiorul discuției
+Comment[ro]=Arată emoticoni (fețe zâmbitoare) în interiorul discuției
 Comment[ru]=Показывать смайлики в чате
 Comment[sk]=Zobraziť emotikony (smajlíkov) v rozhovore
 Comment[sl]=Pokaži izrazne ikone (obraze smeškov) znotraj klepeta

-- 
ktp-text-ui packaging