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

The following commit has been merged in the master branch:
commit a11c87489376590d63f4f133b1fc7dc5faeb7245
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Feb 9 10:35:19 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"
---
 filters/youtube/ktptextui_message_filter_youtube.desktop.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake b/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake
index 53513ba..0c941a1 100644
--- a/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake
+++ b/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake
@@ -45,7 +45,7 @@ Name[zh_CN]=YouTube 预览
 Name[zh_TW]=YouTube 預覽
 Comment=If any messages contains a link to a YouTube video, it will embed a preview in the chat
 Comment[ar]=إن احتوت أيّ رسالة وصلة إلى فيديو يوتيوب، ستُضمّن معاينة في الدّردشة.
-Comment[ast]=Si cualesquier mensaxe contién un enllaz a un videu de Youtube, empotraráse una previsualización na charra
+Comment[ast]=Si cualesquier mensaxe contién un enllaz a un videu de Youtube, incrustaráse una previsualización na charra
 Comment[bs]=Ako poruka sadrži vezu na YouTube video, oma će se ugraditi u pregled ćaskanja
 Comment[ca]=Si qualsevol missatge conté un enllaç a un vídeo de YouTube, s'incrustarà una vista prèvia en el xat
 Comment[ca at valencia]=Si qualsevol missatge conté un enllaç a un vídeo de YouTube, s'incrustarà una vista prèvia en el xat

-- 
ktp-text-ui packaging