[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=095f1a5

The following commit has been merged in the master branch:
commit 095f1a5334718814bbb2daeaad51c7d215eddd1e
Author: l10n daemon script <scripty at kde.org>
Date:   Fri Jul 17 10:50:05 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"
---
 .../kcm_ktptextui_message_filter_emoticons.desktop | 47 ++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/filters/emoticons/kcm_ktptextui_message_filter_emoticons.desktop b/filters/emoticons/kcm_ktptextui_message_filter_emoticons.desktop
index a247383..daa8fc1 100644
--- a/filters/emoticons/kcm_ktptextui_message_filter_emoticons.desktop
+++ b/filters/emoticons/kcm_ktptextui_message_filter_emoticons.desktop
@@ -7,3 +7,50 @@ X-KDE-ParentApp=emoticons
 X-KDE-ParentComponents=emoticons
 
 Name=Emoticons
+Name[ast]=Fustaxes
+Name[bs]=Emotikoni
+Name[ca]=Emoticones
+Name[ca at valencia]=Emoticones
+Name[cs]=Emotikony
+Name[da]=Emotikoner
+Name[de]=Emoticons
+Name[el]=Emoticons
+Name[en_GB]=Emoticons
+Name[es]=Emoticonos
+Name[et]=Emotikonid
+Name[fi]=Hymiöt
+Name[fr]=Émoticônes
+Name[ga]=Straoiseoga
+Name[gl]=Emoticonas
+Name[hu]=Hangulatjelek
+Name[ia]=Emoticones
+Name[it]=Emoticon
+Name[kk]=Көңіл күйі белгілері
+Name[ko]=이모티콘
+Name[lt]=Jaustukai
+Name[mr]=भावप्रतिमा
+Name[nb]=Humørfjes
+Name[nds]=Snuten
+Name[nl]=Emoticons
+Name[nn]=Fjesingar
+Name[pa]=ਈਮੋਸ਼ਨ
+Name[pl]=Emotikony
+Name[pt]=Ícones Emotivos
+Name[pt_BR]=Emoticons
+Name[ro]=Emoticoni
+Name[ru]=Смайлики
+Name[se]=Mojánat
+Name[sk]=Emotikony
+Name[sl]=Izrazne ikone
+Name[sr]=Емотикони
+Name[sr at ijekavian]=Емотикони
+Name[sr at ijekavianlatin]=Emotikoni
+Name[sr at latin]=Emotikoni
+Name[sv]=Smilisar
+Name[tr]=İfadeler
+Name[ug]=چىراي ئىپادىلىرى
+Name[uk]=Емоційки
+Name[wa]=Xhinêyes
+Name[x-test]=xxEmoticonsxx
+Name[zh_CN]=表情
+Name[zh_TW]=表情圖示

-- 
ktp-text-ui packaging