[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=4e4b4eb

The following commit has been merged in the master branch:
commit 4e4b4eba832468c906146e49931a064714233ebf
Merge: b731bbe0a9efd52d9641ab9df2d66e60ed7114d0 490fe30a97ef3ae8d899034688ed40e0e1eae873
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Oct 12 10:56:41 2012 +0200

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	config/kcm_ktp_chat_messages.desktop
    	filters/formatting/ktptextui_message_filter_formatting.desktop
    	filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop
    	lib/ktptxtui_message_filter.desktop

 .../searchexpansion/ktptextui_message_filter_searchexpansion.desktop    | 1 +
 lib/adium-theme-view.cpp                                                | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --cc filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop
index 601c43a,03d090e..3362de9
--- a/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop
+++ b/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop
@@@ -7,8 -7,7 +7,9 @@@ Name[de]=Webkürze
  Name[el]=Συντομεύσεις ιστού
  Name[es]=Accesos rápidos a la web
  Name[et]=Veebikiirkorraldused
 +Name[fr]=Raccourcis web
+ Name[ga]=Aicearraí Gréasáin
 +Name[hu]=Keresőazonosítók
  Name[it]=Scorciatoie web
  Name[nb]=Nettsnarveier
  Name[nl]=Webkoppelingen

-- 
ktp-text-ui packaging