*/Makefile.am: Now passes 'make distcheck'. Now loops. I'm not sure what

*/Makefile.am: Now passes 'make distcheck'. Now loops. I'm not sure what
is up.

1998-12-23  Elliot Lee  <sopwith@redhat.com>

	* gtk/gtkmenu.c: Allow programmer to gtk_object_set_data(obj,
 	"GtkTearoffMenuItem_window_title", ..) on a GtkMenuItem and have
 	it be recognized. If we're getting the title out of the GtkLabel,
 	then remove all underscores.

17 files changed, 1355 insertions, 196 deletions

diff --git a/ChangeLog b/ChangeLog
index 921525fc33..a44107544f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1998-12-23  Elliot Lee  <sopwith@redhat.com>
+
+	* gtk/gtkmenu.c: Allow programmer to gtk_object_set_data(obj,
+ 	"GtkTearoffMenuItem_window_title", ..) on a GtkMenuItem and have
+ 	it be recognized. If we're getting the title out of the GtkLabel,
+ 	then remove all underscores.
+
 Tue Dec 22 17:01:43 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkdnd.c (gtk_drag_dest_handle_event): 
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 921525fc33..a44107544f 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+1998-12-23  Elliot Lee  <sopwith@redhat.com>
+
+	* gtk/gtkmenu.c: Allow programmer to gtk_object_set_data(obj,
+ 	"GtkTearoffMenuItem_window_title", ..) on a GtkMenuItem and have
+ 	it be recognized. If we're getting the title out of the GtkLabel,
+ 	then remove all underscores.
+
 Tue Dec 22 17:01:43 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkdnd.c (gtk_drag_dest_handle_event): 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 921525fc33..a44107544f 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+1998-12-23  Elliot Lee  <sopwith@redhat.com>
+
+	* gtk/gtkmenu.c: Allow programmer to gtk_object_set_data(obj,
+ 	"GtkTearoffMenuItem_window_title", ..) on a GtkMenuItem and have
+ 	it be recognized. If we're getting the title out of the GtkLabel,
+ 	then remove all underscores.
+
 Tue Dec 22 17:01:43 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkdnd.c (gtk_drag_dest_handle_event): 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 921525fc33..a44107544f 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+1998-12-23  Elliot Lee  <sopwith@redhat.com>
+
+	* gtk/gtkmenu.c: Allow programmer to gtk_object_set_data(obj,
+ 	"GtkTearoffMenuItem_window_title", ..) on a GtkMenuItem and have
+ 	it be recognized. If we're getting the title out of the GtkLabel,
+ 	then remove all underscores.
+
 Tue Dec 22 17:01:43 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkdnd.c (gtk_drag_dest_handle_event): 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 921525fc33..a44107544f 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+1998-12-23  Elliot Lee  <sopwith@redhat.com>
+
+	* gtk/gtkmenu.c: Allow programmer to gtk_object_set_data(obj,
+ 	"GtkTearoffMenuItem_window_title", ..) on a GtkMenuItem and have
+ 	it be recognized. If we're getting the title out of the GtkLabel,
+ 	then remove all underscores.
+
 Tue Dec 22 17:01:43 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkdnd.c (gtk_drag_dest_handle_event): 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 921525fc33..a44107544f 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+1998-12-23  Elliot Lee  <sopwith@redhat.com>
+
+	* gtk/gtkmenu.c: Allow programmer to gtk_object_set_data(obj,
+ 	"GtkTearoffMenuItem_window_title", ..) on a GtkMenuItem and have
+ 	it be recognized. If we're getting the title out of the GtkLabel,
+ 	then remove all underscores.
+
 Tue Dec 22 17:01:43 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkdnd.c (gtk_drag_dest_handle_event): 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 921525fc33..a44107544f 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+1998-12-23  Elliot Lee  <sopwith@redhat.com>
+
+	* gtk/gtkmenu.c: Allow programmer to gtk_object_set_data(obj,
+ 	"GtkTearoffMenuItem_window_title", ..) on a GtkMenuItem and have
+ 	it be recognized. If we're getting the title out of the GtkLabel,
+ 	then remove all underscores.
+
 Tue Dec 22 17:01:43 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkdnd.c (gtk_drag_dest_handle_event): 
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 6f9ac9bdb0..6374f94de2 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -4,90 +4,67 @@ info_TEXINFOS = gdk.texi gtk.texi
 
 man_MANS = gtk-config.1
 
