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

The following commit has been merged in the master branch:
commit b70ff198fab6ee2e6e1f8e70bb2971e9b79b3242
Merge: 3faadd5aa728dfa113ae4f9534c4ec011734a95b b15541ff10ad46e7386231b133bb5ef195c1612c
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Oct 31 19:58:01 2012 +0100

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	config/kcm_ktp_chat_appearance.desktop
    	config/kcm_ktp_chat_behavior.desktop
    	filters/emoticons/ktptextui_message_filter_emoticons.desktop
    	filters/formatting/ktptextui_message_filter_formatting.desktop
    	filters/images/ktptextui_message_filter_images.desktop
    	lib/ktptxtui_message_filter.desktop
    	logviewer/ktp-log-viewer.desktop
    	plasmoid/org.kde.ktp-chatplasmoid/metadata.desktop

 filters/images/ktptextui_message_filter_images.desktop | 1 +
 lib/chat-widget.cpp                                    | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --cc filters/images/ktptextui_message_filter_images.desktop
index 6dbbe59,cd27ac6..675dcbd
--- a/filters/images/ktptextui_message_filter_images.desktop
+++ b/filters/images/ktptextui_message_filter_images.desktop
@@@ -36,12 -33,11 +36,13 @@@ Comment[el]=Ενσωματώστε μι
  Comment[es]=Empotrar una miniatura de cualquier URL de imagen enviado en un chat
  Comment[et]=Kõigi vestluses saadetud pildi-URL-ide näitamine pisipildina
  Comment[fi]=Upota esikatselu chattiin lähetetyistä kuvaosoitteista
 +Comment[fr]=Imbriquer une vignette d'une URL d'image quelconque envoyée dans une discussion
 +Comment[hu]=Bélyegkép beágyazása bármely képhivatkozáshoz, amelyet a csevegésben küldenek
  Comment[it]=Include miniature degli URL di immagini inviati in una chat
  Comment[nb]=Bygg inn et minibilde av enhver bilde-URL sent i en prat
 -Comment[nl]=Een miniatuur van elke verzonden URL van een afbeelding inbedden in een chat
 +Comment[nl]=Een miniatuur of elke verzonden URL van een afbeelding inbedden in een chat
+ Comment[pl]=Osadź miniaturę jakiegokolwiek adresu URL obrazu w oknie rozmowy
 -Comment[pt]=Incorporar uma miniatura de qualquer URL de imagens enviado numa conversa
 +Comment[pt]=Incorporar uma miniatura de qualquer URL de imagens numa conversa
  Comment[pt_BR]=Inserir uma miniatura de qualquer URL de imagem enviada em um bate-papo
  Comment[ro]=Înglobează miniatura oricărui URL de imagine trimis într-o discuție
  Comment[sk]=Zahrnúť náhľad každej URL poslanej v rozhovore

-- 
ktp-text-ui packaging