[gtkhtml/gtk3: 10/10] Merge branch 'master' into gtk3

[Milan Crha <mcrha src gnome org>]

commit 66bf54589b60b286f972388ecc4e25c898f88316
Merge: 36b0e82 fdb840a
Author: Milan Crha <mcrha redhat com>
Date:   Thu Dec 16 18:55:20 2010 +0100

    Merge branch 'master' into gtk3

 NEWS                                       |   10 +
 components/editor/Makefile.am              |    2 +-
 components/editor/gtkhtml-editor-private.h |    3 -
 components/editor/gtkhtml-editor-signals.c |   53 +--
 configure.ac                               |    2 +-
 gtkhtml/htmlengine.c                       |   10 +-
 gtkhtml/htmlgdkpainter.c                   |    5 +-
 gtkhtml/htmlimage.c                        |    6 +-
 gtkhtml/testgtkhtml.c                      |    6 +-
 po/th.po                                   | 1095 +++++++++++++---------------
 po/ug.po                                   |  165 ++---
 11 files changed, 636 insertions(+), 721 deletions(-)
---
diff --cc components/editor/Makefile.am
index 008ed3f,fece61c..ac0df44
--- a/components/editor/Makefile.am
+++ b/components/editor/Makefile.am
@@@ -82,10 -82,9 +82,10 @@@ endi
  gtkhtml_editor_test_SOURCES = main.c
  
  gtkhtml_editor_test_LDADD = \
- 	$(GTHREAD_LIBS)				\
+ 	@GTKHTML_LIBS@				\
  	libgtkhtml-editor- EDITOR_API_VERSION@.la			\
 -	$(top_builddir)/gtkhtml/libgtkhtml- EDITOR_API_VERSION@.la
 +	$(top_builddir)/gtkhtml/libgtkhtml- EDITOR_API_VERSION@.la	\
 +	@GTKHTML_LIBS@ 
  
  gtkhtml-editor-marshal.h: gtkhtml-editor-marshal.list $(GLIB_GENMARSHAL)
  	$(GLIB_GENMARSHAL) $< --header --prefix=gtkhtml_editor_marshal > $@