-EXTRA_DIST =	\
-	texinfo.tex 		\
-	macros.texi		\
-	gtkdocs_fix		\
-	gtkfaq.sgml		\
-        gtk-config.txt          \
-	gtk_tut.sgml		\
-	gtk_tut_it.sgml		\
-	gtk_tut_fr.sgml		\
-	debugging.txt		\
-	developers.txt		\
-	refcounting.txt		\
-	styles.txt		\
-	text_widget.txt 	\
-	widget_system.txt 	\
-	gtk_tut_packbox1.gif 	\
-	gtk_tut_packbox2.gif 	\
-	html/gtk_tut_table.gif	\
-	html/gtk_tut_packbox1.gif 	\
-	html/gtk_tut_packbox2.gif 	\
-	gtk_tut_table.gif	\
-	gtk-config.1		\
-	html/gdk.html            	\
-	html/gdk_toc.html        	\
-	html/gtk.html            	\
-	html/gtk_toc.html        	\
-	html/gtk_tut.html        	\
-	html/gtk_tut-1.html      	\
-	html/gtk_tut-2.html      	\
-	html/gtk_tut-3.html      	\
-	html/gtk_tut-4.html      	\
-	html/gtk_tut-5.html      	\
-	html/gtk_tut-6.html      	\
-	html/gtk_tut-7.html      	\
-	html/gtk_tut-8.html      	\
-	html/gtk_tut-9.html      	\
-	html/gtk_tut-10.html     	\
-	html/gtk_tut-11.html     	\
-	html/gtk_tut-12.html     	\
-	html/gtk_tut-13.html     	\
-	html/gtk_tut-14.html     	\
-	html/gtk_tut-15.html     	\
-	html/gtk_tut-16.html     	\
-	html/gtk_tut-17.html     	\
-	html/gtk_tut-18.html     	\
-	html/gtk_tut-19.html     	\
-	html/gtk_tut-20.html     	\
-	html/gtk_tut-21.html     	\
-	html/gtk_tut-22.html     	\
-	html/gtk_tut-23.html     	\
-	html/gtk_tut-24.html     	\
-	html/gtk_tut-25.html     	\
-	html/gtk_tut-26.html     	\
-	html/gtk_tut-27.html     	\
-	html/gtk_tut-28.html     	\
-	html/gtk_tut-29.html     	\
-	html/gtk_tut-30.html     	\
-	html/gtk_tut-31.html     	\
-	html/gtk_tut_fr.html     	\
-	html/gtk_tut_fr-1.html   	\
-	html/gtk_tut_fr-2.html   	\
-	html/gtk_tut_fr-3.html   	\
-	html/gtk_tut_fr-4.html   	\
-	html/gtk_tut_fr-5.html   	\
-	html/gtk_tut_fr-6.html   	\
-	html/gtk_tut_fr-7.html   	\
-	html/gtk_tut_fr-8.html   	\
-	html/gtk_tut_fr-9.html   	\
-	html/gtk_tut_fr-10.html  	\
-	html/gtk_tut_fr-11.html  	\
-	html/gtk_tut_fr-12.html  	\
-	html/gtk_tut_fr-13.html  	\
-	html/gtk_tut_fr-14.html  	\
-	html/gtk_tut_fr-15.html  	\
-	html/gtk_tut_fr-16.html  	\
-	html/gtk_tut_fr-17.html  	\
-	html/gtk_tut_fr-18.html  	\
-	html/gtk_tut_fr-19.html  	\
-	html/gtk_tut_fr-20.html  	\
-	html/gtk_tut_fr-21.html  	\
-	html/gtk_tut_fr-22.html  	\
-	html/gtk_tut_fr-23.html  	\
-	html/gtk_tut_fr-24.html  	\
-	html/gtk_tut_it.html     	\
+TUTORIAL_FR_FILES=html/gtk_tut_fr-1.html   	\
+html/gtk_tut_fr-2.html   	\
+html/gtk_tut_fr-3.html   	\
+html/gtk_tut_fr-4.html   	\
+html/gtk_tut_fr-5.html   	\
+html/gtk_tut_fr-6.html   	\
+html/gtk_tut_fr-7.html   	\
+html/gtk_tut_fr-8.html   	\
+html/gtk_tut_fr-9.html   	\
+html/gtk_tut_fr-10.html  	\
+html/gtk_tut_fr-11.html  	\
+html/gtk_tut_fr-12.html  	\
+html/gtk_tut_fr-13.html  	\
+html/gtk_tut_fr-14.html  	\
+html/gtk_tut_fr-15.html  	\
+html/gtk_tut_fr-16.html  	\
+html/gtk_tut_fr-17.html  	\
+html/gtk_tut_fr-18.html  	\
+html/gtk_tut_fr-19.html  	\
+html/gtk_tut_fr-20.html  	\
+html/gtk_tut_fr-21.html  	\
+html/gtk_tut_fr-22.html  	\
+html/gtk_tut_fr-23.html  	\
+html/gtk_tut_fr-24.html  	\
+html/gtk_tut_fr.html text/gtk_tut_fr.txt
+
+TUTORIAL_FILES=text/gtk_tut.txt html/gtk_tut.html \
+html/gtk_tut.html        	\
+html/gtk_tut-1.html      	\
+html/gtk_tut-2.html      	\
+html/gtk_tut-3.html      	\
+html/gtk_tut-4.html      	\
+html/gtk_tut-5.html      	\
+html/gtk_tut-6.html      	\
+html/gtk_tut-7.html      	\
+html/gtk_tut-8.html      	\
+html/gtk_tut-9.html      	\
+html/gtk_tut-10.html     	\
+html/gtk_tut-11.html     	\
+html/gtk_tut-12.html     	\
+html/gtk_tut-13.html     	\
+html/gtk_tut-14.html     	\
+html/gtk_tut-15.html     	\
+html/gtk_tut-16.html     	\
+html/gtk_tut-17.html     	\
+html/gtk_tut-18.html     	\
+html/gtk_tut-19.html     	\
+html/gtk_tut-20.html     	\
+html/gtk_tut-21.html     	\
+html/gtk_tut-22.html     	\
+html/gtk_tut-23.html     	\
+html/gtk_tut-24.html     	\
+html/gtk_tut-25.html     	\
+html/gtk_tut-26.html     	\
+html/gtk_tut-27.html     	\
+html/gtk_tut-28.html     	\
+html/gtk_tut-29.html     	\
+html/gtk_tut-30.html     	\
+html/gtk_tut-31.html
+
+TUTORIAL_IT_FILES=	html/gtk_tut_it.html     	\
 	html/gtk_tut_it-1.html   	\
 	html/gtk_tut_it-2.html   	\
 	html/gtk_tut_it-3.html   	\
@@ -111,8 +88,10 @@ EXTRA_DIST =	\
 	html/gtk_tut_it-21.html  	\
 	html/gtk_tut_it-22.html  	\
 	html/gtk_tut_it-23.html  	\
-	html/gtk_tut_it-24.html  	\
-	html/gtkfaq.html		\
+	html/gtk_tut_it-24.html		\
+	text/gtk_tut_it.txt
+
+FAQ_FILES=html/gtkfaq.html		\
 	html/gtkfaq-1.html       	\
 	html/gtkfaq-2.html       	\
 	html/gtkfaq-3.html       	\
@@ -121,56 +100,87 @@ EXTRA_DIST =	\
 	html/gtkfaq-6.html       	\
 	html/gtkfaq-7.html		\
 	text/gtkfaq.txt			\
-	text/gtk_tut.txt		\
-	text/gtk_tut_it.txt		\
-	text/gtk_tut_fr.txt
+
+EXTRA_DIST =	\
+	texinfo.tex 		\
+	macros.texi		\
+	gtkdocs_fix		\
+	gtkfaq.sgml		\
+        gtk-config.txt          \
+	gtk_tut.sgml		\
+	gtk_tut_it.sgml		\
+	gtk_tut_fr.sgml		\
+	debugging.txt		\
+	developers.txt		\
+	refcounting.txt		\
+	styles.txt		\
+	text_widget.txt 	\
+	widget_system.txt 	\
+	gtk_tut_packbox1.gif 	\
+	gtk_tut_packbox2.gif 	\
+	html/gtk_tut_table.gif	\
+	html/gtk_tut_packbox1.gif 	\
+	html/gtk_tut_packbox2.gif 	\
+	gtk_tut_table.gif	\
+	gtk-config.1		\
+	html/gdk.html            	\
+	html/gdk_toc.html        	\
+	html/gtk.html            	\
+	html/gtk_toc.html        	\
+	$(TUTORIAL_FILES)		\
+	$(TUTORIAL_FR_FILES)		\
+	$(TUTORIAL_IT_FILES)		\
+	$(FAQ_FILES)
 
 .PHONY: html htmldir gdk.html gtk.html faq tutorial tutorial_it tutorial_fr files
 
 distdocs: gdk.html gtk.html faq tutorial tutorial_it tutorial_fr
 
 htmldir:
