[gtkhtml/gtk3: 38/38] Synchronize with GtkHTML 3.91.5.

[Matthew Barnes <mbarnes src gnome org>]

commit 028fcac2b5986aa5718a52daed612de596092b55
Merge: 9195e9f 5f41deb
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Jan 9 09:59:57 2011 -0500

    Synchronize with GtkHTML 3.91.5.
    
    Conflicts:
    	components/editor/Makefile.am
    	configure.ac
    	gtkhtml/Makefile.am

 NEWS                                   |   34 +++
 components/editor/Makefile.am          |    8 +-
 components/editor/gtkhtml-editor.pc.in |    4 +-
 configure.ac                           |    2 +-
 gtkhtml/htmlclueflow.c                 |   12 +-
 po/et.po                               |    3 +-
 po/nb.po                               |  323 ++++++++++++------------
 po/ug.po                               |    8 +-
 po/zh_HK.po                            |  444 ++++++++++++++++----------------
 po/zh_TW.po                            |  444 ++++++++++++++++----------------
 10 files changed, 664 insertions(+), 618 deletions(-)
---
diff --cc components/editor/Makefile.am
index 31cc9ea,900e417..9e61232
--- a/components/editor/Makefile.am
+++ b/components/editor/Makefile.am
@@@ -1,9 -1,8 +1,9 @@@
  ### Process this file with automake to produce Makefile.in
  
- gtkhtml_data = $(datadir)/gtkhtml- EDITOR_API_VERSION@
+ gtkhtml_data = $(datadir)/gtkhtml- GTKHTML_API_VERSION@
  
  bin_PROGRAMS = gtkhtml-editor-test
 +lib_LTLIBRARIES = libgtkhtml-editor-4.0.la
  
  AM_CFLAGS = \
  	@GTKHTML_CFLAGS@			\
@@@ -22,9 -21,9 +22,9 @@@ BUILT_SOURCES = 
  	gtkhtml-spell-marshal.c			\
  	gtkhtml-spell-marshal.h
  
- libgtkhtml_editordir = $(includedir)/libgtkhtml- EDITOR_API_VERSION@/editor
+ libgtkhtml_editordir = $(includedir)/libgtkhtml- GTKHTML_API_VERSION@/editor
  
 -csources = 					\
 +libgtkhtml_editor_4_0_la_SOURCES = \
  	$(BUILT_SOURCES)			\
  	gtkhtml-color-combo.c			\
  	gtkhtml-color-combo.h			\
@@@ -64,19 -63,28 +64,19 @@@ libgtkhtml_editor_HEADERS = 
  	gtkhtml-spell-checker.h			\
  	gtkhtml-spell-language.h
  
 -if ENABLE_GTK3
 -lib_LTLIBRARIES = libgtkhtml-editor-4.0.la
 -libgtkhtml_editor_4_0_la_SOURCES = $(csources) 
  libgtkhtml_editor_4_0_la_LIBADD = \
  	@GTKHTML_LIBS@				\
- 	$(top_builddir)/gtkhtml/libgtkhtml- EDITOR_API_VERSION@.la
+ 	$(top_builddir)/gtkhtml/libgtkhtml- GTKHTML_API_VERSION@.la
 +
  libgtkhtml_editor_4_0_la_LDFLAGS = -no-undefined
 -else
 -lib_LTLIBRARIES = libgtkhtml-editor-3.14.la
 -libgtkhtml_editor_3_14_la_SOURCES = $(csources) 
 -libgtkhtml_editor_3_14_la_LIBADD = \
 -	@GTKHTML_LIBS@				\
 -	$(top_builddir)/gtkhtml/libgtkhtml- GTKHTML_API_VERSION@.la
 -libgtkhtml_editor_3_14_la_LDFLAGS = -no-undefined
 -endif
  
  gtkhtml_editor_test_SOURCES = main.c
  
  gtkhtml_editor_test_LDADD = \
  	@GTKHTML_LIBS@				\
  	libgtkhtml-editor- EDITOR_API_VERSION@.la			\
- 	$(top_builddir)/gtkhtml/libgtkhtml- EDITOR_API_VERSION@.la	\
 -	$(top_builddir)/gtkhtml/libgtkhtml- GTKHTML_API_VERSION@.la
++	$(top_builddir)/gtkhtml/libgtkhtml- GTKHTML_API_VERSION@.la	\
 +	@GTKHTML_LIBS@ 
  
  gtkhtml-editor-marshal.h: gtkhtml-editor-marshal.list $(GLIB_GENMARSHAL)
  	$(GLIB_GENMARSHAL) $< --header --prefix=gtkhtml_editor_marshal > $@