made a -r2 with the changes from CVS applied, this solves some focusing issues in Evolution and will result in some speedups in Nautilus, anyone using either of these programs should update

3 files changed, 2039 insertions, 0 deletions

diff --git a/x11-libs/gtk+/files/digest-gtk+-1.2.10-r2 b/x11-libs/gtk+/files/digest-gtk+-1.2.10-r2
new file mode 100644
index 000000000000..7c7d628a46aa
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-1.2.10-r2
@@ -0,0 +1 @@
+MD5 4d5cb2fc7fb7830e4af9747a36bfce20 gtk+-1.2.10.tar.gz
diff --git a/x11-libs/gtk+/files/gtk-1.2.10.patch b/x11-libs/gtk+/files/gtk-1.2.10.patch
new file mode 100644
index 000000000000..1931497866b4
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk-1.2.10.patch
@@ -0,0 +1,1977 @@
+Index: ChangeLog
+===================================================================
+RCS file: /cvs/gnome/gtk+/ChangeLog,v
+retrieving revision 1.1061.2.360
+retrieving revision 1.1061.2.372
+diff -u -r1.1061.2.360 -r1.1061.2.372
+--- ChangeLog	2001/04/02 03:50:55	1.1061.2.360
++++ ChangeLog	2001/08/05 14:30:14	1.1061.2.372
+@@ -1,3 +1,75 @@
++Sun Aug  5 10:29:42 2001  Owen Taylor  <otaylor@redhat.com>
++
++	* gtk/gtklist.c: ref/unref, not ref/ref.
++
++Sun Aug  5 09:48:08 2001  Owen Taylor  <otaylor@redhat.com>
++
++	* gtk/gtklist.c (gtk_list_clear_items): Fix
++	problem with selecting a new focus child.
++
++	* gtk/gtklist.c (gtk_list_clear_items): Clear 
++	list->undo/list_focus_child after unparenting
++	child, since unparenting the child can result
++	in list->last_focus_child being set. (#58024)
++
++Tue Jul 24 16:41:12 2001  Owen Taylor  <otaylor@redhat.com>
++
++	* configure.in po/ta.po (ALL_LINGUAS): Remove dummy ta po - Tamil
++	translation doesn't really make sense for GTK+-1.2 anyways,
++	so lets not worry about the fact that it is missing
++	in this branch.
++
++2001-07-24  Darin Adler  <darin@bentspoon.com>
++
++	* acinclude.m4: Add BUILD_INCLUDED_LIBINTL for
++	compatibility with newer gettext.
++
++	* examples/helloworld/.cvsignore: Ignore the
++	generated executable.
++
++2001-07-10  jacob berkman  <jacob@ximian.com>
++
++	* gtk/gtkrc.c: #include <config.h> as the previous patch requires
++	it
++
++2001-06-26  Fatih Demir <kabalak@gtranslator.org>
++
++	* configure.in: Added ta to the languages list.
++
++2001-06-06  Pablo Saratxaga  <pablo@mandrakesoft.com>
++
++	* configure.in: Check for nl_langinfo (CODESET).  Code taken from
++        glib 1.3 branch.
++	* gtk/gtkrc.c,gtk/gtkrc.*,gtk/Makefile.am: changed the algorithm
++	ussed to look for locale dependent rc files so it does a better job
++	finding them based on charset.
++
++2001-06-01  Alex Larsson  <alexl@redhat.com>
++
++	* gdk/gdkevents.c (expose_predicate):
++	Allow expose event compression past configure notify events for
++	other toplevel window. This fixes performance when dragging a
++	window of an application over another window of the same
++	application. In this case there will be interleaved exposure
++	and configure events.
++
++Thu May 31 12:43:57 2001  Owen Taylor  <otaylor@redhat.com>
++
++	* gtk/gtkoptionmenu.c: Account for the fact that the border
++	width is _outside_ the window. (Fixes #54585)
++
++2001-04-19  Federico Mena Quintero  <federico@ximian.com>
++
++	* gtk/gtkwindow.c (gtk_window_focus_filter): Only consider
++	crossing events if the parent of the window is the root window.
++	This is so that GtkPlugs will not do funny things when they think
++	they should get the focus.
++
++Wed Apr 11 16:20:00 2001  Owen Taylor  <otaylor@redhat.com>
++
++	* gtk/gtklabel.c (gtk_label_parse_uline): Fix check
++	of wrong variable.
++
+ Sun Apr  1 23:01:31 2001  Owen Taylor  <otaylor@redhat.com>
+ 
+ 	* Released 1.2.10.
+Index: acinclude.m4
+===================================================================
+RCS file: /cvs/gnome/gtk+/acinclude.m4,v
+retrieving revision 1.9.2.7
+retrieving revision 1.9.2.8
+diff -u -r1.9.2.7 -r1.9.2.8
+--- acinclude.m4	2000/02/03 01:07:42	1.9.2.7
++++ acinclude.m4	2001/07/24 19:23:39	1.9.2.8
+@@ -452,6 +452,7 @@
+     AC_MSG_RESULT($USE_NLS)
+     AC_SUBST(USE_NLS)
+ 
++    BUILD_INCLUDED_LIBINTL=no
+     USE_INCLUDED_LIBINTL=no
+ 
+     dnl If we use NLS figure out what method
+@@ -632,6 +633,7 @@
+     done
+ 
+     dnl Make all variables we use known to autoconf.
++    AC_SUBST(BUILD_INCLUDED_LIBINTL)
+     AC_SUBST(USE_INCLUDED_LIBINTL)
+     AC_SUBST(CATALOGS)
+     AC_SUBST(CATOBJEXT)
+Index: configure.in
+===================================================================
+RCS file: /cvs/gnome/gtk+/configure.in,v
+retrieving revision 1.109.2.45
+retrieving revision 1.109.2.49
+diff -u -r1.109.2.45 -r1.109.2.49
+--- configure.in	2001/03/15 22:13:18	1.109.2.45
++++ configure.in	2001/08/01 19:33:44	1.109.2.49
+@@ -183,7 +183,7 @@
+ AC_SUBST(STRIP_END)
+ 
+ # i18n stuff
+-ALL_LINGUAS="az ca cs da de el es et eu fi fr ga gl hr hu it ja ko lt nl no nn pl pt pt_BR ro ru sk sl sp sr sv tr uk vi wa zh_CN.GB2312 zh_TW.Big5"
++ALL_LINGUAS="az ca cs da de el es et eu fi fr ga gl hr hu it ja ko lt lv nl no nn pl pt pt_BR ro ru sk sl sp sr sv tr uk vi wa zh_CN.GB2312 zh_TW.Big5"
+ AM_GTK_GNU_GETTEXT
+ LIBS="$LIBS $INTLLIBS"
+ 
+@@ -191,6 +191,15 @@
+ # this is the directory where the *.{mo,gmo} files are installed
+ gtklocaledir='${prefix}/${DATADIRNAME}/locale'
+ AC_SUBST(gtklocaledir)
++
++dnl Check for nl_langinfo and CODESET
++AC_MSG_CHECKING([for nl_langinfo (CODESET)])
++AC_TRY_COMPILE([#include <langinfo.h>],
++        [char *codeset = nl_langinfo (CODESET);],
++   AC_DEFINE(HAVE_CODESET,1,[Have nl_langinfo (CODESET)])
++   have_codeset=yes,
++   have_codeset=no)
++AC_MSG_RESULT($have_codeset)
+ 
+ dnl The DU4 header files don't provide library prototypes unless 
+ dnl -std1 is given to the native cc.
+Index: gdk/gdkevents.c
+===================================================================
+RCS file: /cvs/gnome/gtk+/gdk/gdkevents.c,v
+retrieving revision 1.20.2.11
+retrieving revision 1.20.2.12
+diff -u -r1.20.2.11 -r1.20.2.12
+--- gdk/gdkevents.c	2000/12/03 16:50:04	1.20.2.11
++++ gdk/gdkevents.c	2001/06/01 23:13:50	1.20.2.12
+@@ -383,6 +383,7 @@
+ struct _GdkExposeInfo
+ {
+   Window window;
++  Window toplevel_window;
+   gboolean seen_nonmatching;
+ };
+ 
+@@ -401,7 +402,9 @@
+    * expose events.
+    */
+   if (xevent->xany.type != Expose && 
+-      xevent->xany.type != GravityNotify)
++      xevent->xany.type != GravityNotify &&
++      (xevent->xany.type != ConfigureNotify ||
++       xevent->xany.window == info->toplevel_window))
+     {
+       info->seen_nonmatching = TRUE;
+     }
+@@ -429,6 +432,7 @@
+   GdkEvent event;
+ 
+   info.window = xevent->xany.window;
++  info.toplevel_window = GDK_WINDOW_XWINDOW (gdk_window_get_toplevel (window));
+   info.seen_nonmatching = FALSE;
+   
+   rect1.x = xevent->xexpose.x;
+Index: gtk/Makefile.am
+===================================================================
+RCS file: /cvs/gnome/gtk+/gtk/Makefile.am,v
+retrieving revision 1.84.2.32
+retrieving revision 1.84.2.33
+diff -u -r1.84.2.32 -r1.84.2.33
+--- gtk/Makefile.am	2001/02/02 17:16:11	1.84.2.32
++++ gtk/Makefile.am	2001/06/21 20:06:14	1.84.2.33
+@@ -374,9 +374,11 @@
+ 
+ 
+ gtkconfdir = $(sysconfdir)/gtk
+-gtkconf_DATA = gtkrc.az gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja \
+-	gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 \
+-	gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 \
++gtkconf_DATA = gtkrc.az gtkrc.he gtkrc.hy gtkrc.ja \
++	gtkrc.ko gtkrc.ru gtkrc.th gtkrc.uk \
++	gtkrc.utf-8 gtkrc.iso-8859-2 \
++	gtkrc.iso-8859-3 gtkrc.iso-8859-5 gtkrc.iso-8859-7 \
++	gtkrc.iso-8859-9 gtkrc.iso-8859-13 gtkrc.iso-8859-14 \
+ 	gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.big5 \
+ 	gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps \
+ 	gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255
+Index: gtk/gtklabel.c
+===================================================================
+RCS file: /cvs/gnome/gtk+/gtk/gtklabel.c,v
+retrieving revision 1.48.2.3
+retrieving revision 1.48.2.4
+diff -u -r1.48.2.3 -r1.48.2.4
+--- gtk/gtklabel.c	2001/04/02 03:50:59	1.48.2.3
++++ gtk/gtklabel.c	2001/04/11 20:22:27	1.48.2.4
+@@ -1004,7 +1004,7 @@
+   *r = 0;
+ 
+   result_str = gdk_wcstombs (string_wc);
+-  if (string)
++  if (result_str)
+     {
+       gtk_label_set_text_internal (label, result_str, string_wc);
+       gtk_label_set_pattern (label, pattern);
+Index: gtk/gtklist.c
+===================================================================
+RCS file: /cvs/gnome/gtk+/gtk/gtklist.c,v
+retrieving revision 1.42.2.5
+retrieving revision 1.42.2.7
+diff -u -r1.42.2.5 -r1.42.2.7
+--- gtk/gtklist.c	2001/01/31 21:28:20	1.42.2.5
++++ gtk/gtklist.c	2001/08/05 14:30:16	1.42.2.7
+@@ -1299,7 +1299,7 @@
+ 	  if (start_list->prev)
+ 	    new_focus_child = start_list->prev->data;
+ 	  else if (list->children)
+-	    new_focus_child = list->children->prev->data;
++	    new_focus_child = list->children->data;
+ 
+ 	  if (GTK_WIDGET_HAS_FOCUS (container->focus_child))
+ 	    grab_focus = TRUE;
+@@ -1312,16 +1312,20 @@
+       widget = tmp_list->data;
+       tmp_list = tmp_list->next;
+ 
++      gtk_widget_ref (widget);
++
+       if (widget->state == GTK_STATE_SELECTED)
+ 	gtk_list_unselect_child (list, widget);
+ 
++      gtk_signal_disconnect_by_data (GTK_OBJECT (widget), (gpointer) list);
++      gtk_widget_unparent (widget);
++      
+       if (widget == list->undo_focus_child)
+ 	list->undo_focus_child = NULL;
+       if (widget == list->last_focus_child)
+ 	list->last_focus_child = NULL;
+ 
+-      gtk_signal_disconnect_by_data (GTK_OBJECT (widget), (gpointer) list);
+-      gtk_widget_unparent (widget);
++      gtk_widget_unref (widget);
+     }
+ 
+   g_list_free (start_list);
+@@ -1431,6 +1435,7 @@
+       widget = tmp_list->data;
+       tmp_list = tmp_list->next;
+ 
++      gtk_widget_ref (widget);
+       if (no_unref)
+ 	gtk_widget_ref (widget);
+ 
+@@ -1449,14 +1454,16 @@
+ 	    }
+ 	}
+ 
++      gtk_signal_disconnect_by_data (GTK_OBJECT (widget), (gpointer) list);
++      list->children = g_list_remove (list->children, widget);
++      gtk_widget_unparent (widget);
++
+       if (widget == list->undo_focus_child)
+ 	list->undo_focus_child = NULL;
+       if (widget == list->last_focus_child)
+ 	list->last_focus_child = NULL;
+ 
+-      gtk_signal_disconnect_by_data (GTK_OBJECT (widget), (gpointer) list);
+-      list->children = g_list_remove (list->children, widget);
+-      gtk_widget_unparent (widget);
++      gtk_widget_unref (widget);
+     }
+   
+   if (new_focus_child && new_focus_child != old_focus_child)
+Index: gtk/gtkmenu.h
+===================================================================
+RCS file: /cvs/gnome/gtk+/gtk/gtkmenu.h,v
+retrieving revision 1.13.2.4
+retrieving revision 1.13.2.5
+diff -u -r1.13.2.4 -r1.13.2.5
+--- gtk/gtkmenu.h	2000/02/29 13:28:12	1.13.2.4
++++ gtk/gtkmenu.h	2001/04/02 06:58:40	1.13.2.5
+@@ -21,7 +21,7 @@
+  * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
+  * file for a list of people on the GTK+ Team.  See the ChangeLog
+  * files for a list of changes.  These files are distributed with
+- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
++ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+  */
+ 
+ #ifndef __GTK_MENU_H__
+Index: gtk/gtkoptionmenu.c
+===================================================================
+RCS file: /cvs/gnome/gtk+/gtk/gtkoptionmenu.c,v
+retrieving revision 1.26.2.4
+retrieving revision 1.26.2.5
+diff -u -r1.26.2.4 -r1.26.2.5
+--- gtk/gtkoptionmenu.c	2001/02/12 22:40:02	1.26.2.4
++++ gtk/gtkoptionmenu.c	2001/05/31 18:22:24	1.26.2.5
+@@ -342,30 +342,26 @@
+   GtkWidget *child;
+   GtkAllocation child_allocation;
+   GtkOptionMenuProps props;
++  gint border_width;
+     
+-  g_return_if_fail (widget != NULL);
+-  g_return_if_fail (GTK_IS_OPTION_MENU (widget));
+-  g_return_if_fail (allocation != NULL);
+-
+   gtk_option_menu_get_props (GTK_OPTION_MENU (widget), &props);
++  border_width = GTK_CONTAINER (widget)->border_width;
+ 
+   widget->allocation = *allocation;
+   if (GTK_WIDGET_REALIZED (widget))
+     gdk_window_move_resize (widget->window,
+-			    allocation->x, allocation->y,
+-			    allocation->width, allocation->height);
++			    allocation->x + border_width, allocation->y + border_width,
++			    allocation->width - 2 * border_width, allocation->height - 2 * border_width);
+ 
+   child = GTK_BIN (widget)->child;
+   if (child && GTK_WIDGET_VISIBLE (child))
+     {
+-      child_allocation.x = (GTK_CONTAINER (widget)->border_width +
+-			    GTK_WIDGET (widget)->style->klass->xthickness) + 1;
+-      child_allocation.y = (GTK_CONTAINER (widget)->border_width +
+-			    GTK_WIDGET (widget)->style->klass->ythickness) + 1;
+-      child_allocation.width = MAX (1, (gint)allocation->width - child_allocation.x * 2 -
++      child_allocation.x = GTK_WIDGET (widget)->style->klass->xthickness + 1;
++      child_allocation.y = GTK_WIDGET (widget)->style->klass->ythickness + 1;
++      child_allocation.width = MAX (1, (gint)allocation->width - child_allocation.x * 2 - border_width * 2 -
+ 				    props.indicator_width - props.indicator_left_spacing - props.indicator_right_spacing -
+ 				    CHILD_LEFT_SPACING - CHILD_RIGHT_SPACING - 2);
+-      child_allocation.height = MAX (1, (gint)allocation->height - child_allocation.y * 2 -
++      child_allocation.height = MAX (1, (gint)allocation->height - child_allocation.y * 2 - border_width * 2 -
+ 				     CHILD_TOP_SPACING - CHILD_BOTTOM_SPACING - 2);
+       child_allocation.x += CHILD_LEFT_SPACING;
+       child_allocation.y += CHILD_TOP_SPACING;
+@@ -380,6 +376,7 @@
+ {
+   GdkRectangle button_area;
+   GtkOptionMenuProps props;
++  gint border_width;
+ 
+   g_return_if_fail (widget != NULL);
+   g_return_if_fail (GTK_IS_OPTION_MENU (widget));
+@@ -388,11 +385,12 @@
+   if (GTK_WIDGET_DRAWABLE (widget))
+     {
+       gtk_option_menu_get_props (GTK_OPTION_MENU (widget), &props);
++      border_width = GTK_CONTAINER (widget)->border_width;
+ 
+-      button_area.x = GTK_CONTAINER (widget)->border_width + 1;
+-      button_area.y = GTK_CONTAINER (widget)->border_width + 1;
+-      button_area.width = widget->allocation.width - button_area.x * 2;
+-      button_area.height = widget->allocation.height - button_area.y * 2;
++      button_area.x = 1;
++      button_area.y = 1;
++      button_area.width = widget->allocation.width - button_area.x * 2 - border_width * 2;
++      button_area.height = widget->allocation.height - button_area.y * 2 - border_width * 2;
+ 
+       /* This is evil, and should be elimated here and in the button
+        * code. The point is to clear the focus, and make it
+Index: gtk/gtkrc.c
+===================================================================
+RCS file: /cvs/gnome/gtk+/gtk/gtkrc.c,v
+retrieving revision 1.40.2.15
+retrieving revision 1.40.2.17
+diff -u -r1.40.2.15 -r1.40.2.17
+--- gtk/gtkrc.c	2001/03/15 06:25:54	1.40.2.15
++++ gtk/gtkrc.c	2001/07/10 18:06:35	1.40.2.17
+@@ -24,6 +24,7 @@
+  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+  */
+ 
++#include <config.h>
+ #include <X11/Xlocale.h>	/* so we get the right setlocale */
+ #include <ctype.h>
+ #include <unistd.h>
+@@ -33,6 +34,9 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifdef HAVE_CODESET
++#include <langinfo.h>
++#endif
+ 
+ #include "gtkrc.h"
+ #include "gtkbindings.h"
+@@ -440,7 +444,7 @@
+ void
+ gtk_rc_init (void)
+ {
+-  static gchar *locale_suffixes[3];
++  static gchar *locale_suffixes[8];
+   static gint n_locale_suffixes = 0;
+ 
+   gint i, j;
+@@ -449,8 +453,6 @@
+ 
+   if (!initted)
+     {
+-      gint length;
+-      
+       char *locale = setlocale (LC_CTYPE, NULL);
+       char *p;
+       
+@@ -470,38 +472,91 @@
+ 	   * We normalize the charset into a standard form,
+ 	   * which has all '-' and '_' characters removed,
+ 	   * and is lowercase.
++	   *
++	   * the search is done in that order:
++	   * gtkrc.ll_cc.lowercasecodeset
++	   * gtkrc.ll_cc.normalizedcodeset
++	   * gtkrc.ll.lowercasecodeset
++	   * gtkrc.ll.normalizedcodeset
++	   * gtkrc.lowercasecodeset
++	   * gtkrc.normalizedcodeset
++	   * gtkrc.ll_cc
++	   * gtkrc.ll
++	   * 
+ 	   */
+-	  gchar *normalized_locale;
++	  char *codeset = NULL;
++	  char *normalized_codeset = NULL;
++	  char *cc = NULL;
++	  char *ll;
++	  char *tmp = NULL;
+ 
+ 	  p = strchr (locale, '@');
+-	  length = p ? (p -locale) : strlen (locale);
++	  if (p)
++		  *p = '\0';
+ 
++#ifdef HAVE_CODESET
++	  codeset = nl_langinfo (CODESET);
++#endif
+ 	  p = strchr (locale, '.');
++	  if ((codeset==NULL) && (p))
++		  codeset = p+1;
+ 	  if (p)
+-	    {
+-	      gchar *tmp1 = g_strndup (locale, p - locale + 1);
+-	      gchar *tmp2 = _gtk_normalize_codeset (p + 1, length - (p - locale + 1));
+-	      
+-	      normalized_locale = g_strconcat (tmp1, tmp2, NULL);
+-	      g_free (tmp1);
+-	      g_free (tmp2);
+-						 
+-	      locale_suffixes[n_locale_suffixes++] = g_strdup (normalized_locale);
+-	      length = p - locale;
+-	    }
+-	  else
+-	    normalized_locale = g_strndup (locale, length);
++		  *p = '\0';
+ 	  
+-	  p = strchr (normalized_locale, '_');
+-	  if (p)
++	  if (codeset)
+ 	    {
+-	      locale_suffixes[n_locale_suffixes++] = g_strndup (normalized_locale, length);
+-	      length = p - normalized_locale;
++		/* if codeset is the result of nl_langinfo() it is
++		 * read-only so we need to copy it to a rw place */
++		tmp = g_strdup(codeset);
++		p = tmp;
++		    
++	  	while (*p)
++	          {
++		      /* tolower not used, because some locales are not
++		       * compatible with C locale in lowercasing ascii */
++		      if (*p >= 'A' && *p <= 'Z')
++			      *p = (*p)-'A'+'a';
++		      p++;
++		  }
++		codeset = tmp;
++		normalized_codeset =
++		       	_gtk_normalize_codeset(codeset, strlen(codeset));
++		if (strcmp(normalized_codeset,codeset) == 0)
++			normalized_codeset = NULL;
+ 	    }
+-	  
+-	  locale_suffixes[n_locale_suffixes++] = g_strndup (normalized_locale, length);
++
++	  p = strchr (locale, '_');
++	  if (p) {
++		  cc = p+1;
++		  *p = '\0';
++	  }
++
++	  ll = locale;	
++	
++	  if (cc && codeset)
++	    locale_suffixes[n_locale_suffixes++] =
++	        g_strdup ( g_strconcat(ll,"_",cc,".",codeset,NULL));
++          if (cc && normalized_codeset)
++	    locale_suffixes[n_locale_suffixes++] =
++	        g_strdup ( g_strconcat(ll,"_",cc,".",normalized_codeset,NULL));
++	  if (codeset)
++            locale_suffixes[n_locale_suffixes++] =
++                g_strdup ( g_strconcat(ll,".",codeset,NULL));
++          if (normalized_codeset)
++	    locale_suffixes[n_locale_suffixes++] =
++	        g_strdup ( g_strconcat(ll,".",normalized_codeset,NULL));
++	  if (codeset)
++	    locale_suffixes[n_locale_suffixes++] = 
++		g_strdup ( codeset );
++	  if (normalized_codeset)
++	    locale_suffixes[n_locale_suffixes++] =
++	        g_strdup ( normalized_codeset );
++	  if (cc)
++            locale_suffixes[n_locale_suffixes++] =
++	        g_strdup ( g_strconcat(ll,"_",cc,NULL));
++	  locale_suffixes[n_locale_suffixes++] = g_strdup ( ll );
+ 
+-	  g_free (normalized_locale);
++	  if (tmp) g_free (tmp);
+ 	}
+     }
+   
+Index: gtk/gtktypeutils.h
+===================================================================
+RCS file: /cvs/gnome/gtk+/gtk/gtktypeutils.h,v
+retrieving revision 1.45.2.1
+retrieving revision 1.45.2.2
+diff -u -r1.45.2.1 -r1.45.2.2
+--- gtk/gtktypeutils.h	2000/07/19 14:12:07	1.45.2.1
++++ gtk/gtktypeutils.h	2001/07/24 20:42:20	1.45.2.2
+@@ -191,6 +191,13 @@
+   GtkTypeClass	*klass;
+ };
+ 
++#ifdef __GNUC__
++struct _GtkTypeClassDummyAlign
++{
++  GtkType type;
++  guint *signals;
++};
++#endif /* __GNUC__ */
+ 
+ /* A GtkTypeClass defines the minimum structure requirements for
+  * a types class. Classes returned from gtk_type_class () and
+@@ -203,7 +210,11 @@
+    *  one unique identifier per class.
+    */
+   GtkType type;
+-};
++}
++#ifdef __GNUC__
++__attribute__ ((aligned (__alignof (struct _GtkTypeClassDummyAlign))))
++#endif /* __GNUC__ */
++;
+ 
+ 
+ struct _GtkArg
+Index: gtk/gtkwindow.c
+===================================================================
+RCS file: /cvs/gnome/gtk+/gtk/gtkwindow.c,v
+retrieving revision 1.75.2.28
+retrieving revision 1.75.2.29
+diff -u -r1.75.2.28 -r1.75.2.29
+--- gtk/gtkwindow.c	2001/03/15 04:39:32	1.75.2.28
++++ gtk/gtkwindow.c	2001/04/25 22:30:52	1.75.2.29
+@@ -985,7 +985,13 @@
+       break;
+     case EnterNotify:
+     case LeaveNotify:
+-      if (xev->xcrossing.detail != NotifyInferior &&
++      /* We only track the actual destination of keyboard events for real
++       * toplevels, not for embedded toplevels such as GtkPlug. The reason for
++       * this is that GtkPlug redirects events so the widget may effectively not
++       * have the focus even if it actually has the focus.
++       */
++      if (gdk_window_get_parent (GTK_WIDGET (window)->window) == GDK_ROOT_PARENT () &&
++	  xev->xcrossing.detail != NotifyInferior &&
+ 	  xev->xcrossing.focus && !window->window_has_focus)
+ 	{
+ 	  window->window_has_pointer_focus = (xev->xany.type == EnterNotify) ? TRUE : FALSE;
+Index: gtk/testdnd.c
+===================================================================
+RCS file: /cvs/gnome/gtk+/gtk/Attic/testdnd.c,v
+retrieving revision 1.7.2.1
+retrieving revision 1.7.2.2
+diff -u -r1.7.2.1 -r1.7.2.2
+--- gtk/testdnd.c	1999/04/06 18:50:38	1.7.2.1
++++ gtk/testdnd.c	2001/07/24 20:42:20	1.7.2.2
+@@ -312,6 +312,7 @@
+       gtk_pixmap_set (GTK_PIXMAP (widget), trashcan_open, trashcan_open_mask);
+     }
+ 
++
+   source_widget = gtk_drag_get_source_widget (context);
+   g_print("motion, source %s\n", source_widget ?
+ 	    gtk_type_name (GTK_OBJECT (source_widget)->klass->type) :
+@@ -328,10 +329,19 @@
+ 			    gint                y,
+ 			    guint               time)
+ {
++  GList *tmp_list;
++  
+   g_print("drop\n");
+   have_drag = FALSE;
+ 
+   gtk_pixmap_set (GTK_PIXMAP (widget), trashcan_closed, trashcan_closed_mask);
++
++  tmp_list = context->targets;
++  while (tmp_list)
++    {
++      g_print ("%s\n", gdk_atom_name (GPOINTER_TO_UINT (tmp_list->data)));
++      tmp_list = tmp_list->next;
++    }
+ 
+   if (context->targets)
+     {
+Index: po/ChangeLog
+===================================================================
+RCS file: /cvs/gnome/gtk+/po/ChangeLog,v
+retrieving revision 1.16.2.64
+retrieving revision 1.16.2.70
+diff -u -r1.16.2.64 -r1.16.2.70
+--- po/ChangeLog	2001/03/27 20:12:43	1.16.2.64
++++ po/ChangeLog	2001/08/14 08:03:49	1.16.2.70
+@@ -1,3 +1,30 @@
++2001-08-14  Abel Cheung  <maddog@linux.org.hk>
++          
++	* zh_TW.Big5.po: Updated traditional Chinese translation.
++	* zh_CN.GB2312.po: Updated simplified Chinese translation,
++	  and added header.
++
++2001-08-09  Zbigniew Chyla  <cyba@gnome.pl>
++          
++	* pl.po: Updated Polish translation.
++
++2001-08-01  Peteris Krisjanis  <peterisk@apollo.lv>
++
++	* lv.po: Added Latvian translation.
++
++2001-07-24  Darin Adler  <darin@bentspoon.com>
++
++	* ta.po: Placeholder empty Tamil translation to make
++	things build until the real translation is committed.
++
++2001-07-18  Zbigniew Chyla  <cyba@gnome.pl>
++          
++	* pl.po: Updated Polish translation.
++
++2001-06-26  Fatih Demir <kabalak@gtranslator.org>
++
++	* ta.po: Added Tamil translation by Dinesh.
++
+ 2001-03-27  Ole Laursen  <olau@hardworking.dk>
+ 
+ 	* da.po: Updated and fixed some issues in the Danish translation.
+Index: po/ko.po
+===================================================================
+RCS file: /cvs/gnome/gtk+/po/ko.po,v
+retrieving revision 1.10.2.24
+retrieving revision 1.10.2.25
+diff -u -r1.10.2.24 -r1.10.2.25
+--- po/ko.po	2001/04/02 03:51:00	1.10.2.24
++++ po/ko.po	2001/04/12 09:53:49	1.10.2.25
+@@ -3,10 +3,10 @@
+ # Sung-Hyun Nam <namsh@lgic.co.kr>, 2000
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: gtk+ 1.2.9\n"
+-"POT-Creation-Date: 2001-03-28 16:12-0500\n"
+-"PO-Revision-Date: 2001-02-08 16:48+0900\n"
+-"Last-Translator: Sung-Hyun Nam <namsh@kldp.org>\n"
++"Project-Id-Version: gtk+ 1.2.10\n"
++"POT-Creation-Date: 2001-04-02 15:33+0900\n"
++"PO-Revision-Date: 2001-04-12 09:52+0900\n"
++"Last-Translator: Nam SungHyun <namsh@kldp.org>\n"
+ "Language-Team: Korean <ko@li.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=euc-kr\n"
+Index: po/pl.po
+===================================================================
+RCS file: /cvs/gnome/gtk+/po/pl.po,v
+retrieving revision 1.10.2.23
+retrieving revision 1.10.2.25
+diff -u -r1.10.2.23 -r1.10.2.25
+--- po/pl.po	2001/04/02 03:51:00	1.10.2.23
++++ po/pl.po	2001/08/09 11:42:07	1.10.2.25
+@@ -1,83 +1,91 @@
++# Copyright (C) 2001 Free Software Foundation, Inc.
++# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
++# Aktualn± wersjê tego pliku mo¿esz odnale¼æ w repozytorium cvs.gnome.pl
++# (:pserver:anonymous@cvs.gnome.pl:/home/cvs, puste has³o)
++# Je¶li masz jakiekolwiek uwagi odnosz±ce siê do t³umaczenia lub chcesz
++# pomóc w jego rozwijaniu i pielêgnowaniu, napisz do nas na adres:
++# translators@gnome.pl
++# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gtk+\n"
+-"POT-Creation-Date: 2001-03-28 16:12-0500\n"
+-"PO-Revision-Date: 1999-07-23 14:45+CET\n"
+-"Last-Translator: GNOME PL Team\n"
+-"Language-Team: Polish <gnomepl@pandora.info.bielsko.pl>\n"
++"POT-Creation-Date: 2001-08-09 13:42+0200\n"
++"PO-Revision-Date: 2001-08-09 13:37+0200\n"
++"Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
++"Language-Team: Polish <pl@li.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=iso-8859-2\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ 
+-#: gtk/gtkcolorsel.c:221
++#: gtk/gtkcolorsel.c:1
+ msgid "Hue:"
+ msgstr "Odcieñ:"
+ 
+-#: gtk/gtkcolorsel.c:222
++#: gtk/gtkcolorsel.c:1
+ msgid "Saturation:"
+ msgstr "Nasycenie:"
+ 
+-#: gtk/gtkcolorsel.c:223
++#: gtk/gtkcolorsel.c:1
+ msgid "Value:"
+ msgstr "Warto¶æ:"
+ 
+-#: gtk/gtkcolorsel.c:224
++#: gtk/gtkcolorsel.c:1
+ msgid "Red:"
+ msgstr "Czerwony:"
+ 
+-#: gtk/gtkcolorsel.c:225
++#: gtk/gtkcolorsel.c:1
+ msgid "Green:"
+ msgstr "Zielony:"
+ 
+-#: gtk/gtkcolorsel.c:226
++#: gtk/gtkcolorsel.c:1
+ msgid "Blue:"
+ msgstr "Niebieski:"
+ 
+-#: gtk/gtkcolorsel.c:227
++#: gtk/gtkcolorsel.c:1
+ msgid "Opacity:"
+-msgstr "Prze¼roczysto¶æ:"
++msgstr "Nieprzepuszczalno¶æ:"
+ 
+ #. The OK button
+-#: gtk/gtkcolorsel.c:1727 gtk/gtkfilesel.c:481 gtk/gtkfontsel.c:3501
+-#: gtk/gtkgamma.c:416
++#: gtk/gtkcolorsel.c:1 gtk/gtkfilesel.c:1 gtk/gtkfontsel.c:1
++#: gtk/gtkgamma.c:1
+ msgid "OK"
+ msgstr "OK"
+ 
+ #. The Cancel button
+-#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:488 gtk/gtkfilesel.c:868
+-#: gtk/gtkfilesel.c:968 gtk/gtkfilesel.c:1083 gtk/gtkfontsel.c:3514
+-#: gtk/gtkgamma.c:424
++#: gtk/gtkcolorsel.c:1 gtk/gtkfilesel.c:1 gtk/gtkfilesel.c:1
++#: gtk/gtkfilesel.c:1 gtk/gtkfilesel.c:1 gtk/gtkfontsel.c:1
++#: gtk/gtkgamma.c:1
+ msgid "Cancel"
+ msgstr "Anuluj"
+ 
+-#: gtk/gtkcolorsel.c:1738
++#: gtk/gtkcolorsel.c:1
+ msgid "Help"
+ msgstr "Pomoc"
+ 
+ #. The directories clist
+-#: gtk/gtkfilesel.c:430
++#: gtk/gtkfilesel.c:1
+ msgid "Directories"
+ msgstr "Katalogi"
+ 
+ #. The files clist
+-#: gtk/gtkfilesel.c:449
++#: gtk/gtkfilesel.c:1
+ msgid "Files"
+ msgstr "Pliki"
+ 
+-#: gtk/gtkfilesel.c:519 gtk/gtkfilesel.c:1478
++#: gtk/gtkfilesel.c:1 gtk/gtkfilesel.c:1
+ #, c-format
+ msgid "Directory unreadable: %s"
+ msgstr "Nie mo¿na odczytaæ katalogu: %s"
+ 
+-#: gtk/gtkfilesel.c:551
++#: gtk/gtkfilesel.c:1
+ msgid "Create Dir"
+-msgstr "Utwórz katalog"
++msgstr "Stwórz katalog"
+ 
+-#: gtk/gtkfilesel.c:562 gtk/gtkfilesel.c:937
++#: gtk/gtkfilesel.c:1 gtk/gtkfilesel.c:1
+ msgid "Delete File"
+ msgstr "Usuñ plik"
+ 
+-#: gtk/gtkfilesel.c:573 gtk/gtkfilesel.c:1041
++#: gtk/gtkfilesel.c:1 gtk/gtkfilesel.c:1
+ msgid "Rename File"
+ msgstr "Zmieñ nazwê"
+ 
+@@ -86,377 +94,377 @@
+ #. (GtkSignalFunc) gtk_file_selection_fileop_destroy,
+ #. (gpointer) fs);
+ #.
+-#: gtk/gtkfilesel.c:734
++#: gtk/gtkfilesel.c:1
+ msgid "Error"
+ msgstr "B³±d"
+ 
+ #. close button
+-#: gtk/gtkfilesel.c:757 gtk/gtkinputdialog.c:354
++#: gtk/gtkfilesel.c:1 gtk/gtkinputdialog.c:1
+ msgid "Close"
+ msgstr "Zamknij"
+ 
+-#: gtk/gtkfilesel.c:832
++#: gtk/gtkfilesel.c:1
+ msgid "Create Directory"
+-msgstr "Utwórz katalog"
++msgstr "Nowy katalog"
+ 
+-#: gtk/gtkfilesel.c:846
++#: gtk/gtkfilesel.c:1
+ msgid "Directory name:"
+ msgstr "Nazwa katalogu:"
+ 
+ #. buttons
+-#: gtk/gtkfilesel.c:859
++#: gtk/gtkfilesel.c:1
+ msgid "Create"
+ msgstr "Utwórz"
+ 
+ #. buttons
+-#: gtk/gtkfilesel.c:959
++#: gtk/gtkfilesel.c:1
+ msgid "Delete"
+ msgstr "Usuñ"
+ 
+ #. buttons
+-#: gtk/gtkfilesel.c:1074
++#: gtk/gtkfilesel.c:1
+ msgid "Rename"
+ msgstr "Zmieñ nazwê"
+ 
+-#: gtk/gtkfilesel.c:1457
++#: gtk/gtkfilesel.c:1
+ msgid "Selection: "
+ msgstr "Wybór: "
+ 
+-#: gtk/gtkfontsel.c:210
++#: gtk/gtkfontsel.c:1
+ msgid "Foundry:"
+ msgstr "Druk:"
+ 
+-#: gtk/gtkfontsel.c:211
++#: gtk/gtkfontsel.c:1
+ msgid "Family:"
+ msgstr "Rodzina:"
+ 
+-#: gtk/gtkfontsel.c:212
++#: gtk/gtkfontsel.c:1
+ msgid "Weight:"
+ msgstr "Pogrubienie:"
+ 
+-#: gtk/gtkfontsel.c:213
++#: gtk/gtkfontsel.c:1
+ msgid "Slant:"
+ msgstr "Nachylenie:"
+ 
+-#: gtk/gtkfontsel.c:214
++#: gtk/gtkfontsel.c:1
+ msgid "Set Width:"
+ msgstr "Ustaw szeroko¶æ:"
+ 
+-#: gtk/gtkfontsel.c:215
++#: gtk/gtkfontsel.c:1
+ msgid "Add Style:"
+ msgstr "Dodaj styl:"
+ 
+-#: gtk/gtkfontsel.c:216
++#: gtk/gtkfontsel.c:1
+ msgid "Pixel Size:"
+ msgstr "Rozmiar w pikselach:"
+ 
+-#: gtk/gtkfontsel.c:217
++#: gtk/gtkfontsel.c:1
+ msgid "Point Size:"
+ msgstr "Rozmiar w punktach:"
+ 
+-#: gtk/gtkfontsel.c:218
++#: gtk/gtkfontsel.c:1
+ msgid "Resolution X:"
+ msgstr "Rozdzielczo¶æ pozioma:"
+ 
+-#: gtk/gtkfontsel.c:219
++#: gtk/gtkfontsel.c:1
+ msgid "Resolution Y:"
+ msgstr "Rozdzielczo¶æ pionowa:"
+ 
+-#: gtk/gtkfontsel.c:220
++#: gtk/gtkfontsel.c:1
+ msgid "Spacing:"
+ msgstr "Odstêpy:"
+ 
+-#: gtk/gtkfontsel.c:221
++#: gtk/gtkfontsel.c:1
+ msgid "Average Width:"
+ msgstr "¦rednia szeroko¶æ:"
+ 
+-#: gtk/gtkfontsel.c:222
++#: gtk/gtkfontsel.c:1
+ msgid "Charset:"
+ msgstr "Kodowanie:"
+ 
+ #. Number of internationalized titles here must match number
+ #. of NULL initializers above
+-#: gtk/gtkfontsel.c:459
++#: gtk/gtkfontsel.c:1
+ msgid "Font Property"
+ msgstr "W³a¶ciwo¶æ czcionki"
+ 
+-#: gtk/gtkfontsel.c:460
++#: gtk/gtkfontsel.c:1
+ msgid "Requested Value"
+ msgstr "¯±dana warto¶æ"
+ 
+-#: gtk/gtkfontsel.c:461
++#: gtk/gtkfontsel.c:1
+ msgid "Actual Value"
+ msgstr "Rzeczywista warto¶æ"
+ 
+-#: gtk/gtkfontsel.c:494
++#: gtk/gtkfontsel.c:1
+ msgid "Font"
+ msgstr "Czcionka"
+ 
+-#: gtk/gtkfontsel.c:504 gtk/gtkfontsel.c:2180 gtk/gtkfontsel.c:2410
++#: gtk/gtkfontsel.c:1 gtk/gtkfontsel.c:1 gtk/gtkfontsel.c:1
+ msgid "Font:"
+ msgstr "Czcionka:"
+ 
+-#: gtk/gtkfontsel.c:509
++#: gtk/gtkfontsel.c:1
+ msgid "Font Style:"
+ msgstr "Styl czcionki:"
+ 
+-#: gtk/gtkfontsel.c:514
++#: gtk/gtkfontsel.c:1
+ msgid "Size:"
+ msgstr "Rozmiar:"
+ 
+-#: gtk/gtkfontsel.c:646 gtk/gtkfontsel.c:868
++#: gtk/gtkfontsel.c:1 gtk/gtkfontsel.c:1
+ msgid "Reset Filter"
+ msgstr "Wyczy¶æ filtr"
+ 
+-#: gtk/gtkfontsel.c:660
++#: gtk/gtkfontsel.c:1
+ msgid "Metric:"
+ msgstr "Jednostki:"
+ 
+-#: gtk/gtkfontsel.c:664
++#: gtk/gtkfontsel.c:1
+ msgid "Points"
+ msgstr "Punkty"
+ 
+-#: gtk/gtkfontsel.c:671
++#: gtk/gtkfontsel.c:1
+ msgid "Pixels"
+ msgstr "Piksele"
+ 
+ #. create the text entry widget
+-#: gtk/gtkfontsel.c:687
++#: gtk/gtkfontsel.c:1
+ msgid "Preview:"
+ msgstr "Podgl±d"
+ 
+-#: gtk/gtkfontsel.c:716
++#: gtk/gtkfontsel.c:1
+ msgid "Font Information"
+ msgstr "Informacje o czcionce"
+ 
+-#: gtk/gtkfontsel.c:749
++#: gtk/gtkfontsel.c:1
+ msgid "Requested Font Name:"
+ msgstr "¯±dana nazwa czcionki:"
+ 
+-#: gtk/gtkfontsel.c:760
++#: gtk/gtkfontsel.c:1
+ msgid "Actual Font Name:"
+ msgstr "Rzeczywista nazwa czcionki:"
+ 
+-#: gtk/gtkfontsel.c:771
++#: gtk/gtkfontsel.c:1
+ #, c-format
+ msgid "%i fonts available with a total of %i styles."
+ msgstr "dostêpnych czcionek: %i, liczba stylów : %i."
+ 
+-#: gtk/gtkfontsel.c:786
++#: gtk/gtkfontsel.c:1
+ msgid "Filter"
+ msgstr "Filtr"
+ 
+-#: gtk/gtkfontsel.c:799
++#: gtk/gtkfontsel.c:1
+ msgid "Font Types:"
+ msgstr "Typy czcionek:"
+ 
+-#: gtk/gtkfontsel.c:807
++#: gtk/gtkfontsel.c:1
+ msgid "Bitmap"
+ msgstr "Bitmapowe"
+ 
+-#: gtk/gtkfontsel.c:813
++#: gtk/gtkfontsel.c:1
+ msgid "Scalable"
+ msgstr "Skalowalne"
+ 
+-#: gtk/gtkfontsel.c:819
++#: gtk/gtkfontsel.c:1
+ msgid "Scaled Bitmap"
+ msgstr "Skalowane bitmapy"
+ 
+-#: gtk/gtkfontsel.c:890
++#: gtk/gtkfontsel.c:1
+ msgid "*"
+ msgstr "*"
+ 
+ #. Convert '(nil)' weights to 'regular', since it looks nicer.
+-#: gtk/gtkfontsel.c:1215
++#: gtk/gtkfontsel.c:1
+ msgid "(nil)"
+ msgstr "(pusty)"
+ 
+-#: gtk/gtkfontsel.c:1215
++#: gtk/gtkfontsel.c:1
+ msgid "regular"
+ msgstr "zwyk³e"
+ 
+-#: gtk/gtkfontsel.c:1220 gtk/gtkfontsel.c:1972
++#: gtk/gtkfontsel.c:1 gtk/gtkfontsel.c:1
+ msgid "italic"
+ msgstr "italic"
+ 
+-#: gtk/gtkfontsel.c:1221 gtk/gtkfontsel.c:1973
++#: gtk/gtkfontsel.c:1 gtk/gtkfontsel.c:1
+ msgid "oblique"
+ msgstr "pochylona"
+ 
+-#: gtk/gtkfontsel.c:1222 gtk/gtkfontsel.c:1974
++#: gtk/gtkfontsel.c:1 gtk/gtkfontsel.c:1
+ msgid "reverse italic"
+ msgstr "odwrócony italic"
+ 
+-#: gtk/gtkfontsel.c:1223 gtk/gtkfontsel.c:1975
++#: gtk/gtkfontsel.c:1 gtk/gtkfontsel.c:1
+ msgid "reverse oblique"
+ msgstr "odwrotnie pochylona"
+ 
+-#: gtk/gtkfontsel.c:1224 gtk/gtkfontsel.c:1976
++#: gtk/gtkfontsel.c:1 gtk/gtkfontsel.c:1
+ msgid "other"
+ msgstr "inne"
+ 
+-#: gtk/gtkfontsel.c:1231
++#: gtk/gtkfontsel.c:1
+ msgid "[M]"
+ msgstr "[M]"
+ 
+-#: gtk/gtkfontsel.c:1232
++#: gtk/gtkfontsel.c:1
+ msgid "[C]"
+ msgstr "[C]"
+ 
+-#: gtk/gtkfontsel.c:1792
++#: gtk/gtkfontsel.c:1
+ msgid "The selected font is not available."
+ msgstr "Wybrana czcionka nie jest dostêpna."
+ 
+-#: gtk/gtkfontsel.c:1798
++#: gtk/gtkfontsel.c:1
+ msgid "The selected font is not a valid font."
+ msgstr "Wybrana czcionka nie jest poprawna."
+ 
+-#: gtk/gtkfontsel.c:1856
++#: gtk/gtkfontsel.c:1
+ msgid "This is a 2-byte font and may not be displayed correctly."
+ msgstr "Ta 2-bajtowa czcionka mo¿e nie byæ wy¶wietlana poprawnie."
+ 
+-#: gtk/gtkfontsel.c:1960 gtk/gtkinputdialog.c:607
++#: gtk/gtkfontsel.c:1 gtk/gtkinputdialog.c:1
+ msgid "(unknown)"
+ msgstr "(nieznane)"
+ 
+-#: gtk/gtkfontsel.c:1971
++#: gtk/gtkfontsel.c:1
+ msgid "roman"
+ msgstr "roman"
+ 
+-#: gtk/gtkfontsel.c:1983
++#: gtk/gtkfontsel.c:1
+ msgid "proportional"
+ msgstr "proporcjonalne"
+ 
+-#: gtk/gtkfontsel.c:1984
++#: gtk/gtkfontsel.c:1
+ msgid "monospaced"
+ msgstr "równomierne"
+ 
+-#: gtk/gtkfontsel.c:1985
++#: gtk/gtkfontsel.c:1
+ msgid "char cell"
+ msgstr "rozmiaru znaku"
+ 
+-#: gtk/gtkfontsel.c:2185
++#: gtk/gtkfontsel.c:1
+ msgid "Font: (Filter Applied)"
+ msgstr "Czcionka: (z zastosowaniem filtra)"
+ 
+-#: gtk/gtkfontsel.c:2661
++#: gtk/gtkfontsel.c:1
+ msgid "MAX_FONTS exceeded. Some fonts may be missing."
+ msgstr "Przekroczono warto¶æ MAX_FONTS. Mo¿e brakowaæ pewnych czcionek."
+ 
+-#: gtk/gtkfontsel.c:3508
++#: gtk/gtkfontsel.c:1
+ msgid "Apply"
+ msgstr "Zastosuj"
+ 
+-#: gtk/gtkfontsel.c:3530
++#: gtk/gtkfontsel.c:1
+ msgid "Font Selection"
+ msgstr "Wybór czcionki"
+ 
+-#: gtk/gtkgamma.c:396
++#: gtk/gtkgamma.c:1
+ msgid "Gamma"
+ msgstr "Gamma"
+ 
+-#: gtk/gtkgamma.c:403
++#: gtk/gtkgamma.c:1
+ msgid "Gamma value"
+ msgstr "Warto¶æ gamma"
+ 
+ #. shell and main vbox
+-#: gtk/gtkinputdialog.c:200
++#: gtk/gtkinputdialog.c:1
+ msgid "Input"
+ msgstr "Wej¶cie"
+ 
+-#: gtk/gtkinputdialog.c:208
++#: gtk/gtkinputdialog.c:1
+ msgid "No input devices"
+ msgstr "Brak urz±dzeñ wej¶ciowych"
+ 
+-#: gtk/gtkinputdialog.c:237
++#: gtk/gtkinputdialog.c:1
+ msgid "Device:"
+ msgstr "Urz±dzenie:"
+ 
+-#: gtk/gtkinputdialog.c:253
++#: gtk/gtkinputdialog.c:1
+ msgid "Disabled"
+ msgstr "Wy³±czone"
+ 
+-#: gtk/gtkinputdialog.c:261
++#: gtk/gtkinputdialog.c:1
+ msgid "Screen"
+ msgstr "Ekran"
+ 
+-#: gtk/gtkinputdialog.c:269
++#: gtk/gtkinputdialog.c:1
+ msgid "Window"
+ msgstr "Okno"
+ 
+-#: gtk/gtkinputdialog.c:277
++#: gtk/gtkinputdialog.c:1
+ msgid "Mode: "
+ msgstr "Tryb: "
+ 
+ #. The axis listbox
+-#: gtk/gtkinputdialog.c:307
++#: gtk/gtkinputdialog.c:1
+ msgid "Axes"
+ msgstr "Osie"
+ 
+ #. Keys listbox
+-#: gtk/gtkinputdialog.c:323
++#: gtk/gtkinputdialog.c:1
+ msgid "Keys"
+ msgstr "Klawisze"
+ 
+ #. 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:345
++#: gtk/gtkinputdialog.c:1
+ msgid "Save"
+ msgstr "Zapisz"
+ 
+-#: gtk/gtkinputdialog.c:500
++#: gtk/gtkinputdialog.c:1
+ msgid "X"
+ msgstr "X"
+ 
+-#: gtk/gtkinputdialog.c:501
++#: gtk/gtkinputdialog.c:1
+ msgid "Y"
+ msgstr "Y"
+ 
+-#: gtk/gtkinputdialog.c:502
++#: gtk/gtkinputdialog.c:1
+ msgid "Pressure"
+ msgstr "Nacisk"
+ 
+-#: gtk/gtkinputdialog.c:503
++#: gtk/gtkinputdialog.c:1
+ msgid "X Tilt"
+ msgstr "Nachylenie poziome"
+ 
+-#: gtk/gtkinputdialog.c:504
++#: gtk/gtkinputdialog.c:1
+ msgid "Y Tilt"
+ msgstr "Nachylenie pionowe"
+ 
+-#: gtk/gtkinputdialog.c:544
++#: gtk/gtkinputdialog.c:1
+ msgid "none"
+ msgstr "brak"
+ 
+-#: gtk/gtkinputdialog.c:578 gtk/gtkinputdialog.c:614
++#: gtk/gtkinputdialog.c:1 gtk/gtkinputdialog.c:1
+ msgid "(disabled)"
+-msgstr "(wy³±czone)"
++msgstr "(nieaktywne)"
+ 
+ #. and clear button
+-#: gtk/gtkinputdialog.c:692
++#: gtk/gtkinputdialog.c:1
+ msgid "clear"
+ msgstr "wyczy¶æ"
+ 
+-#: gtk/gtknotebook.c:2059 gtk/gtknotebook.c:4131
++#: gtk/gtknotebook.c:1 gtk/gtknotebook.c:1
+ #, c-format
+ msgid "Page %u"
+ msgstr "Strona %u"
+ 
+-#: gtk/gtkrc.c:1703
++#: gtk/gtkrc.c:1
+ #, c-format
+ msgid "Unable to locate image file in pixmap_path: \"%s\" line %d"
+-msgstr "Nie mo¿na odnale¼æ pliku z obrazem na ¶cie¿ce: \"%s\" wiersz %d"
++msgstr "Nie mo¿na odnale¼æ pliku z obrazem pod pixmap_path: \"%s\" wiersz %d"
+ 
+-#: gtk/gtkrc.c:1706
++#: gtk/gtkrc.c:1
+ #, c-format
+ msgid "Unable to locate image file in pixmap_path: \"%s\""
+-msgstr "Nie mo¿na odnale¼æ pliku z obrazem na ¶cie¿ce: \"%s\""
++msgstr "Nie mo¿na odnale¼æ pliku z obrazem pod pixmap_path: \"%s\""
+ 
+-#: gtk/gtkthemes.c:79
++#: gtk/gtkthemes.c:1
+ #, c-format
+ msgid "Unable to locate loadable module in module_path: \"%s\","
+-msgstr "Nie mo¿na odnale¼æ modu³u ³adowalnego na ¶cie¿ce: \"%s\","
++msgstr "Nie mo¿na odnale¼æ modu³u ³adowalnego pod module_path: \"%s\","
+ 
+-#: gtk/gtktipsquery.c:180
++#: gtk/gtktipsquery.c:1
+ msgid "--- No Tip ---"
+ msgstr "--- Brak podpowiedzi ---"
+Index: po/sl.po
+===================================================================
+RCS file: /cvs/gnome/gtk+/po/sl.po,v
+retrieving revision 1.1.2.27
+retrieving revision 1.1.2.28
+diff -u -r1.1.2.27 -r1.1.2.28
+--- po/sl.po	2001/04/02 03:51:01	1.1.2.27
++++ po/sl.po	2001/05/02 02:22:12	1.1.2.28
+@@ -4,7 +4,7 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: GTK+ 1.2.8\n"
+-"POT-Creation-Date: 2001-03-28 16:12-0500\n"
++"POT-Creation-Date: 2000-05-19 07:11+0200\n"
+ "PO-Revision-Date: 2000-06-21 19:45+0200\n"
+ "Last-Translator: Miha Tom¹iè <miha.tomsic@guest.arnes.si>\n"
+ "Language-Team: slovenian <sl@li.org>\n"
+@@ -41,14 +41,14 @@
+ msgstr "Neprosojnost:"
+ 
+ #. The OK button
+-#: gtk/gtkcolorsel.c:1727 gtk/gtkfilesel.c:481 gtk/gtkfontsel.c:3501
++#: gtk/gtkcolorsel.c:1727 gtk/gtkfilesel.c:469 gtk/gtkfontsel.c:3492
+ #: gtk/gtkgamma.c:416
+ msgid "OK"
+ msgstr "Potrdi"
+ 
+ #. The Cancel button
+-#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:488 gtk/gtkfilesel.c:868
+-#: gtk/gtkfilesel.c:968 gtk/gtkfilesel.c:1083 gtk/gtkfontsel.c:3514
++#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:856
++#: gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1071 gtk/gtkfontsel.c:3505
+ #: gtk/gtkgamma.c:424
+ msgid "Cancel"
+ msgstr "Preklièi"
+@@ -58,29 +58,29 @@
+ msgstr "Pomoè"
+ 
+ #. The directories clist
+-#: gtk/gtkfilesel.c:430
++#: gtk/gtkfilesel.c:418
+ msgid "Directories"
+ msgstr "Imeniki"
+ 
+ #. The files clist
+-#: gtk/gtkfilesel.c:449
++#: gtk/gtkfilesel.c:437
+ msgid "Files"
+ msgstr "Datoteke"
+ 
+-#: gtk/gtkfilesel.c:519 gtk/gtkfilesel.c:1478
++#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1466
+ #, c-format
+ msgid "Directory unreadable: %s"
+ msgstr "Neberljiv imenik: %s"
+ 
+-#: gtk/gtkfilesel.c:551
++#: gtk/gtkfilesel.c:539
+ msgid "Create Dir"
+ msgstr "Ustvari imenik"
+ 
+-#: gtk/gtkfilesel.c:562 gtk/gtkfilesel.c:937
++#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:925
+ msgid "Delete File"
+ msgstr "Zbri¹i datoteko"
+ 
+-#: gtk/gtkfilesel.c:573 gtk/gtkfilesel.c:1041
++#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1029
+ msgid "Rename File"
+ msgstr "Preimenuj datoteko"
+ 
+@@ -89,39 +89,39 @@
+ #. (GtkSignalFunc) gtk_file_selection_fileop_destroy,
+ #. (gpointer) fs);
+ #.
+-#: gtk/gtkfilesel.c:734
++#: gtk/gtkfilesel.c:722
+ msgid "Error"
+ msgstr "Napaka"
+ 
+ #. close button
+-#: gtk/gtkfilesel.c:757 gtk/gtkinputdialog.c:354
++#: gtk/gtkfilesel.c:745 gtk/gtkinputdialog.c:354
+ msgid "Close"
+ msgstr "Zapri"
+ 
+-#: gtk/gtkfilesel.c:832
++#: gtk/gtkfilesel.c:820
+ msgid "Create Directory"
+ msgstr "Ustvari imenik"
+ 
+-#: gtk/gtkfilesel.c:846
++#: gtk/gtkfilesel.c:834
+ msgid "Directory name:"
+ msgstr "Ime imenika:"
+ 
+ #. buttons
+-#: gtk/gtkfilesel.c:859
++#: gtk/gtkfilesel.c:847
+ msgid "Create"
+ msgstr "Ustvari"
+ 
+ #. buttons
+-#: gtk/gtkfilesel.c:959
++#: gtk/gtkfilesel.c:947
+ msgid "Delete"
+ msgstr "Zbri¹i"
+ 
+ #. buttons
+-#: gtk/gtkfilesel.c:1074
++#: gtk/gtkfilesel.c:1062
+ msgid "Rename"
+ msgstr "Preimenuj"
+ 
+-#: gtk/gtkfilesel.c:1457
++#: gtk/gtkfilesel.c:1445
+ msgid "Selection: "
+ msgstr "Izbira: "
+ 
+@@ -195,7 +195,7 @@
+ msgid "Font"
+ msgstr "Pisava"
+ 
+-#: gtk/gtkfontsel.c:504 gtk/gtkfontsel.c:2180 gtk/gtkfontsel.c:2410
++#: gtk/gtkfontsel.c:504 gtk/gtkfontsel.c:2181 gtk/gtkfontsel.c:2411
+ msgid "Font:"
+ msgstr "Pisava:"
+ 
+@@ -278,23 +278,23 @@
+ msgid "regular"
+ msgstr "navadno"
+ 
+-#: gtk/gtkfontsel.c:1220 gtk/gtkfontsel.c:1972
++#: gtk/gtkfontsel.c:1220 gtk/gtkfontsel.c:1973
+ msgid "italic"
+ msgstr "kurzivna"
+ 
+-#: gtk/gtkfontsel.c:1221 gtk/gtkfontsel.c:1973
++#: gtk/gtkfontsel.c:1221 gtk/gtkfontsel.c:1974
+ msgid "oblique"
+ msgstr "nagnjena"
+ 
+-#: gtk/gtkfontsel.c:1222 gtk/gtkfontsel.c:1974
++#: gtk/gtkfontsel.c:1222 gtk/gtkfontsel.c:1975
+ msgid "reverse italic"
+ msgstr "obratno kurzivna"
+ 
+-#: gtk/gtkfontsel.c:1223 gtk/gtkfontsel.c:1975
++#: gtk/gtkfontsel.c:1223 gtk/gtkfontsel.c:1976
+ msgid "reverse oblique"
+ msgstr "obratno nagnjena"
+ 
+-#: gtk/gtkfontsel.c:1224 gtk/gtkfontsel.c:1976
++#: gtk/gtkfontsel.c:1224 gtk/gtkfontsel.c:1977
+ msgid "other"
+ msgstr "ostalo"
+ 
+@@ -306,51 +306,51 @@
+ msgid "[C]"
+ msgstr "[C]"
+ 
+-#: gtk/gtkfontsel.c:1792
++#: gtk/gtkfontsel.c:1793
+ msgid "The selected font is not available."
+ msgstr "Izbrana pisava ni dostopna."
+ 
+-#: gtk/gtkfontsel.c:1798
++#: gtk/gtkfontsel.c:1799
+ msgid "The selected font is not a valid font."
+ msgstr "Izbrana pisava je popaèena."
+ 
+-#: gtk/gtkfontsel.c:1856
++#: gtk/gtkfontsel.c:1857
+ msgid "This is a 2-byte font and may not be displayed correctly."
+ msgstr "Ta pisava uporablja dvobajtni zapis in morda ne bo prikazana pravilno."
+ 
+-#: gtk/gtkfontsel.c:1960 gtk/gtkinputdialog.c:607
++#: gtk/gtkfontsel.c:1961 gtk/gtkinputdialog.c:607
+ msgid "(unknown)"
+ msgstr "(neznano)"
+ 
+-#: gtk/gtkfontsel.c:1971
++#: gtk/gtkfontsel.c:1972
+ msgid "roman"
+ msgstr "pokonèna"
+ 
+-#: gtk/gtkfontsel.c:1983
++#: gtk/gtkfontsel.c:1984
+ msgid "proportional"
+ msgstr "proporcionalen"
+ 
+-#: gtk/gtkfontsel.c:1984
++#: gtk/gtkfontsel.c:1985
+ msgid "monospaced"
+ msgstr "enakokoraèen"
+ 
+-#: gtk/gtkfontsel.c:1985
++#: gtk/gtkfontsel.c:1986
+ msgid "char cell"
+ msgstr "celica znaka"
+ 
+-#: gtk/gtkfontsel.c:2185
++#: gtk/gtkfontsel.c:2186
+ msgid "Font: (Filter Applied)"
+ msgstr "Pisava: (z uporabo filtra)"
+ 
+-#: gtk/gtkfontsel.c:2661
++#: gtk/gtkfontsel.c:2662
+ msgid "MAX_FONTS exceeded. Some fonts may be missing."
+ msgstr "MAX_FONTS prese¾en. Nekatere pisave utegnejo manjkati."
+ 
+-#: gtk/gtkfontsel.c:3508
++#: gtk/gtkfontsel.c:3499
+ msgid "Apply"
+ msgstr "Uporabi"
+ 
+-#: gtk/gtkfontsel.c:3530
++#: gtk/gtkfontsel.c:3521
+ msgid "Font Selection"
+ msgstr "Izbor pisav"
+ 
+@@ -445,12 +445,12 @@
+ msgid "Page %u"
+ msgstr "%u. stran"
+ 
+-#: gtk/gtkrc.c:1703
++#: gtk/gtkrc.c:1702
+ #, c-format
+ msgid "Unable to locate image file in pixmap_path: \"%s\" line %d"
+ msgstr "Ne najdem datoteke s sliko v poti pixmap_path: \"%s\" vrstica %d"
+ 
+-#: gtk/gtkrc.c:1706
++#: gtk/gtkrc.c:1705
+ #, c-format
+ msgid "Unable to locate image file in pixmap_path: \"%s\""
+ msgstr "Ne najdem datoteke s sliko v poti pixmap_path: \"%s\""
+Index: po/zh_CN.GB2312.po
+===================================================================
+RCS file: /cvs/gnome/gtk+/po/Attic/zh_CN.GB2312.po,v
+retrieving revision 1.5.4.4
+retrieving revision 1.5.4.5
+diff -u -r1.5.4.4 -r1.5.4.5
+--- po/zh_CN.GB2312.po	2001/04/02 03:51:01	1.5.4.4
++++ po/zh_CN.GB2312.po	2001/08/14 08:03:50	1.5.4.5
+@@ -1,8 +1,12 @@
++# simplified Chinese translation for gtk+
++# Copyright (C) 1999-2001 Free Software Foundation, Inc.
++# Wu Yulun <migr@operamail.com>, 1999.
++# 
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: gtk+ 1.1.7 \n"
++"Project-Id-Version: gtk+ 1.2.10 \n"
+ "POT-Creation-Date: 2001-03-28 16:12-0500\n"
+-"PO-Revision-Date: 1999-01-31\n"
++"PO-Revision-Date: 2001-08-14 15:59+0800\n"
+ "Last-Translator: Wu Yulun <migr@operamail.com>\n"
+ "Language-Team: Chinese <zh@li.org>\n"
+ "MIME-Version: 1.0\n"
+@@ -269,7 +273,7 @@
+ #. Convert '(nil)' weights to 'regular', since it looks nicer.
+ #: gtk/gtkfontsel.c:1215
+ msgid "(nil)"
+-msgstr ""
++msgstr "(ÎÞ)"
+ 
+ #: gtk/gtkfontsel.c:1215
+ msgid "regular"
+@@ -297,11 +301,11 @@
+ 
+ #: gtk/gtkfontsel.c:1231
+ msgid "[M]"
+-msgstr ""
++msgstr "[M]"
+ 
+ #: gtk/gtkfontsel.c:1232
+ msgid "[C]"
+-msgstr ""
++msgstr "[C]"
+ 
+ #: gtk/gtkfontsel.c:1792
+ msgid "The selected font is not available."
+@@ -406,11 +410,11 @@
+ 
+ #: gtk/gtkinputdialog.c:500
+ msgid "X"
+-msgstr ""
++msgstr "X"
+ 
+ #: gtk/gtkinputdialog.c:501
+ msgid "Y"
+-msgstr ""
++msgstr "Y"
+ 
+ #: gtk/gtkinputdialog.c:502
+ msgid "Pressure"
+Index: po/zh_TW.Big5.po
+===================================================================
+RCS file: /cvs/gnome/gtk+/po/Attic/zh_TW.Big5.po,v
+retrieving revision 1.1.2.19
+retrieving revision 1.1.2.20
+diff -u -r1.1.2.19 -r1.1.2.20
+--- po/zh_TW.Big5.po	2001/04/02 03:51:01	1.1.2.19
++++ po/zh_TW.Big5.po	2001/08/14 08:03:50	1.1.2.20
+@@ -1,44 +1,45 @@
+-# SOME DESCRIPTIVE TITLE.
+-# Copyright (C) YEAR Free Software Foundation, Inc.
++# traditional Chinese translation for gtk+
++# Copyright (C) 1999-2001 Free Software Foundation, Inc.
+ # ¨¯¥ß¤¯ <hsin@med.cgu.edu.tw>, 1999.
++#
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: gtk+ 1.1.7 \n"
+-"POT-Creation-Date: 2001-03-28 16:12-0500\n"
+-"PO-Revision-Date: 1999-01-31 19:33+0800\n"
+-"Last-Translator: ¨¯¥ß¤¯ <hsin@med.cgu.edu.tw>\n"
+-"Language-Team: Chinese <zh@li.org>\n"
++"Project-Id-Version: gtk+ 1.2.10 \n"
++"POT-Creation-Date: 2001-08-14 15:40+0800\n"
++"PO-Revision-Date: 2001-08-14 15:53+0800\n"
++"Last-Translator: Abel Cheung <maddog@linux.org.hk>\n"
++"Language-Team: traditional Chinese <zh-l10n@linux.org.hk>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=big5\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ 
+ #: gtk/gtkcolorsel.c:221
+ msgid "Hue:"
+-msgstr "¦â¬Û:"
++msgstr "¦â¬Û¡G"
+ 
+ #: gtk/gtkcolorsel.c:222
+ msgid "Saturation:"
+-msgstr "±m«×:"
++msgstr "±m«×¡G"
+ 
+ #: gtk/gtkcolorsel.c:223
+ msgid "Value:"
+-msgstr "©ú«×:"
++msgstr "©ú«×¡G"
+ 
+ #: gtk/gtkcolorsel.c:224
+ msgid "Red:"
+-msgstr "¬õ:"
++msgstr "¬õ¡G"
+ 
+ #: gtk/gtkcolorsel.c:225
+ msgid "Green:"
+-msgstr "ºñ:"
++msgstr "ºñ¡G"
+ 
+ #: gtk/gtkcolorsel.c:226
+ msgid "Blue:"
+-msgstr "ÂÅ:"
++msgstr "ÂÅ¡G"
+ 
+ #: gtk/gtkcolorsel.c:227
+ msgid "Opacity:"
+-msgstr "¤£³z©ú«×:"
++msgstr "¤£³z©ú«×¡G"
+ 
+ #. The OK button
+ #: gtk/gtkcolorsel.c:1727 gtk/gtkfilesel.c:481 gtk/gtkfontsel.c:3501
+@@ -55,7 +56,7 @@
+ 
+ #: gtk/gtkcolorsel.c:1738
+ msgid "Help"
+-msgstr "¨D§U"
++msgstr "»¡©ú"
+ 
+ #. The directories clist
+ #: gtk/gtkfilesel.c:430
+@@ -70,11 +71,11 @@
+ #: gtk/gtkfilesel.c:519 gtk/gtkfilesel.c:1478
+ #, c-format
+ msgid "Directory unreadable: %s"
+-msgstr "µLªkŪ¨ú¥Ø¿ý: %s"
++msgstr "µLªkŪ¨ú¥Ø¿ý¡G%s"
+ 
+ #: gtk/gtkfilesel.c:551
+ msgid "Create Dir"
+-msgstr "·s¼W¥Ø¿ý"
++msgstr "«Ø¥ß¥Ø¿ý"
+ 
+ #: gtk/gtkfilesel.c:562 gtk/gtkfilesel.c:937
+ msgid "Delete File"
+@@ -82,7 +83,7 @@
+ 
+ #: gtk/gtkfilesel.c:573 gtk/gtkfilesel.c:1041
+ msgid "Rename File"
+-msgstr "­«·s©R¦W"
++msgstr "§ó§ïÀɦW"
+ 
+ #.
+ #. gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
+@@ -100,16 +101,16 @@
+ 
+ #: gtk/gtkfilesel.c:832
+ msgid "Create Directory"
+-msgstr "·s¼W¥Ø¿ý"
++msgstr "«Ø¥ß¥Ø¿ý"
+ 
+ #: gtk/gtkfilesel.c:846
+ msgid "Directory name:"
+-msgstr "¥Ø¿ý¦WºÙ:"
++msgstr "¥Ø¿ý¦WºÙ¡G"
+ 
+ #. buttons
+ #: gtk/gtkfilesel.c:859
+ msgid "Create"
+-msgstr "·s¼W"
++msgstr "«Ø¥ß"
+ 
+ #. buttons
+ #: gtk/gtkfilesel.c:959
+@@ -119,69 +120,69 @@
+ #. buttons
+ #: gtk/gtkfilesel.c:1074
+ msgid "Rename"
+-msgstr "§ó·s"
++msgstr "§ï¦W"
+ 
+ #: gtk/gtkfilesel.c:1457
+ msgid "Selection: "
+-msgstr "¦r«¬¿ï¶µ: "
++msgstr "¿ï¾Ü¡G"
+ 
+ #: gtk/gtkfontsel.c:210
+ msgid "Foundry:"
+-msgstr "´£¨Ñ:"
++msgstr "´£¨Ñ¡G"
+ 
+ #: gtk/gtkfontsel.c:211
+ msgid "Family:"
+-msgstr "¦rÅé:"
++msgstr "¦rÅé¡G"
+ 
+ #: gtk/gtkfontsel.c:212
+ msgid "Weight:"
+-msgstr "¤j¤p:"
++msgstr "¤j¤p¡G"
+ 
+ #: gtk/gtkfontsel.c:213
+ msgid "Slant:"
+-msgstr "±×Åé:"
++msgstr "±×Åé¡G"
+ 
+ #: gtk/gtkfontsel.c:214
+ msgid "Set Width:"
+-msgstr "¼e«×:"
++msgstr "¼e«×¡G"
+ 
+ #: gtk/gtkfontsel.c:215
+ msgid "Add Style:"
+-msgstr "¼W¥[§Î¦¡:"
++msgstr "¼W¥[´Ú¦¡¡G"
+ 
+ #: gtk/gtkfontsel.c:216
+ msgid "Pixel Size:"
+-msgstr "¹³¯À¤j¤p:"
++msgstr "¹³¯À¤j¤p¡G"
+ 
+ #: gtk/gtkfontsel.c:217
+ msgid "Point Size:"
+-msgstr "ÂI°}¤j¤p:"
++msgstr "ÂI°}¤j¤p¡G"
+ 
+ #: gtk/gtkfontsel.c:218
+ msgid "Resolution X:"
+-msgstr "X ¸ÑªR«×:"
++msgstr "X ¸ÑªR«×¡G"
+ 
+ #: gtk/gtkfontsel.c:219
+ msgid "Resolution Y:"
+-msgstr "Y ¸ÑªR«×:"
++msgstr "Y ¸ÑªR«×¡G"
+ 
+ #: gtk/gtkfontsel.c:220
+ msgid "Spacing:"
+-msgstr "¶¡¶Z:"
++msgstr "¶¡¶Z¡G"
+ 
+ #: gtk/gtkfontsel.c:221
+ msgid "Average Width:"
+-msgstr "¥­§¡¼e«×:"
++msgstr "¥­§¡¼e«×¡G"
+ 
+ #: gtk/gtkfontsel.c:222
+ msgid "Charset:"
+-msgstr "¦r¶°:"
++msgstr "¦r¶°¡G"
+ 
+ #. Number of internationalized titles here must match number
+ #. of NULL initializers above
+ #: gtk/gtkfontsel.c:459
+ msgid "Font Property"
+-msgstr "¦r«¬ÄÝ©Ê"
++msgstr "¦r«¬¯S©Ê"
+ 
+ #: gtk/gtkfontsel.c:460
+ msgid "Requested Value"
+@@ -197,15 +198,15 @@
+ 
+ #: gtk/gtkfontsel.c:504 gtk/gtkfontsel.c:2180 gtk/gtkfontsel.c:2410
+ msgid "Font:"
+-msgstr "¦r«¬:"
++msgstr "¦r«¬¡G"
+ 
+ #: gtk/gtkfontsel.c:509
+ msgid "Font Style:"
+-msgstr "¦r«¬¼Ë¦¡:"
++msgstr "¦r«¬´Ú¦¡¡G"
+ 
+ #: gtk/gtkfontsel.c:514
+ msgid "Size:"
+-msgstr "¤j¤p:"
++msgstr "¤j¤p¡G"
+ 
+ #: gtk/gtkfontsel.c:646 gtk/gtkfontsel.c:868
+ msgid "Reset Filter"
+@@ -213,7 +214,7 @@
+ 
+ #: gtk/gtkfontsel.c:660
+ msgid "Metric:"
+-msgstr "«×¶q:"
++msgstr "«×¶q¡G"
+ 
+ #: gtk/gtkfontsel.c:664
+ msgid "Points"
+@@ -226,7 +227,7 @@
+ #. create the text entry widget
+ #: gtk/gtkfontsel.c:687
+ msgid "Preview:"
+-msgstr "¹wÄý:"
++msgstr "¹wÄý¡G"
+ 
+ #: gtk/gtkfontsel.c:716
+ msgid "Font Information"
+@@ -234,16 +235,16 @@
+ 
+ #: gtk/gtkfontsel.c:749
+ msgid "Requested Font Name:"
+-msgstr "­n¨Dªº¦r«¬¦WºÙ:"
++msgstr "­n¨Dªº¦r«¬¦WºÙ¡G"
+ 
+ #: gtk/gtkfontsel.c:760
+ msgid "Actual Font Name:"
+-msgstr "¹ê»Ú¦r«¬¦WºÙ:"
++msgstr "¹ê»Ú¦r«¬¦WºÙ¡G"
+ 
+ #: gtk/gtkfontsel.c:771
+ #, c-format
+ msgid "%i fonts available with a total of %i styles."
+-msgstr "¦³ %i ºØ¦r«¬¨Ñ¿ï¥Î(¦@ %i ºØ¼Ë¦¡)"
++msgstr "¦³ %i ºØ¦r«¬¥i¿ï¥Î¡A¦@ %i ºØ¼Ë¦¡¡C"
+ 
+ #: gtk/gtkfontsel.c:786
+ msgid "Filter"
+@@ -251,7 +252,7 @@
+ 
+ #: gtk/gtkfontsel.c:799
+ msgid "Font Types:"
+-msgstr "¦r«¬ºØÃþ:"
++msgstr "¦r«¬ºØÃþ¡G"
+ 
+ #: gtk/gtkfontsel.c:807
+ msgid "Bitmap"
+@@ -272,7 +273,7 @@
+ #. Convert '(nil)' weights to 'regular', since it looks nicer.
+ #: gtk/gtkfontsel.c:1215
+ msgid "(nil)"
+-msgstr ""
++msgstr "(µL)"
+ 
+ #: gtk/gtkfontsel.c:1215
+ msgid "regular"
+@@ -300,11 +301,11 @@
+ 
+ #: gtk/gtkfontsel.c:1231
+ msgid "[M]"
+-msgstr ""
++msgstr "[M]"
+ 
+ #: gtk/gtkfontsel.c:1232
+ msgid "[C]"
+-msgstr ""
++msgstr "[C]"
+ 
+ #: gtk/gtkfontsel.c:1792
+ msgid "The selected font is not available."
+@@ -328,11 +329,11 @@
+ 
+ #: gtk/gtkfontsel.c:1983
+ msgid "proportional"
+-msgstr "¦¨¤ñ¨Òªº"
++msgstr "¦¨¤ñ¨Ò"
+ 
+ #: gtk/gtkfontsel.c:1984
+ msgid "monospaced"
+-msgstr "©w¼e«×ªº"
++msgstr "©T©w¼e«×"
+ 
+ #: gtk/gtkfontsel.c:1985
+ msgid "char cell"
+@@ -340,11 +341,11 @@
+ 
+ #: gtk/gtkfontsel.c:2185
+ msgid "Font: (Filter Applied)"
+-msgstr "¦r«¬: (±Ä¥Î¹LÂo¾¹)"
++msgstr "¦r«¬¡G(®M¥Î¹LÂo¾¹)"
+ 
+ #: gtk/gtkfontsel.c:2661
+ msgid "MAX_FONTS exceeded. Some fonts may be missing."
+-msgstr "¤w¶W¥X MAX_FONTS ,¥i¯à¿ò¥¢¬Y¨Ç¦r«¬¡C"
++msgstr "¤w¶W¥X MAX_FONTS¡A¥i¯à¿ò¥¢¬Y¨Ç¦r«¬¡C"
+ 
+ #: gtk/gtkfontsel.c:3508
+ msgid "Apply"
+@@ -369,11 +370,11 @@
+ 
+ #: gtk/gtkinputdialog.c:208
+ msgid "No input devices"
+-msgstr "¯Ê¤Ö¿é¤J¸Ë¸m"
++msgstr "¨S¦³¿é¤J¸Ë¸m"
+ 
+ #: gtk/gtkinputdialog.c:237
+ msgid "Device:"
+-msgstr "¸Ë¸m:"
++msgstr "¸Ë¸m¡G"
+ 
+ #: gtk/gtkinputdialog.c:253
+ msgid "Disabled"
+@@ -389,7 +390,7 @@
+ 
+ #: gtk/gtkinputdialog.c:277
+ msgid "Mode: "
+-msgstr "¼Ò¦¡:"
++msgstr "¼Ò¦¡¡G"
+ 
+ #. The axis listbox
+ #: gtk/gtkinputdialog.c:307
+@@ -399,7 +400,7 @@
+ #. Keys listbox
+ #: gtk/gtkinputdialog.c:323
+ msgid "Keys"
+-msgstr "犦s"
++msgstr "Áä"
+ 
+ #. We create the save button in any case, so that clients can
+ #. connect to it, without paying attention to whether it exits
+@@ -409,11 +410,11 @@
+ 
+ #: gtk/gtkinputdialog.c:500
+ msgid "X"
+-msgstr ""
++msgstr "X"
+ 
+ #: gtk/gtkinputdialog.c:501
+ msgid "Y"
+-msgstr ""
++msgstr "Y"
+ 
+ #: gtk/gtkinputdialog.c:502
+ msgid "Pressure"
+@@ -445,21 +446,21 @@
+ msgid "Page %u"
+ msgstr "²Ä %u ­¶"
+ 
+-#: gtk/gtkrc.c:1703
++#: gtk/gtkrc.c:1758
+ #, c-format
+ msgid "Unable to locate image file in pixmap_path: \"%s\" line %d"
+-msgstr "µLªk¥Ñ pixmap_path §ä¨ì¹ÏÀÉ: \"%s\" ²Ä %d ¦æ"
++msgstr "µLªk¥Ñ pixmap_path §ä¨ì¹ÏÀÉ¡G\"%s\" ²Ä %d ¦æ"
+ 
+-#: gtk/gtkrc.c:1706
++#: gtk/gtkrc.c:1761
+ #, c-format
+ msgid "Unable to locate image file in pixmap_path: \"%s\""
+-msgstr "µLªk¥Ñ pixmap_path §ä¨ì¹ÏÀÉ: \"%s\""
++msgstr "µLªk¥Ñ pixmap_path §ä¨ì¹ÏÀÉ¡G\"%s\""
+ 
+ #: gtk/gtkthemes.c:79
+ #, c-format
+ msgid "Unable to locate loadable module in module_path: \"%s\","
+-msgstr "µLªk¥Ñ module_path §ä¨ì¥i¸ü¤J¼Ò²Õ: \"%s\","
++msgstr "µLªk¥Ñ module_path §ä¨ì¥i¸ü¤J¼Ò²Õ¡G\"%s\"¡A"
+ 
+ #: gtk/gtktipsquery.c:180
+ msgid "--- No Tip ---"
+-msgstr "--- ¤wµL´£¥Ü ---"
++msgstr "--- µL´£¥Ü ---"
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r2.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r2.ebuild
new file mode 100644
index 000000000000..0080a9274cdd
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-1.2.10-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r2.ebuild,v 1.1 2001/08/15 13:09:26 hallski Exp $
+
+A=${P}.tar.gz
+S=${WORKDIR}/${P}
+DESCRIPTION="gtk"
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/${A}
+	 ftp://ftp.gnome.org/pub/GNOME/stable/sources/gtk+/${A}
+	 http://ftp.gnome.org/pub/GNOME/stable/sources/gtk+/${A}"
+HOMEPAGE="http://www.gtk.org/"
+
+DEPEND="virtual/glibc virtual/x11
+	>=dev-libs/glib-1.2.10"
+
+src_unpack() {
+        unpack ${A}
+      
+        cd ${S}
+        patch -p0 < ${FILESDIR}/gtk-1.2.10.patch
+}
+
+src_compile() {
+	local myconf
+	
+	if [ "${DEBUG}" ]
+	then
+		myconf="--enable-debug=yes"
+	else
+		myconf="--enable-debug=no"
+	fi
+	
+  	try ./configure --host=${CHOST} --prefix=/usr/X11R6 ${myconf} \
+	--infodir=/usr/X11R6/info --mandir=/usr/X11R6/man --sysconfdir=/etc/X11 \
+	--with-xinput=xfree --with-x
+	try pmake
+}
+
+src_install() {
+	try make install DESTDIR=${D}
+
+	preplib /usr/X11R6
+
+	dodoc AUTHORS COPYING ChangeLog* HACKING
+	dodoc NEWS* README* TODO
+	docinto docs
+	cd docs
+	dodoc *.txt *.gif text/*
+	cd html
+	docinto html
+	dodoc *.html *.gif
+
+  	#install nice, clean-looking default gtk+ style
+	insinto /etc/X11/gtk
+	doins ${FILESDIR}/gtkrc
+}
+
+
+
+