-	mkdir -p html
-	cp gtk_tut*gif html/
+	(cd $(srcdir); mkdir -p html; cp gtk_tut*gif html)
 
 textdir:
-	mkdir -p text
+	mkdir -p $(srcdir)/text
 
-gdk.html: htmldir
-	texi2html gdk.texi
-	mv gdk.html gdk_toc.html html/
+html/gdk.html html/gdk_toc.html: htmldir
+	(cd $(srcdir); texi2html gdk.texi; mv gdk.html gdk_toc.html html)
 
-gtk.html: htmldir
-	texi2html gtk.texi
-	mv gtk.html gtk_toc.html html/
+html/gtk.html html/gtk_toc.html: htmldir
+	(cd $(srcdir); texi2html gtk.texi; mv gtk.html gtk_toc.html html)
 
 faq: htmldir textdir
-	sgml2html gtkfaq.sgml
-	perl gtkdocs_fix gtkfaq*html
-	mv gtkfaq*html html/
-	sgml2txt gtkfaq.sgml
-	mv gtkfaq.txt text/
+	(cd $(srcdir); sgml2html gtkfaq.sgml; \
+	perl gtkdocs_fix gtkfaq*html; \
+	mv gtkfaq*html html/; \
+	sgml2txt gtkfaq.sgml; \
+	mv gtkfaq.txt text/)
+
+$(TUTORIAL_FILES): tutorial
+
+$(TUTORIAL_FR_FILES): tutorial_fr
+
+$(TUTORIAL_IT_FILES): tutorial_it
 
 tutorial: htmldir textdir
-	sgml2html gtk_tut.sgml
-	perl gtkdocs_fix gtk_tut*html
-	mv gtk_tut*html html/
-	sgml2txt gtk_tut.sgml
-	mv gtk_tut.txt text/
-
-tutorial_it: htmldir
-	sgml2html gtk_tut_it.sgml
-	perl gtkdocs_fix gtk_tut_it*html
-	mv gtk_tut_it*html html/
-	sgml2txt gtk_tut_it.sgml
-	mv gtk_tut_it.txt text/
-
-tutorial_fr: htmldir
-	sgml2html gtk_tut_fr.sgml
-	perl gtkdocs_fix gtk_tut_fr*html
-	mv gtk_tut_fr*html html/
-	sgml2txt gtk_tut_fr.sgml
-	mv gtk_tut_fr.txt text/
+	(cd $(srcdir); sgml2html gtk_tut.sgml; \
+	perl gtkdocs_fix gtk_tut*html; \
+	mv gtk_tut*html html/; \
+	sgml2txt gtk_tut.sgml; \
+	mv gtk_tut.txt text/)
+
+tutorial_it: htmldir textdir
+	(cd $(srcdir); sgml2html gtk_tut_it.sgml; \
+	perl gtkdocs_fix gtk_tut_it*html; \
+	mv gtk_tut_it*html html/; \
+	sgml2txt gtk_tut_it.sgml; \
+	mv gtk_tut_it.txt text/)
+
+tutorial_fr: htmldir textdir
+	(cd $(srcdir); sgml2html gtk_tut_fr.sgml; \
+	perl gtkdocs_fix gtk_tut_fr*html; \
+	mv gtk_tut_fr*html html/; \
+	sgml2txt gtk_tut_fr.sgml; \
+	mv gtk_tut_fr.txt text/)
 
 
 files:
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 9664149536..2729ee3f06 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -4,7 +4,7 @@ gtkincludedir = $(includedir)/gtk
 
 lib_LTLIBRARIES = libgtk.la
 
-static_sources = \
+static_SOURCES = \
 	gtkaccelgroup.c		\
 	gtkaccellabel.c		\
 	gtkadjustment.c		\
@@ -113,7 +113,7 @@ static_sources = \
 	fnmatch.h
 
 libgtk_la_SOURCES = \
-	$(static_sources)	\
+	$(static_SOURCES)	\
 	gtkmarshal.c
 
 # Source headers which are non-autogenerated headers
@@ -287,12 +287,13 @@ gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl gtk.defs
 	s-gtbe \
 	&& mv s-gtbe gtktypebuiltins_evals.c
 
-gtkmarshal.c gtkmarshal.h: @REBUILD@ stamp-m
-	@:
+#gtkmarshal.c gtkmarshal.h: @REBUILD@ stamp-m
+#	@:
+
 stamp-m: @REBUILD@ gtkmarshal.list genmarshal.pl
-	srcdir=$(srcdir) INDENT=$(INDENT) $(PERL) $(srcdir)/genmarshal.pl \
+	(cd $(srcdir); srcdir=$(srcdir) INDENT=$(INDENT) $(PERL) $(srcdir)/genmarshal.pl \
 	&& (cmp -s s-gmc gtkmarshal.c || mv s-gmc gtkmarshal.c) && rm -f s-gmc \
-	&& (cmp -s s-gmh gtkmarshal.h || mv s-gmh gtkmarshal.h) && rm -f s-gmh \
+	&& (cmp -s s-gmh gtkmarshal.h || mv s-gmh gtkmarshal.h) && rm -f s-gmh) \
 	&& echo timestamp > stamp-m
 
 libgtk_la_LDFLAGS = \
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 6008da04e6..368fa0af3b 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -616,9 +616,23 @@ gtk_menu_set_tearoff_state (GtkMenu  *menu,
 		  GtkWidget *child = GTK_BIN (attach_widget)->child;
 		  if (GTK_IS_LABEL (child))
 		    {
-		      gchar *ret;
-		      gtk_label_get (GTK_LABEL (child), &ret);
-		      gdk_window_set_title (menu->tearoff_window->window, ret);
+		      gchar *ret, *retdup = NULL, *ctmp;
+		      
+		      ret = gtk_object_get_data(GTK_OBJECT(attach_widget),
+						"GtkTearoffMenuItem_window_title");
+		      if(!ret) {
+			gtk_label_get (GTK_LABEL (child), &ret);
+
+			retdup = ctmp = g_strdup(ret);
+			
+			/* Get rid of all the _'s from menu item hotkeys */
+			while((ctmp = strchr(ctmp, '_')))
+			  g_memmove(ctmp, ctmp+1, strlen(ctmp+1)+1);
+		      }
+
+		      gdk_window_set_title (menu->tearoff_window->window,
+					    retdup?retdup:ret);
+		      g_free(retdup);
 		    }
 		}
 
diff --git a/po/de.po b/po/de.po
index 5a10b5f9ac..36e3635f34 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 1.1.9\n"
-"POT-Creation-Date: 1998-12-15 19:45+0100\n"
+"POT-Creation-Date: 1998-12-20 12:00-0500\n"
 "PO-Revision-Date: 1998-12-18 12:15+0100\n"
 "Last-Translator: Sven Neumann <sven@gimp.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -13,10 +13,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gtk/gtkarg.c:155
-msgid "argument name exceeds maximum size."
-msgstr "Argumentname ist länger als die maximale Größe."
-
 #: gtk/gtkcolorsel.c:202
 msgid "Hue:"
 msgstr "Ton:"
@@ -46,23 +42,24 @@ msgid "Opacity:"
 msgstr "Deckkraft:"
 
 #. The OK button
-#: gtk/gtkcolorsel.c:1636 gtk/gtkfilesel.c:462 gtk/gtkfontsel.c:3458
+#: gtk/gtkcolorsel.c:1637 gtk/gtkfilesel.c:462 gtk/gtkfontsel.c:3458
 #: gtk/gtkgamma.c:408
 msgid "OK"
 msgstr "OK"
 
 #. The Cancel button
-#: gtk/gtkcolorsel.c:1642 gtk/gtkfilesel.c:469 gtk/gtkfilesel.c:844
+#: gtk/gtkcolorsel.c:1643 gtk/gtkfilesel.c:469 gtk/gtkfilesel.c:844
 #: gtk/gtkfilesel.c:944 gtk/gtkfilesel.c:1059 gtk/gtkfontsel.c:3471
 #: gtk/gtkgamma.c:416
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: gtk/gtkcolorsel.c:1647
+#: gtk/gtkcolorsel.c:1648
 msgid "Help"
 msgstr "Hilfe"
 
-#: gtk/gtkfilesel.c:419
+#. The directories clist
+#: gtk/gtkfilesel.c:411
 msgid "Directories"
 msgstr "Verzeichnisse"
 
@@ -239,6 +236,7 @@ msgid "Actual Font Name:"
 msgstr "Aktueller Schriftname:"
 
 #: gtk/gtkfontsel.c:758
+#, c-format
 msgid "%i fonts available with a total of %i styles."
 msgstr "%i Schriften verfügbar mit insgesamt %i Stilen."
 
@@ -429,7 +427,7 @@ msgstr "(ausgeschaltet)"
 msgid "clear"
 msgstr "gelöscht"
 
-#: gtk/gtknotebook.c:1947 gtk/gtknotebook.c:3967
+#: gtk/gtknotebook.c:1946 gtk/gtknotebook.c:3966
 #, c-format
 msgid "Page %u"
 msgstr "Seite %u"
@@ -444,26 +442,14 @@ msgstr "Kann Bilddatei in Pfad: \"%s\" nicht finden. Zeile %d"
 msgid "Unable to locate image file in pixmap_path: \"%s\""
 msgstr "Kann Bilddatei in Pfad: \"%s\" nicht finden"
 
-#: gtk/gtkthemes.c:72
+#: gtk/gtkthemes.c:71
 #, c-format
 msgid "Unable to locate loadable module in module_path: \"%s\","
 msgstr "Kann ladbares Modul in Pfad: \"%s\" nicht finden,"
 
-#. load the lib
-#: gtk/gtkthemes.c:80
-msgid "Loading Theme %s\n"
-msgstr ""
-
 #: gtk/gtktipsquery.c:172
 msgid "--- No Tip ---"
 msgstr "--- Kein Tip ---"
 
-#: gtk/gtkwidget.c:2614
-msgid "could not determine signal number for event: %d"
-msgstr ""
-
-
-
-
-
-
+#~ msgid "argument name exceeds maximum size."
+#~ msgstr "Argumentname ist länger als die maximale Größe."
diff --git a/po/fr.po b/po/fr.po
index 7defc36e4b..89151c94b9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ VERSION\n"
-"POT-Creation-Date: 1998-12-18 20:32+0100\n"
+"POT-Creation-Date: 1998-12-20 12:00-0500\n"
 "PO-Revision-Date: 1998-12-18 20:32+0100\n"
 "Last-Translator: Vincent Renardias <vincent@debian.org>\n"
 "Language-Team: Vincent Renardias <vincent@debian.org>\n"
@@ -436,7 +436,8 @@ msgstr "Page %u"
 #: gtk/gtkrc.c:1533
 #, c-format
 msgid "Unable to locate image file in pixmap_path: \"%s\" line %d"
-msgstr "Impossible de localiser le fichier image dans pixmap_path: \"%s\" ligne %d"
+msgstr ""
+"Impossible de localiser le fichier image dans pixmap_path: \"%s\" ligne %d"
 
 #: gtk/gtkrc.c:1536
 #, c-format
diff --git a/po/ja.po b/po/ja.po
index cb7329dba0..c700e567e0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 1.1.7\n"
-"POT-Creation-Date: 1998-12-18 17:31+0900\n"
+"POT-Creation-Date: 1998-12-20 12:00-0500\n"
 "PO-Revision-Date: 1998-12-16 15:18+0900\n"
 "Last-Translator: Çòºê ÂÙ¹° <yasuhiro@awa.tohoku.ac.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
diff --git a/po/nl.po b/po/nl.po
index 8da63d538d..2e4e361a67 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-12-18 01:13+0100\n"
+"POT-Creation-Date: 1998-12-20 12:00-0500\n"
 "PO-Revision-Date: 1998-12-18 01:13+0100\n"
 "Last-Translator: Paul Siegmann <pauls@euronet.nl>\n"
 "Language-Team: LANGUAGE <nl@li.org>\n"
@@ -14,26 +14,61 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: gtk/gtkfilesel.c:419
-msgid "Directories"
-msgstr "Directories"
+#: gtk/gtkcolorsel.c:202
+msgid "Hue:"
+msgstr ""
 
-#. The files clist
-#: gtk/gtkfilesel.c:430
-msgid "Files"
-msgstr "Bestanden"
+#: gtk/gtkcolorsel.c:203
+msgid "Saturation:"
+msgstr ""
+
+#: gtk/gtkcolorsel.c:204
+msgid "Value:"
+msgstr ""
+
+#: gtk/gtkcolorsel.c:205
+msgid "Red:"
+msgstr ""
+
+#: gtk/gtkcolorsel.c:206
+msgid "Green:"
+msgstr ""
+
+#: gtk/gtkcolorsel.c:207
+msgid "Blue:"
+msgstr ""
+
+#: gtk/gtkcolorsel.c:208
+msgid "Opacity:"
+msgstr ""
 
 #. The OK button
-#: gtk/gtkfilesel.c:462
+#: gtk/gtkcolorsel.c:1637 gtk/gtkfilesel.c:462 gtk/gtkfontsel.c:3458
+#: gtk/gtkgamma.c:408
 msgid "OK"
 msgstr "OK"
 
 #. The Cancel button
-#: gtk/gtkfilesel.c:469 gtk/gtkfilesel.c:844 gtk/gtkfilesel.c:944
-#: gtk/gtkfilesel.c:1059
+#: gtk/gtkcolorsel.c:1643 gtk/gtkfilesel.c:469 gtk/gtkfilesel.c:844
+#: gtk/gtkfilesel.c:944 gtk/gtkfilesel.c:1059 gtk/gtkfontsel.c:3471
+#: gtk/gtkgamma.c:416
 msgid "Cancel"
 msgstr "Annuleren"
 
+#: gtk/gtkcolorsel.c:1648
+msgid "Help"
+msgstr ""
+
+#. The directories clist
+#: gtk/gtkfilesel.c:411
+msgid "Directories"
+msgstr "Directories"
+
+#. The files clist
+#: gtk/gtkfilesel.c:430
+msgid "Files"
+msgstr "Bestanden"
+
 #: gtk/gtkfilesel.c:500 gtk/gtkfilesel.c:1455
 #, c-format
 msgid "Directory unreadable: %s"
@@ -61,7 +96,7 @@ msgid "Error"
 msgstr "Fout"
 
 #. close button
-#: gtk/gtkfilesel.c:733
+#: gtk/gtkfilesel.c:733 gtk/gtkinputdialog.c:346
 msgid "Close"
 msgstr "Sluiten"
 
@@ -87,3 +122,334 @@ msgstr "Verwijder"
 #: gtk/gtkfilesel.c:1050
 msgid "Rename"
 msgstr "Hernoem"
+
+#: gtk/gtkfontsel.c:203
+msgid "Foundry:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:204
+msgid "Family:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:205
+msgid "Weight:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:206
+msgid "Slant:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:207
+msgid "Set Width:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:208
+msgid "Add Style:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:209
+msgid "Pixel Size:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:210
+msgid "Point Size:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:211
+msgid "Resolution X:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:212
+msgid "Resolution Y:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:213
+msgid "Spacing:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:214
+msgid "Average Width:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:215
+msgid "Charset:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:442
+msgid "Font Property"
+msgstr ""
+
+#: gtk/gtkfontsel.c:442
+msgid "Requested Value"
+msgstr ""
+
+#: gtk/gtkfontsel.c:442
+msgid "Actual Value"
+msgstr ""
+
+#: gtk/gtkfontsel.c:481
+msgid "Font"
+msgstr ""
+
+#: gtk/gtkfontsel.c:491 gtk/gtkfontsel.c:2139 gtk/gtkfontsel.c:2369
+msgid "Font:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:496
+msgid "Font Style:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:501
+msgid "Size:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:633 gtk/gtkfontsel.c:855
+#, fuzzy
+msgid "Reset Filter"
+msgstr "Verwijder Bestand"
+
+#: gtk/gtkfontsel.c:647
+msgid "Metric:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:651
+msgid "Points"
+msgstr ""
+
+#: gtk/gtkfontsel.c:658
+msgid "Pixels"
+msgstr ""
+
+#. create the text entry widget
+#: gtk/gtkfontsel.c:674
+msgid "Preview:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:703
+msgid "Font Information"
+msgstr ""
+
+#: gtk/gtkfontsel.c:736
+msgid "Requested Font Name:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:747
+msgid "Actual Font Name:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:758
+#, c-format
+msgid "%i fonts available with a total of %i styles."
+msgstr ""
+
+#: gtk/gtkfontsel.c:773
+#, fuzzy
+msgid "Filter"
+msgstr "Bestanden"
+
+#: gtk/gtkfontsel.c:786
+msgid "Font Types:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:794
+msgid "Bitmap"
+msgstr ""
+
+#: gtk/gtkfontsel.c:800
+msgid "Scalable"
+msgstr ""
+
+#: gtk/gtkfontsel.c:806
+msgid "Scaled Bitmap"
+msgstr ""
+
+#. Convert '(nil)' weights to 'regular', since it looks nicer.
+#: gtk/gtkfontsel.c:1202
+msgid "regular"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1207 gtk/gtkfontsel.c:1931
+msgid "italic"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1208 gtk/gtkfontsel.c:1932
+msgid "oblique"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1209 gtk/gtkfontsel.c:1933
+msgid "reverse italic"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1210 gtk/gtkfontsel.c:1934
+msgid "reverse oblique"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1211 gtk/gtkfontsel.c:1935
+msgid "other"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1218
+msgid "[M]"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1219
+msgid "[C]"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1763
+msgid "The selected font is not available."
+msgstr ""
+
+#: gtk/gtkfontsel.c:1769
+msgid "The selected font is not a valid font."
+msgstr ""
+
+#: gtk/gtkfontsel.c:1827
+msgid "This is a 2-byte font and may not be displayed correctly."
+msgstr ""
+
+#: gtk/gtkfontsel.c:1919 gtk/gtkinputdialog.c:599
+msgid "(unknown)"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1930
+msgid "roman"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1942
+msgid "proportional"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1943
+msgid "monospaced"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1944
+msgid "char cell"
+msgstr ""
+
+#: gtk/gtkfontsel.c:2144
+msgid "Font: (Filter Applied)"
+msgstr ""
+
+#: gtk/gtkfontsel.c:2620
+msgid "MAX_FONTS exceeded. Some fonts may be missing."
+msgstr ""
+
+#: gtk/gtkfontsel.c:3465
+msgid "Apply"
+msgstr ""
+
+#: gtk/gtkfontsel.c:3487
+msgid "Font Selection"
+msgstr ""
+
+#: gtk/gtkgamma.c:388
+msgid "Gamma"
+msgstr ""
+
+#: gtk/gtkgamma.c:395
+msgid "Gamma value"
+msgstr ""
+
+#. shell and main vbox
+#: gtk/gtkinputdialog.c:192
+msgid "Input"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:200
+msgid "No input devices"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:229
+msgid "Device:"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:245
+msgid "Disabled"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:253
+msgid "Screen"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:261
+msgid "Window"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:269
+msgid "Mode: "
+msgstr ""
+
+#. The axis listbox
+#: gtk/gtkinputdialog.c:299
+msgid "Axes"
+msgstr ""
+
+#. Keys listbox
+#: gtk/gtkinputdialog.c:315
+msgid "Keys"
+msgstr ""
+
+#. We create the save button in any case, so that clients can
+#. connect to it, without paying attention to whether it exits
+#: gtk/gtkinputdialog.c:337
+msgid "Save"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:492
+msgid "X"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:493
+msgid "Y"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:494
+msgid "Pressure"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:495
+msgid "X Tilt"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:496
+msgid "Y Tilt"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:536
+msgid "none"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:570 gtk/gtkinputdialog.c:606
+msgid "(disabled)"
+msgstr ""
+
+#. and clear button
+#: gtk/gtkinputdialog.c:684
+msgid "clear"
+msgstr ""
+
+#: gtk/gtknotebook.c:1946 gtk/gtknotebook.c:3966
+#, c-format
+msgid "Page %u"
+msgstr ""
+
+#: gtk/gtkrc.c:1533
+#, c-format
+msgid "Unable to locate image file in pixmap_path: \"%s\" line %d"
+msgstr ""
+
+#: gtk/gtkrc.c:1536
+#, c-format
+msgid "Unable to locate image file in pixmap_path: \"%s\""
+msgstr ""
+
+#: gtk/gtkthemes.c:71
+#, c-format
+msgid "Unable to locate loadable module in module_path: \"%s\","
+msgstr ""
+
+#: gtk/gtktipsquery.c:172
+msgid "--- No Tip ---"
+msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 0c6230942a..db562f66ac 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 1.1.9\n"
-"POT-Creation-Date: 1998-12-18 21:46-0600\n"
+"POT-Creation-Date: 1998-12-20 12:00-0500\n"
 "PO-Revision-Date: 1998-12-18 02:21+0100\n"
 "Last-Translator: Krzysztof Krzy¿aniak <eloy@venco.com.pl>\n"
 "Language-Team: Polish <plug@poznan.linux.org.pl>\n"
@@ -14,26 +14,61 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gtk/gtkfilesel.c:419
-msgid "Directories"
-msgstr "Katalogi"
+#: gtk/gtkcolorsel.c:202
+msgid "Hue:"
+msgstr ""
 
-#. The files clist
-#: gtk/gtkfilesel.c:430
-msgid "Files"
-msgstr "Pliki"
+#: gtk/gtkcolorsel.c:203
+msgid "Saturation:"
+msgstr ""
+
+#: gtk/gtkcolorsel.c:204
+msgid "Value:"
+msgstr ""
+
+#: gtk/gtkcolorsel.c:205
+msgid "Red:"
+msgstr ""
+
+#: gtk/gtkcolorsel.c:206
+msgid "Green:"
+msgstr ""
+
+#: gtk/gtkcolorsel.c:207
+msgid "Blue:"
+msgstr ""
+
+#: gtk/gtkcolorsel.c:208
+msgid "Opacity:"
+msgstr ""
 
 #. The OK button
-#: gtk/gtkfilesel.c:462
+#: gtk/gtkcolorsel.c:1637 gtk/gtkfilesel.c:462 gtk/gtkfontsel.c:3458
+#: gtk/gtkgamma.c:408
 msgid "OK"
 msgstr "OK"
 
 #. The Cancel button
-#: gtk/gtkfilesel.c:469 gtk/gtkfilesel.c:844 gtk/gtkfilesel.c:944
-#: gtk/gtkfilesel.c:1059
+#: gtk/gtkcolorsel.c:1643 gtk/gtkfilesel.c:469 gtk/gtkfilesel.c:844
+#: gtk/gtkfilesel.c:944 gtk/gtkfilesel.c:1059 gtk/gtkfontsel.c:3471
+#: gtk/gtkgamma.c:416
 msgid "Cancel"
 msgstr "Anuluj"
 
+#: gtk/gtkcolorsel.c:1648
+msgid "Help"
+msgstr ""
+
+#. The directories clist
+#: gtk/gtkfilesel.c:411
+msgid "Directories"
+msgstr "Katalogi"
+
+#. The files clist
+#: gtk/gtkfilesel.c:430
+msgid "Files"
+msgstr "Pliki"
+
 #: gtk/gtkfilesel.c:500 gtk/gtkfilesel.c:1455
 #, c-format
 msgid "Directory unreadable: %s"
@@ -61,7 +96,7 @@ msgid "Error"
 msgstr "B³±d"
 
 #. close button
-#: gtk/gtkfilesel.c:733
+#: gtk/gtkfilesel.c:733 gtk/gtkinputdialog.c:346
 msgid "Close"
 msgstr "Zamknij"
 
@@ -87,3 +122,334 @@ msgstr "Skasuj"
 #: gtk/gtkfilesel.c:1050
 msgid "Rename"
 msgstr "Zmieñ nazwê"
+
+#: gtk/gtkfontsel.c:203
+msgid "Foundry:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:204
+msgid "Family:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:205
+msgid "Weight:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:206
+msgid "Slant:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:207
+msgid "Set Width:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:208
+msgid "Add Style:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:209
+msgid "Pixel Size:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:210
+msgid "Point Size:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:211
+msgid "Resolution X:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:212
+msgid "Resolution Y:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:213
+msgid "Spacing:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:214
+msgid "Average Width:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:215
+msgid "Charset:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:442
+msgid "Font Property"
+msgstr ""
+
+#: gtk/gtkfontsel.c:442
+msgid "Requested Value"
+msgstr ""
+
+#: gtk/gtkfontsel.c:442
+msgid "Actual Value"
+msgstr ""
+
+#: gtk/gtkfontsel.c:481
+msgid "Font"
+msgstr ""
+
+#: gtk/gtkfontsel.c:491 gtk/gtkfontsel.c:2139 gtk/gtkfontsel.c:2369
+msgid "Font:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:496
+msgid "Font Style:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:501
+msgid "Size:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:633 gtk/gtkfontsel.c:855
+#, fuzzy
+msgid "Reset Filter"
+msgstr "Skasuj plik"
+
+#: gtk/gtkfontsel.c:647
+msgid "Metric:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:651
+msgid "Points"
+msgstr ""
+
+#: gtk/gtkfontsel.c:658
+msgid "Pixels"
+msgstr ""
+
+#. create the text entry widget
+#: gtk/gtkfontsel.c:674
+msgid "Preview:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:703
+msgid "Font Information"
+msgstr ""
+
+#: gtk/gtkfontsel.c:736
+msgid "Requested Font Name:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:747
+msgid "Actual Font Name:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:758
+#, c-format
+msgid "%i fonts available with a total of %i styles."
+msgstr ""
+
+#: gtk/gtkfontsel.c:773
+#, fuzzy
+msgid "Filter"
+msgstr "Pliki"
+
+#: gtk/gtkfontsel.c:786
+msgid "Font Types:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:794
+msgid "Bitmap"
+msgstr ""
+
+#: gtk/gtkfontsel.c:800
+msgid "Scalable"
+msgstr ""
+
+#: gtk/gtkfontsel.c:806
+msgid "Scaled Bitmap"
+msgstr ""
+
+#. Convert '(nil)' weights to 'regular', since it looks nicer.
+#: gtk/gtkfontsel.c:1202
+msgid "regular"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1207 gtk/gtkfontsel.c:1931
+msgid "italic"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1208 gtk/gtkfontsel.c:1932
+msgid "oblique"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1209 gtk/gtkfontsel.c:1933
+msgid "reverse italic"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1210 gtk/gtkfontsel.c:1934
+msgid "reverse oblique"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1211 gtk/gtkfontsel.c:1935
+msgid "other"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1218
+msgid "[M]"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1219
+msgid "[C]"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1763
+msgid "The selected font is not available."
+msgstr ""
+
+#: gtk/gtkfontsel.c:1769
+msgid "The selected font is not a valid font."
+msgstr ""
+
+#: gtk/gtkfontsel.c:1827
+msgid "This is a 2-byte font and may not be displayed correctly."
+msgstr ""
+
+#: gtk/gtkfontsel.c:1919 gtk/gtkinputdialog.c:599
+msgid "(unknown)"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1930
+msgid "roman"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1942
+msgid "proportional"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1943
+msgid "monospaced"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1944
+msgid "char cell"
+msgstr ""
+
+#: gtk/gtkfontsel.c:2144
+msgid "Font: (Filter Applied)"
+msgstr ""
+
+#: gtk/gtkfontsel.c:2620
+msgid "MAX_FONTS exceeded. Some fonts may be missing."
+msgstr ""
+
+#: gtk/gtkfontsel.c:3465
+msgid "Apply"
+msgstr ""
+
+#: gtk/gtkfontsel.c:3487
+msgid "Font Selection"
+msgstr ""
+
+#: gtk/gtkgamma.c:388
+msgid "Gamma"
+msgstr ""
+
+#: gtk/gtkgamma.c:395
+msgid "Gamma value"
+msgstr ""
+
+#. shell and main vbox
+#: gtk/gtkinputdialog.c:192
+msgid "Input"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:200
+msgid "No input devices"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:229
+msgid "Device:"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:245
+msgid "Disabled"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:253
+msgid "Screen"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:261
+msgid "Window"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:269
+msgid "Mode: "
+msgstr ""
+
+#. The axis listbox
+#: gtk/gtkinputdialog.c:299
+msgid "Axes"
+msgstr ""
+
+#. Keys listbox
+#: gtk/gtkinputdialog.c:315
+msgid "Keys"
+msgstr ""
+
+#. We create the save button in any case, so that clients can
+#. connect to it, without paying attention to whether it exits
+#: gtk/gtkinputdialog.c:337
+msgid "Save"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:492
+msgid "X"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:493
+msgid "Y"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:494
+msgid "Pressure"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:495
+msgid "X Tilt"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:496
+msgid "Y Tilt"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:536
+msgid "none"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:570 gtk/gtkinputdialog.c:606
+msgid "(disabled)"
+msgstr ""
+
+#. and clear button
+#: gtk/gtkinputdialog.c:684
+msgid "clear"
+msgstr ""
+
+#: gtk/gtknotebook.c:1946 gtk/gtknotebook.c:3966
+#, c-format
+msgid "Page %u"
+msgstr ""
+
+#: gtk/gtkrc.c:1533
+#, c-format
+msgid "Unable to locate image file in pixmap_path: \"%s\" line %d"
+msgstr ""
+
+#: gtk/gtkrc.c:1536
+#, c-format
+msgid "Unable to locate image file in pixmap_path: \"%s\""
+msgstr ""
+
+#: gtk/gtkthemes.c:71
+#, c-format
+msgid "Unable to locate loadable module in module_path: \"%s\","
+msgstr ""
+
+#: gtk/gtktipsquery.c:172
+msgid "--- No Tip ---"
+msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 01aa5ca429..7e800003db 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 1.1.7\n"
-"POT-Creation-Date: 1998-12-16 21:46-0600\n"
+"POT-Creation-Date: 1998-12-20 12:00-0500\n"
 "PO-Revision-Date: 1998-12-14 22:07+00:00\n"
 "Last-Translator: Nuno Ferreira <nmrf@rnl.ist.utl.pt>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -13,26 +13,61 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gtk/gtkfilesel.c:419
-msgid "Directories"
-msgstr "Directorias"
+#: gtk/gtkcolorsel.c:202
+msgid "Hue:"
+msgstr ""
 
-#. The files clist
-#: gtk/gtkfilesel.c:430
-msgid "Files"
-msgstr "Ficheiros"
+#: gtk/gtkcolorsel.c:203
+msgid "Saturation:"
+msgstr ""
+
+#: gtk/gtkcolorsel.c:204
+msgid "Value:"
+msgstr ""
+
+#: gtk/gtkcolorsel.c:205
+msgid "Red:"
+msgstr ""
+
+#: gtk/gtkcolorsel.c:206
+msgid "Green:"
+msgstr ""
+
+#: gtk/gtkcolorsel.c:207
+msgid "Blue:"
+msgstr ""
+
+#: gtk/gtkcolorsel.c:208
+msgid "Opacity:"
+msgstr ""
 
 #. The OK button
-#: gtk/gtkfilesel.c:462
+#: gtk/gtkcolorsel.c:1637 gtk/gtkfilesel.c:462 gtk/gtkfontsel.c:3458
+#: gtk/gtkgamma.c:408
 msgid "OK"
 msgstr "OK"
 
 #. The Cancel button
-#: gtk/gtkfilesel.c:469 gtk/gtkfilesel.c:844 gtk/gtkfilesel.c:944
-#: gtk/gtkfilesel.c:1059
+#: gtk/gtkcolorsel.c:1643 gtk/gtkfilesel.c:469 gtk/gtkfilesel.c:844
+#: gtk/gtkfilesel.c:944 gtk/gtkfilesel.c:1059 gtk/gtkfontsel.c:3471
+#: gtk/gtkgamma.c:416
 msgid "Cancel"
 msgstr "Cancelar"
 
+#: gtk/gtkcolorsel.c:1648
+msgid "Help"
+msgstr ""
+
+#. The directories clist
+#: gtk/gtkfilesel.c:411
+msgid "Directories"
+msgstr "Directorias"
+
+#. The files clist
+#: gtk/gtkfilesel.c:430
+msgid "Files"
+msgstr "Ficheiros"
+
 #: gtk/gtkfilesel.c:500 gtk/gtkfilesel.c:1455
 #, c-format
 msgid "Directory unreadable: %s"
@@ -60,7 +95,7 @@ msgid "Error"
 msgstr "Erro"
 
 #. close button
-#: gtk/gtkfilesel.c:733
+#: gtk/gtkfilesel.c:733 gtk/gtkinputdialog.c:346
 msgid "Close"
 msgstr "Fechar"
 
@@ -86,3 +121,334 @@ msgstr "Apagar"
 #: gtk/gtkfilesel.c:1050
 msgid "Rename"
 msgstr "Renomear"
+
+#: gtk/gtkfontsel.c:203
+msgid "Foundry:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:204
+msgid "Family:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:205
+msgid "Weight:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:206
+msgid "Slant:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:207
+msgid "Set Width:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:208
+msgid "Add Style:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:209
+msgid "Pixel Size:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:210
+msgid "Point Size:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:211
+msgid "Resolution X:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:212
+msgid "Resolution Y:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:213
+msgid "Spacing:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:214
+msgid "Average Width:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:215
+msgid "Charset:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:442
+msgid "Font Property"
+msgstr ""
+
+#: gtk/gtkfontsel.c:442
+msgid "Requested Value"
+msgstr ""
+
+#: gtk/gtkfontsel.c:442
+msgid "Actual Value"
+msgstr ""
+
+#: gtk/gtkfontsel.c:481
+msgid "Font"
+msgstr ""
+
+#: gtk/gtkfontsel.c:491 gtk/gtkfontsel.c:2139 gtk/gtkfontsel.c:2369
+msgid "Font:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:496
+msgid "Font Style:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:501
+msgid "Size:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:633 gtk/gtkfontsel.c:855
+#, fuzzy
+msgid "Reset Filter"
+msgstr "Apagar Ficheiro"
+
+#: gtk/gtkfontsel.c:647
+msgid "Metric:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:651
+msgid "Points"
+msgstr ""
+
+#: gtk/gtkfontsel.c:658
+msgid "Pixels"
+msgstr ""
+
+#. create the text entry widget
+#: gtk/gtkfontsel.c:674
+msgid "Preview:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:703
+msgid "Font Information"
+msgstr ""
+
+#: gtk/gtkfontsel.c:736
+msgid "Requested Font Name:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:747
+msgid "Actual Font Name:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:758
+#, c-format
+msgid "%i fonts available with a total of %i styles."
+msgstr ""
+
+#: gtk/gtkfontsel.c:773
+#, fuzzy
+msgid "Filter"
+msgstr "Ficheiros"
+
+#: gtk/gtkfontsel.c:786
+msgid "Font Types:"
+msgstr ""
+
+#: gtk/gtkfontsel.c:794
+msgid "Bitmap"
+msgstr ""
+
+#: gtk/gtkfontsel.c:800
+msgid "Scalable"
+msgstr ""
+
+#: gtk/gtkfontsel.c:806
+msgid "Scaled Bitmap"
+msgstr ""
+
+#. Convert '(nil)' weights to 'regular', since it looks nicer.
+#: gtk/gtkfontsel.c:1202
+msgid "regular"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1207 gtk/gtkfontsel.c:1931
+msgid "italic"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1208 gtk/gtkfontsel.c:1932
+msgid "oblique"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1209 gtk/gtkfontsel.c:1933
+msgid "reverse italic"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1210 gtk/gtkfontsel.c:1934
+msgid "reverse oblique"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1211 gtk/gtkfontsel.c:1935
+msgid "other"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1218
+msgid "[M]"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1219
+msgid "[C]"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1763
+msgid "The selected font is not available."
+msgstr ""
+
+#: gtk/gtkfontsel.c:1769
+msgid "The selected font is not a valid font."
+msgstr ""
+
+#: gtk/gtkfontsel.c:1827
+msgid "This is a 2-byte font and may not be displayed correctly."
+msgstr ""
+
+#: gtk/gtkfontsel.c:1919 gtk/gtkinputdialog.c:599
+msgid "(unknown)"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1930
+msgid "roman"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1942
+msgid "proportional"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1943
+msgid "monospaced"
+msgstr ""
+
+#: gtk/gtkfontsel.c:1944
+msgid "char cell"
+msgstr ""
+
+#: gtk/gtkfontsel.c:2144
+msgid "Font: (Filter Applied)"
+msgstr ""
+
+#: gtk/gtkfontsel.c:2620
+msgid "MAX_FONTS exceeded. Some fonts may be missing."
+msgstr ""
+
+#: gtk/gtkfontsel.c:3465
+msgid "Apply"
+msgstr ""
+
+#: gtk/gtkfontsel.c:3487
+msgid "Font Selection"
+msgstr ""
+
+#: gtk/gtkgamma.c:388
+msgid "Gamma"
+msgstr ""
+
+#: gtk/gtkgamma.c:395
+msgid "Gamma value"
+msgstr ""
+
+#. shell and main vbox
+#: gtk/gtkinputdialog.c:192
+msgid "Input"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:200
+msgid "No input devices"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:229
+msgid "Device:"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:245
+msgid "Disabled"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:253
+msgid "Screen"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:261
+msgid "Window"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:269
+msgid "Mode: "
+msgstr ""
+
+#. The axis listbox
+#: gtk/gtkinputdialog.c:299
+msgid "Axes"
+msgstr ""
+
+#. Keys listbox
+#: gtk/gtkinputdialog.c:315
+msgid "Keys"
+msgstr ""
+
+#. We create the save button in any case, so that clients can
+#. connect to it, without paying attention to whether it exits
+#: gtk/gtkinputdialog.c:337
+msgid "Save"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:492
+msgid "X"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:493
+msgid "Y"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:494
+msgid "Pressure"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:495
+msgid "X Tilt"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:496
+msgid "Y Tilt"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:536
+msgid "none"
+msgstr ""
+
+#: gtk/gtkinputdialog.c:570 gtk/gtkinputdialog.c:606
+msgid "(disabled)"
+msgstr ""
+
+#. and clear button
+#: gtk/gtkinputdialog.c:684
+msgid "clear"
+msgstr ""
+
+#: gtk/gtknotebook.c:1946 gtk/gtknotebook.c:3966
+#, c-format
+msgid "Page %u"
+msgstr ""
+
+#: gtk/gtkrc.c:1533
+#, c-format
+msgid "Unable to locate image file in pixmap_path: \"%s\" line %d"
+msgstr ""
+
+#: gtk/gtkrc.c:1536
+#, c-format
+msgid "Unable to locate image file in pixmap_path: \"%s\""
+msgstr ""
+
+#: gtk/gtkthemes.c:71
+#, c-format
+msgid "Unable to locate loadable module in module_path: \"%s\","
+msgstr ""
+
+#: gtk/gtktipsquery.c:172
+msgid "--- No Tip ---"
+msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 5b99c5f8a0..613882c125 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 1.1.7\n"
-"POT-Creation-Date: 1998-12-18 22:18+0100\n"
+"POT-Creation-Date: 1998-12-20 12:00-0500\n"
 "PO-Revision-Date: 1998-12-20 03:25+0100\n"
 "Last-Translator: Tomas Ögren <stric@ing.umu.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"