r1589 - in trunk: . gtk+

jim at linuxfromscratch.org jim at linuxfromscratch.org
Thu Jul 6 20:35:53 PDT 2006


Author: jim
Date: 2006-07-06 21:35:50 -0600 (Thu, 06 Jul 2006)
New Revision: 1589

Modified:
   trunk/
   trunk/gtk+/gtk+-1.2.10-fixes-1.patch
Log:
 r1798 at server:  jim | 2006-07-06 20:35:29 -0700
 Fixed gtk 1.2.10 fixes patch



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1710
e59974df-c20a-0410-b7e1-d7eaf1be8828:/patches:1796
   + cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1710
e59974df-c20a-0410-b7e1-d7eaf1be8828:/patches:1798

Modified: trunk/gtk+/gtk+-1.2.10-fixes-1.patch
===================================================================
--- trunk/gtk+/gtk+-1.2.10-fixes-1.patch	2006-07-07 02:19:43 UTC (rev 1588)
+++ trunk/gtk+/gtk+-1.2.10-fixes-1.patch	2006-07-07 03:35:50 UTC (rev 1589)
@@ -5,19 +5,2911 @@
 Upstream Status: Unknown
 Description: Various Fixes
 
+diff -Naur gtk+-1.2.10.orig/acinclude.m4 gtk+-1.2.10/acinclude.m4
+--- gtk+-1.2.10.orig/acinclude.m4	2000-02-02 17:07:42.000000000 -0800
++++ gtk+-1.2.10/acinclude.m4	2006-07-06 20:28:57.685202738 -0700
+@@ -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)
+diff -Naur gtk+-1.2.10.orig/configure.in gtk+-1.2.10/configure.in
+--- gtk+-1.2.10.orig/configure.in	2001-03-15 12:31:58.000000000 -0800
++++ gtk+-1.2.10/configure.in	2006-07-06 20:28:57.689202634 -0700
+@@ -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"
+ 
+@@ -192,6 +192,15 @@
+ 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.
+ AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
+diff -Naur gtk+-1.2.10.orig/gdk/gdk.c gtk+-1.2.10/gdk/gdk.c
+--- gtk+-1.2.10.orig/gdk/gdk.c	2001-03-09 19:32:30.000000000 -0800
++++ gtk+-1.2.10/gdk/gdk.c	2006-07-06 20:28:57.689202634 -0700
+@@ -704,16 +704,18 @@
+   
+   if (return_val == Success)
+     {
+-      if (!window_private->destroyed)
+-	return_val = XGrabPointer (window_private->xdisplay,
+-				   xwindow,
+-				   owner_events,
+-				   xevent_mask,
+-				   GrabModeAsync, GrabModeAsync,
+-				   xconfine_to,
+-				   xcursor,
+-				   time);
+-      else
++      if (!window_private->destroyed) {
++	if (getenv ("GTK_NO_GRAB") == NULL) {
++	  return_val = XGrabPointer (window_private->xdisplay,
++				     xwindow,
++				     owner_events,
++				     xevent_mask,
++				     GrabModeAsync, GrabModeAsync,
++				     xconfine_to,
++				     xcursor,
++				     time);
++	}
++      } else
+ 	return_val = AlreadyGrabbed;
+     }
+   
+@@ -802,13 +804,16 @@
+   window_private = (GdkWindowPrivate*) window;
+   xwindow = window_private->xwindow;
+   
+-  if (!window_private->destroyed)
+-    return XGrabKeyboard (window_private->xdisplay,
+-			  xwindow,
+-			  owner_events,
+-			  GrabModeAsync, GrabModeAsync,
+-			  time);
+-  else
++  if (!window_private->destroyed) {
++    if (getenv ("GTK_NO_GRAB") == NULL) {
++      return XGrabKeyboard (window_private->xdisplay,
++			    xwindow,
++			    owner_events,
++			    GrabModeAsync, GrabModeAsync,
++			    time);
++    } else
++      return Success;
++  } else
+     return AlreadyGrabbed;
+ }
+ 
+diff -Naur gtk+-1.2.10.orig/gdk/gdkevents.c gtk+-1.2.10/gdk/gdkevents.c
+--- gtk+-1.2.10.orig/gdk/gdkevents.c	2000-12-03 08:02:49.000000000 -0800
++++ gtk+-1.2.10/gdk/gdkevents.c	2006-07-06 20:28:57.693202530 -0700
+@@ -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;
+diff -Naur gtk+-1.2.10.orig/gtk/Makefile.am gtk+-1.2.10/gtk/Makefile.am
+--- gtk+-1.2.10.orig/gtk/Makefile.am	2001-02-02 09:09:02.000000000 -0800
++++ gtk+-1.2.10/gtk/Makefile.am	2006-07-06 20:28:57.693202530 -0700
+@@ -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
+diff -Naur gtk+-1.2.10.orig/gtk/gtkctree.c gtk+-1.2.10/gtk/gtkctree.c
+--- gtk+-1.2.10.orig/gtk/gtkctree.c	2001-02-19 13:08:18.000000000 -0800
++++ gtk+-1.2.10/gtk/gtkctree.c	2006-07-06 20:28:57.697202426 -0700
+@@ -630,8 +630,8 @@
+   ctree->tree_indent    = 20;
+   ctree->tree_spacing   = 5;
+   ctree->tree_column    = 0;
+-  ctree->line_style     = GTK_CTREE_LINES_SOLID;
+-  ctree->expander_style = GTK_CTREE_EXPANDER_SQUARE;
++  ctree->line_style     = GTK_CTREE_LINES_NONE;
++  ctree->expander_style = GTK_CTREE_EXPANDER_TRIANGLE;
+   ctree->drag_compare   = NULL;
+   ctree->show_stub      = TRUE;
+ 
+diff -Naur gtk+-1.2.10.orig/gtk/gtkdnd.c gtk+-1.2.10/gtk/gtkdnd.c
+--- gtk+-1.2.10.orig/gtk/gtkdnd.c	2001-03-23 15:24:31.000000000 -0800
++++ gtk+-1.2.10/gtk/gtkdnd.c	2006-07-06 20:28:57.705202217 -0700
+@@ -2673,7 +2673,8 @@
+   if (gdk_drag_motion (info->context, dest_window, protocol,
+ 		       x_root, y_root, action, 
+ 		       possible_actions,
+-		       time))
++		       time)
++      && info->last_event != event)
+     {
+       if (info->last_event)
+ 	gdk_event_free ((GdkEvent *)info->last_event);
+diff -Naur gtk+-1.2.10.orig/gtk/gtkentry.c gtk+-1.2.10/gtk/gtkentry.c
+--- gtk+-1.2.10.orig/gtk/gtkentry.c	2001-04-01 19:14:54.000000000 -0700
++++ gtk+-1.2.10/gtk/gtkentry.c	2006-07-06 20:28:57.705202217 -0700
+@@ -34,9 +34,9 @@
+ #include "gtksignal.h"
+ #include "gtkstyle.h"
+ 
+-#define MIN_ENTRY_WIDTH  150
+-#define DRAW_TIMEOUT     20
+-
++#define MIN_ENTRY_WIDTH      150
++#define DRAW_TIMEOUT         20
++#define CURSOR_BLINK_TIMEOUT 500
+ /* If you are going to change this, see the note in entry_adjust_scroll */
+ #define INNER_BORDER     2
+ 
+@@ -77,6 +77,8 @@
+ 					   GdkEventMotion    *event);
+ static gint gtk_entry_key_press           (GtkWidget         *widget,
+ 					   GdkEventKey       *event);
++static void gtk_entry_cursor_reset        (GtkEntry *entry);
++static gint gtk_entry_cursor_timeout_cb   (gpointer data);
+ static gint gtk_entry_focus_in            (GtkWidget         *widget,
+ 					   GdkEventFocus     *event);
+ static gint gtk_entry_focus_out           (GtkWidget         *widget,
+@@ -467,6 +469,8 @@
+   tmp_pos = entry->text_length;
+   gtk_editable_insert_text (GTK_EDITABLE(entry), text, strlen (text), &tmp_pos);
+   GTK_EDITABLE(entry)->current_pos = tmp_pos;
++
++  gtk_entry_cursor_reset (entry);
+ }
+ 
+ void
+@@ -558,6 +562,7 @@
+ gtk_entry_finalize (GtkObject *object)
+ {
+   GtkEntry *entry;
++  int cursor_timeout_id;
+ 
+   g_return_if_fail (object != NULL);
+   g_return_if_fail (GTK_IS_ENTRY (object));
+@@ -567,6 +572,12 @@
+   if (entry->timer)
+     gtk_timeout_remove (entry->timer);
+ 
++  cursor_timeout_id =
++    cursor_timeout_id = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (entry),
++							      "gtk_entry_cursor_timeout_id"));
++  if (cursor_timeout_id != 0)
++    gtk_timeout_remove (cursor_timeout_id);
++
+   entry->text_size = 0;
+ 
+   if (entry->text)
+@@ -724,6 +735,7 @@
+ gtk_entry_unrealize (GtkWidget *widget)
+ {
+   GtkEntry *entry;
++  int cursor_timeout_id;
+ 
+   g_return_if_fail (widget != NULL);
+   g_return_if_fail (GTK_IS_ENTRY (widget));
+@@ -743,6 +755,17 @@
+     }
+ #endif
+ 
++  cursor_timeout_id =
++    cursor_timeout_id = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (entry),
++							      "gtk_entry_cursor_timeout_id"));
++  if (cursor_timeout_id != 0)
++    {  
++      gtk_timeout_remove (cursor_timeout_id);
++      gtk_object_set_data (GTK_OBJECT (entry), "gtk_entry_cursor_timeout_id",
++			   GINT_TO_POINTER (0));
++    }
++  
++
+   if (entry->text_area)
+     {
+       gdk_window_set_user_data (entry->text_area, NULL);
+@@ -1232,6 +1255,8 @@
+ 	  gtk_editable_insert_text (editable, event->string, event->length, &tmp_pos);
+ 	  editable->current_pos = tmp_pos;
+ 
++	  gtk_entry_cursor_reset (entry);
++
+ 	  return_val = TRUE;
+ 	}
+       break;
+@@ -1276,6 +1301,50 @@
+ }
+ 
+ static gint
++gtk_entry_cursor_timeout_cb (gpointer data)
++{
++  GtkEntry *entry;
++  gboolean cursor_visible;
++
++  entry = GTK_ENTRY (data);
++
++  cursor_visible = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (entry),
++							 "gtk_entry_cursor_visible"));
++  cursor_visible = ! cursor_visible;
++  gtk_object_set_data (GTK_OBJECT (entry), "gtk_entry_cursor_visible",
++		       GINT_TO_POINTER (cursor_visible));
++
++  gtk_entry_draw_cursor (entry);
++
++  return TRUE;
++}
++
++static void
++gtk_entry_cursor_reset (GtkEntry *entry)
++{
++  gint timeout_id;
++
++  gtk_object_set_data (GTK_OBJECT (entry), "gtk_entry_cursor_visible",
++		       GINT_TO_POINTER (TRUE));
++
++  timeout_id = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (entry),
++						     "gtk_entry_cursor_timeout_id"));
++  if (timeout_id != 0)
++    gtk_timeout_remove (timeout_id);
++
++  if (GTK_WIDGET_HAS_FOCUS (entry))
++    {
++      timeout_id = gtk_timeout_add (CURSOR_BLINK_TIMEOUT,
++				    gtk_entry_cursor_timeout_cb, entry);
++      gtk_object_set_data (GTK_OBJECT (entry), "gtk_entry_cursor_timeout_id",
++			   GINT_TO_POINTER (timeout_id));
++    }
++  else
++    gtk_object_set_data (GTK_OBJECT (entry), "gtk_entry_cursor_timeout_id",
++			 GINT_TO_POINTER (0));
++}
++
++static gint
+ gtk_entry_focus_in (GtkWidget     *widget,
+ 		    GdkEventFocus *event)
+ {
+@@ -1291,6 +1360,8 @@
+     gdk_im_begin (GTK_EDITABLE(widget)->ic, GTK_ENTRY(widget)->text_area);
+ #endif
+ 
++  gtk_entry_cursor_reset (GTK_ENTRY (widget));
++
+   return FALSE;
+ }
+ 
+@@ -1309,6 +1380,7 @@
+   gdk_im_end ();
+ #endif
+ 
++  gtk_entry_cursor_reset (GTK_ENTRY (widget));
+   return FALSE;
+ }
+ 
+@@ -1510,6 +1582,7 @@
+   GtkEditable *editable;
+   gint xoffset;
+   gint text_area_height;
++  gboolean cursor_visible;
+ 
+   g_return_if_fail (entry != NULL);
+   g_return_if_fail (GTK_IS_ENTRY (entry));
+@@ -1524,7 +1597,12 @@
+ 
+       gdk_window_get_size (entry->text_area, NULL, &text_area_height);
+ 
+-      if (GTK_WIDGET_HAS_FOCUS (widget) &&
++      cursor_visible = GPOINTER_TO_INT (gtk_object_get_data
++					(GTK_OBJECT (widget),
++					 "gtk_entry_cursor_visible"));
++
++      if (cursor_visible &&
++	  GTK_WIDGET_HAS_FOCUS (widget) &&
+ 	  (editable->selection_start_pos == editable->selection_end_pos))
+ 	{
+ 	  gdk_draw_line (drawable, widget->style->fg_gc[GTK_STATE_NORMAL], 
+@@ -2006,6 +2084,8 @@
+     editable->current_pos += x;
+ 
+   /* Ignore vertical motion */
++
++  gtk_entry_cursor_reset (entry);
+ }
+ 
+ static void
+@@ -2071,6 +2151,8 @@
+ 	}
+ 
+       editable->current_pos = i;
++
++      gtk_entry_cursor_reset (entry);
+     }
+ }
+ 
+@@ -2113,6 +2195,8 @@
+ 	i = 0;
+ 	  
+       editable->current_pos = i;
++
++      gtk_entry_cursor_reset (entry);
+     }
+ }
+ 
+@@ -2127,6 +2211,8 @@
+     editable->current_pos = entry->text_length;
+   else
+     editable->current_pos = column;
++
++  gtk_entry_cursor_reset (entry);
+ }
+ 
+ static void
+@@ -2273,6 +2359,8 @@
+   gtk_editable_claim_selection (editable, entry->text_length != 0, time);
+ 
+   editable->current_pos = editable->selection_end_pos;
++
++  gtk_entry_cursor_reset (entry);
+ }
+ 
+ static void 
+diff -Naur gtk+-1.2.10.orig/gtk/gtkfilesel.c gtk+-1.2.10/gtk/gtkfilesel.c
+--- gtk+-1.2.10.orig/gtk/gtkfilesel.c	2001-02-15 20:36:19.000000000 -0800
++++ gtk+-1.2.10/gtk/gtkfilesel.c	2006-07-06 20:28:57.713202009 -0700
+@@ -55,6 +55,1745 @@
+ #include "gtkclist.h"
+ #include "gtkdialog.h"
+ #include "gtkintl.h"
++#include "gtkpixmap.h"
++
++static char * home_xpm[] = {
++"48 48 714 2",
++"  	c None",
++". 	c #634D3A",
++"+ 	c #9C8871",
++"@ 	c #654E3D",
++"# 	c #35271C",
++"$ 	c #000000",
++"% 	c #050101",
++"& 	c #0B0301",
++"* 	c #080100",
++"= 	c #0F0402",
++"- 	c #B0A08D",
++"; 	c #7C6859",
++"> 	c #9C8B7C",
++", 	c #523D31",
++"' 	c #271D16",
++") 	c #200806",
++"! 	c #C6918A",
++"~ 	c #8D2C22",
++"{ 	c #541812",
++"] 	c #6E1C15",
++"^ 	c #020000",
++"/ 	c #B6A996",
++"( 	c #716052",
++"_ 	c #453324",
++": 	c #3F2E24",
++"< 	c #C3B7B0",
++"[ 	c #443529",
++"} 	c #1B140F",
++"| 	c #110403",
++"1 	c #581A14",
++"2 	c #49120D",
++"3 	c #49130E",
++"4 	c #42110C",
++"5 	c #0A0101",
++"6 	c #A79A87",
++"7 	c #837566",
++"8 	c #423124",
++"9 	c #231B15",
++"0 	c #4B423A",
++"a 	c #6B5D52",
++"b 	c #D1C9C3",
++"c 	c #3D3127",
++"d 	c #16100C",
++"e 	c #371915",
++"f 	c #B46B60",
++"g 	c #60221C",
++"h 	c #69201A",
++"i 	c #681F19",
++"j 	c #96836F",
++"k 	c #9F9185",
++"l 	c #5D4A39",
++"m 	c #0F0C09",
++"n 	c #3A3632",
++"o 	c #9A9C99",
++"p 	c #453B33",
++"q 	c #8A7C71",
++"r 	c #C4BAB0",
++"s 	c #2E241C",
++"t 	c #110C09",
++"u 	c #1D0806",
++"v 	c #62221C",
++"w 	c #541611",
++"x 	c #46120D",
++"y 	c #A2917D",
++"z 	c #AEA397",
++"A 	c #806B58",
++"B 	c #25201B",
++"C 	c #525251",
++"D 	c #949493",
++"E 	c #656665",
++"F 	c #6E6259",
++"G 	c #72665C",
++"H 	c #D4CDC6",
++"I 	c #261D18",
++"J 	c #2E0E0B",
++"K 	c #A64D41",
++"L 	c #603429",
++"M 	c #968772",
++"N 	c #B7AEA3",
++"O 	c #7F6C5D",
++"P 	c #0E0B09",
++"Q 	c #211C18",
++"R 	c #BABAB9",
++"S 	c #494948",
++"T 	c #B4B5B4",
++"U 	c #565655",
++"V 	c #B7B9B7",
++"W 	c #85807A",
++"X 	c #66594F",
++"Y 	c #BDB2A7",
++"Z 	c #3A2D23",
++"` 	c #080504",
++" .	c #2B231D",
++"..	c #190605",
++"+.	c #9F5546",
++"@.	c #998A77",
++"#.	c #B0A599",
++"$.	c #6F6254",
++"%.	c #0B0907",
++"&.	c #1F1B18",
++"*.	c #5C5C5A",
++"=.	c #B9B9B7",
++"-.	c #40403F",
++";.	c #CFD1CF",
++">.	c #565656",
++",.	c #D2D2D2",
++"'.	c #939391",
++").	c #918D88",
++"!.	c #3C2E25",
++"~.	c #A39385",
++"{.	c #5C4B40",
++"].	c #29211B",
++"^.	c #423B32",
++"/.	c #9A8B77",
++"(.	c #A99D91",
++"_.	c #564B40",
++":.	c #070605",
++"<.	c #1A1715",
++"[.	c #A6A6A5",
++"}.	c #4F514F",
++"|.	c #3A3B3A",
++"1.	c #E4E4E4",
++"2.	c #606060",
++"3.	c #A5A6A5",
++"4.	c #9D9D9C",
++"5.	c #75716E",
++"6.	c #281E17",
++"7.	c #A29387",
++"8.	c #6F5D4F",
++"9.	c #090605",
++"0.	c #271F19",
++"a.	c #B4A58D",
++"b.	c #978777",
++"c.	c #BEB5AA",
++"d.	c #4B4139",
++"e.	c #080605",
++"f.	c #1E1B19",
++"g.	c #666665",
++"h.	c #B1B1B0",
++"i.	c #5A5A5A",
++"j.	c #BEBEBD",
++"k.	c #555555",
++"l.	c #EAEAEA",
++"m.	c #696969",
++"n.	c #E7E7E7",
++"o.	c #A9A9A9",
++"p.	c #C2C3C2",
++"q.	c #686968",
++"r.	c #9C9996",
++"s.	c #2E221B",
++"t.	c #837569",
++"u.	c #685446",
++"v.	c #AA9A85",
++"w.	c #B5A997",
++"x.	c #D2CCC3",
++"y.	c #3D352D",
++"z.	c #080705",
++"A.	c #23201C",
++"B.	c #B2B2B1",
++"C.	c #AEAEAE",
++"D.	c #7D7D7D",
++"E.	c #DADADA",
++"F.	c #777777",
++"G.	c #999999",
++"H.	c #EBEBEB",
++"I.	c #A7A7A7",
++"J.	c #DDDDDD",
++"K.	c #A5A5A3",
++"L.	c #6E6B68",
++"M.	c #332921",
++"N.	c #68564A",
++"O.	c #634D3D",
++"P.	c #16100B",
++"Q.	c #1B130F",
++"R.	c #A0907A",
++"S.	c #D1C8B9",
++"T.	c #A2968A",
++"U.	c #28221C",
++"V.	c #0B0908",
++"W.	c #4A4641",
++"X.	c #828280",
++"Y.	c #EFEFEF",
++"Z.	c #858585",
++"`.	c #E9E9E9",
++" +	c #979797",
++".+	c #EEEEEE",
++"++	c #9A9A9A",
++"@+	c #6F6F6F",
++"#+	c #D4D4D4",
++"$+	c #5F5F5D",
++"%+	c #9C9C99",
++"&+	c #2D251E",
++"*+	c #5D4D40",
++"=+	c #6B5545",
++"-+	c #2B1F16",
++";+	c #C0B199",
++">+	c #E7E1D6",
++",+	c #756B5F",
++"'+	c #18130F",
++")+	c #100D0A",
++"!+	c #595551",
++"~+	c #B7B7B6",
++"{+	c #585958",
++"]+	c #A9A9A7",
++"^+	c #6E6F6E",
++"/+	c #C6C8C6",
++"(+	c #8E8E8E",
++"_+	c #F2F2F2",
++":+	c #E8E8E8",
++"<+	c #A0A0A0",
++"[+	c #9C9C9C",
++"}+	c #F0F0F0",
++"|+	c #8D8D8D",
++"1+	c #777775",
++"2+	c #AAAAA9",
++"3+	c #74726F",
++"4+	c #271F1A",
++"5+	c #58483B",
++"6+	c #695442",
++"7+	c #39291D",
++"8+	c #231D1A",
++"9+	c #B7A994",
++"0+	c #F3ECDA",
++"a+	c #DAD4C9",
++"b+	c #5F524A",
++"c+	c #94918D",
++"d+	c #717271",
++"e+	c #B6B6B5",
++"f+	c #686866",
++"g+	c #7A7A78",
++"h+	c #969696",
++"i+	c #F3F3F3",
++"j+	c #B4B4B4",
++"k+	c #E5E5E5",
++"l+	c #A2A2A2",
++"m+	c #EDEDED",
++"n+	c #AAAAAA",
++"o+	c #D9D9D9",
++"p+	c #727271",
++"q+	c #93918E",
++"r+	c #27211B",
++"s+	c #493B30",
++"t+	c #715C4B",
++"u+	c #463324",
++"v+	c #0E0906",
++"w+	c #251F1B",
++"x+	c #D6C9B2",
++"y+	c #FFFBEE",
++"z+	c #D2CBC0",
++"A+	c #4D4137",
++"B+	c #110E0B",
++"C+	c #1D1711",
++"D+	c #837F7A",
++"E+	c #696968",
++"F+	c #B5B5B5",
++"G+	c #6E6E6C",
++"H+	c #D9D9D8",
++"I+	c #F4F4F4",
++"J+	c #A6A6A6",
++"K+	c #E2E2E2",
++"L+	c #9D9D9D",
++"M+	c #A5A5A5",
++"N+	c #A3A3A3",
++"O+	c #908E8D",
++"P+	c #251F19",
++"Q+	c #3A2C24",
++"R+	c #6F5C4B",
++"S+	c #4F3A2A",
++"T+	c #150F0B",
++"U+	c #171411",
++"V+	c #B4A796",
++"W+	c #DACBB2",
++"X+	c #FEFAEE",
++"Y+	c #DBD3C9",
++"Z+	c #352C24",
++"`+	c #120F0B",
++" @	c #2E261F",
++".@	c #8E8E8D",
++"+@	c #6C6C6B",
++"@@	c #BABBBA",
++"#@	c #838383",
++"$@	c #ABABAB",
++"%@	c #BABABA",
++"&@	c #E3E3E3",
++"*@	c #ECECEC",
++"=@	c #B2B2B2",
++"-@	c #DCDCDC",
++";@	c #ABADAB",
++">@	c #656360",
++",@	c #251E17",
++"'@	c #2E231B",
++")@	c #6E5949",
++"!@	c #513B2B",
++"~@	c #1F1710",
++"{@	c #0D0A08",
++"]@	c #C5B7A5",
++"^@	c #E5DCCA",
++"/@	c #A0948B",
++"(@	c #1E1711",
++"_@	c #1C1511",
++":@	c #514940",
++"<@	c #454544",
++"[@	c #969694",
++"}@	c #B0B0AE",
++"|@	c #7F7F7D",
++"1@	c #B0B0B0",
++"2@	c #C2C2C2",
++"3@	c #C8C8C8",
++"4@	c #BBBBBB",
++"5@	c #B9B9B9",
++"6@	c #B7B7B7",
++"7@	c #DFDFDF",
++"8@	c #B6B6B6",
++"9@	c #D3D3D3",
++"0@	c #4A4948",
++"a@	c #261F1B",
++"b@	c #32251C",
++"c@	c #543F2E",
++"d@	c #493526",
++"e@	c #120D09",
++"f@	c #16120F",
++"g@	c #5F5248",
++"h@	c #221912",
++"i@	c #554437",
++"j@	c #ADA9A6",
++"k@	c #3A3A3A",
++"l@	c #232322",
++"m@	c #444544",
++"n@	c #9FA09F",
++"o@	c #C5C5C5",
++"p@	c #BFBFBF",
++"q@	c #BEBEBE",
++"r@	c #B1B1B1",
++"s@	c #9F9F9F",
++"t@	c #808080",
++"u@	c #909090",
++"v@	c #4B4B4B",
++"w@	c #4A4A4A",
++"x@	c #2A2A29",
++"y@	c #443C36",
++"z@	c #291E15",
++"A@	c #19120D",
++"B@	c #9A9088",
++"C@	c #0E0E0E",
++"D@	c #1B1B1A",
++"E@	c #4A4B4A",
++"F@	c #DCDDDC",
++"G@	c #F1F1F1",
++"H@	c #F5F5F5",
++"I@	c #373737",
++"J@	c #242424",
++"K@	c #080808",
++"L@	c #292726",
++"M@	c #1C1714",
++"N@	c #1F1F1F",
++"O@	c #E0E0E0",
++"P@	c #D1D1D1",
++"Q@	c #CFCFCF",
++"R@	c #CECECE",
++"S@	c #C9C9C9",
++"T@	c #757575",
++"U@	c #343434",
++"V@	c #1B1B1B",
++"W@	c #292929",
++"X@	c #545454",
++"Y@	c #ADADAD",
++"Z@	c #3B3B3B",
++"`@	c #D5D5D5",
++" #	c #DBDBDB",
++".#	c #D8D8D8",
++"+#	c #464646",
++"@#	c #252828",
++"##	c #050505",
++"$#	c #0F0E0C",
++"%#	c #0C0F0F",
++"&#	c #2D302E",
++"*#	c #C0C0C0",
++"=#	c #BDBDBD",
++"-#	c #272727",
++";#	c #404040",
++">#	c #E1E1E1",
++",#	c #DEDEDE",
++"'#	c #D7D7D7",
++")#	c #181B1B",
++"!#	c #374845",
++"~#	c #242D2C",
++"{#	c #303636",
++"]#	c #363D3C",
++"^#	c #595D5A",
++"/#	c #23221F",
++"(#	c #949494",
++"_#	c #4F4F4F",
++":#	c #222222",
++"<#	c #444444",
++"[#	c #939393",
++"}#	c #262626",
++"|#	c #161917",
++"1#	c #0A0B0A",
++"2#	c #080908",
++"3#	c #090B0A",
++"4#	c #161716",
++"5#	c #303030",
++"6#	c #0E0E0C",
++"7#	c #2B3534",
++"8#	c #555856",
++"9#	c #515251",
++"0#	c #8E8E8B",
++"a#	c #A5A3A0",
++"b#	c #0C0C0C",
++"c#	c #747474",
++"d#	c #3D3D3D",
++"e#	c #2E2E2E",
++"f#	c #2D2D2D",
++"g#	c #525252",
++"h#	c #7F7F7F",
++"i#	c #151515",
++"j#	c #1F221E",
++"k#	c #362E2A",
++"l#	c #050705",
++"m#	c #070C08",
++"n#	c #232D25",
++"o#	c #393939",
++"p#	c #151513",
++"q#	c #191F1E",
++"r#	c #6F6F6E",
++"s#	c #8A8B8A",
++"t#	c #CDCCCA",
++"u#	c #0A0B0B",
++"v#	c #727272",
++"w#	c #484848",
++"x#	c #2B2B2B",
++"y#	c #333333",
++"z#	c #424242",
++"A#	c #6E6E6E",
++"B#	c #1E1E1E",
++"C#	c #7A5551",
++"D#	c #C2827C",
++"E#	c #C4A6A3",
++"F#	c #271E1C",
++"G#	c #0D0C0A",
++"H#	c #313432",
++"I#	c #363B37",
++"J#	c #CBCBCB",
++"K#	c #070808",
++"L#	c #171F1E",
++"M#	c #7C7D7C",
++"N#	c #111313",
++"O#	c #666666",
++"P#	c #3F3F3F",
++"Q#	c #494949",
++"R#	c #181615",
++"S#	c #974B46",
++"T#	c #482521",
++"U#	c #B25851",
++"V#	c #DEC0BD",
++"W#	c #3C3535",
++"X#	c #010101",
++"Y#	c #262827",
++"Z#	c #1C2221",
++"`#	c #8B8B8B",
++" $	c #D1D2D2",
++".$	c #D8D9D8",
++"+$	c #080909",
++"@$	c #4D4D4D",
++"#$	c #5D5D5D",
++"$$	c #040202",
++"%$	c #391D1A",
++"&$	c #7D312B",
++"*$	c #B04D45",
++"=$	c #C47168",
++"-$	c #33201F",
++";$	c #292B2A",
++">$	c #CDCDCD",
++",$	c #CCCCCC",
++"'$	c #0E0D0C",
++")$	c #212926",
++"!$	c #999997",
++"~$	c #BBBDBD",
++"{$	c #DFE0E0",
++"]$	c #141414",
++"^$	c #282828",
++"/$	c #5F5F5F",
++"($	c #414141",
++"_$	c #080606",
++":$	c #833C34",
++"<$	c #8D3F37",
++"[$	c #9C413B",
++"}$	c #9A413A",
++"|$	c #261615",
++"1$	c #242524",
++"2$	c #CACACA",
++"3$	c #1C1E1D",
++"4$	c #29322E",
++"5$	c #D2D3D2",
++"6$	c #D7D7D6",
++"7$	c #111111",
++"8$	c #919191",
++"9$	c #2C2C2C",
++"0$	c #0D0D0D",
++"a$	c #636363",
++"b$	c #9D524A",
++"c$	c #9F3C34",
++"d$	c #994037",
++"e$	c #9C4841",
++"f$	c #151716",
++"g$	c #6C6C6C",
++"h$	c #24201D",
++"i$	c #323530",
++"j$	c #2E2E28",
++"k$	c #343532",
++"l$	c #353532",
++"m$	c #212121",
++"n$	c #3C3C3C",
++"o$	c #686868",
++"p$	c #0F0F0F",
++"q$	c #060606",
++"r$	c #8D5651",
++"s$	c #9D3D36",
++"t$	c #9C453D",
++"u$	c #A35149",
++"v$	c #2C1F1E",
++"w$	c #1B1C1B",
++"x$	c #C6C6C6",
++"y$	c #BDB4A9",
++"z$	c #B0AAA5",
++"A$	c #979796",
++"B$	c #828282",
++"C$	c #626262",
++"D$	c #090909",
++"E$	c #684946",
++"F$	c #8A362E",
++"G$	c #97453F",
++"H$	c #9C5A54",
++"I$	c #261716",
++"J$	c #191C1A",
++"K$	c #C4C4C4",
++"L$	c #C3C3C3",
++"M$	c #5C5C5C",
++"N$	c #171717",
++"O$	c #392423",
++"P$	c #632E29",
++"Q$	c #96453D",
++"R$	c #88544F",
++"S$	c #291D1C",
++"T$	c #010000",
++"U$	c #121513",
++"V$	c #1C1C1C",
++"W$	c #7A7A7A",
++"X$	c #1A1B1B",
++"Y$	c #885A56",
++"Z$	c #753B36",
++"`$	c #804F4B",
++" %	c #904F49",
++".%	c #282020",
++"+%	c #151715",
++"@%	c #949790",
++"#%	c #626362",
++"$%	c #282C23",
++"%%	c #36412B",
++"&%	c #202E15",
++"*%	c #8B8E88",
++"=%	c #394131",
++"-%	c #A0A59A",
++";%	c #1E2020",
++">%	c #524442",
++",%	c #65403C",
++"'%	c #69514E",
++")%	c #875551",
++"!%	c #2A2424",
++"~%	c #070505",
++"{%	c #202120",
++"]%	c #B0B4AB",
++"^%	c #9DA694",
++"/%	c #778B65",
++"(%	c #6B8258",
++"_%	c #6E855A",
++":%	c #7F8E6F",
++"<%	c #778868",
++"[%	c #60774B",
++"}%	c #607254",
++"|%	c #3F5431",
++"1%	c #394B30",
++"2%	c #35422E",
++"3%	c #30402C",
++"4%	c #30412C",
++"5%	c #2B3A2B",
++"6%	c #2E3F2B",
++"7%	c #3C562A",
++"8%	c #425F2C",
++"9%	c #A2AB99",
++"0%	c #3D4A35",
++"a%	c #638052",
++"b%	c #3B4A30",
++"c%	c #21291A",
++"d%	c #241918",
++"e%	c #4B3533",
++"f%	c #6B4F4D",
++"g%	c #392D2A",
++"h%	c #180C0C",
++"i%	c #152215",
++"j%	c #161E15",
++"k%	c #1F291F",
++"l%	c #222C23",
++"m%	c #29352B",
++"n%	c #2B392D",
++"o%	c #2E3F2E",
++"p%	c #32452E",
++"q%	c #32422E",
++"r%	c #2D3B2E",
++"s%	c #2A392C",
++"t%	c #2D422E",
++"u%	c #2A362B",
++"v%	c #2C3C2C",
++"w%	c #2C3C2D",
++"x%	c #2C3B2D",
++"y%	c #2B3B2C",
++"z%	c #30402A",
++"A%	c #394F2B",
++"B%	c #45632E",
++"C%	c #415F2C",
++"D%	c #3F6232",
++"E%	c #406634",
++"F%	c #416330",
++"G%	c #3D592C",
++"H%	c #405F30",
++"I%	c #3F5F2E",
++"J%	c #42482C",
++"K%	c #191210",
++"L%	c #0F0908",
++"M%	c #080505",
++"N%	c #070B07",
++"O%	c #080D09",
++"P%	c #0B0F0B",
++"Q%	c #121A0F",
++"R%	c #1B2917",
++"S%	c #293B1F",
++"T%	c #394E2D",
++"U%	c #3B5930",
++"V%	c #406532",
++"W%	c #44652E",
++"X%	c #446630",
++"Y%	c #354F30",
++"Z%	c #29362B",
++"`%	c #2A362C",
++" &	c #2B3A2C",
++".&	c #2C3B2A",
++"+&	c #304129",
++"@&	c #303F2D",
++"#&	c #446C37",
++"$&	c #446934",
++"%&	c #446332",
++"&&	c #405F2D",
++"*&	c #416531",
++"=&	c #446531",
++"-&	c #3D6232",
++";&	c #3B562B",
++">&	c #374827",
++",&	c #3F2B25",
++"'&	c #31341F",
++")&	c #1D1C11",
++"!&	c #1E2312",
++"~&	c #253719",
++"{&	c #243518",
++"]&	c #233317",
++"^&	c #2C3D1C",
++"/&	c #375125",
++"(&	c #42602D",
++"_&	c #466630",
++":&	c #44632E",
++"<&	c #3C552D",
++"[&	c #293A28",
++"}&	c #2A3B27",
++"|&	c #314527",
++"1&	c #2C3D22",
++"2&	c #1E2A19",
++"3&	c #212E1B",
++"4&	c #253321",
++"5&	c #2A3A26",
++"6&	c #446933",
++"7&	c #426531",
++"8&	c #3C6032",
++"9&	c #34512B",
++"0&	c #354B23",
++"a&	c #27371A",
++"b&	c #2B3D1C",
++"c&	c #28391B",
++"d&	c #334921",
++"e&	c #395125",
++"f&	c #3D5829",
++"g&	c #3A5226",
++"h&	c #395129",
++"i&	c #3C592D",
++"j&	c #3F6332",
++"k&	c #42652E",
++"l&	c #42632E",
++"m&	c #3C592A",
++"n&	c #233217",
++"o&	c #0B0F09",
++"p&	c #26341E",
++"q&	c #24321B",
++"r&	c #2E4122",
++"s&	c #202C1B",
++"t&	c #27361E",
++"u&	c #233219",
++"v&	c #3B5527",
++"w&	c #3C5628",
++"x&	c #334922",
++"y&	c #36542B",
++"z&	c #334A22",
++"A&	c #30441F",
++"B&	c #374F25",
++"C&	c #324821",
++"D&	c #344A22",
++"E&	c #314520",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                .                                               ",
++"                                              + @ #                                             ",
++"                            $ % & * = $     - ; > , '                                           ",
++"                            ) ! ~ { ] ^   / ( _ : < [ }                                         ",
++"                            | 1 2 3 4 5 6 7 8 9 0 a b c d                                       ",
++"                            e f g h i j k l m n o p q r s t                                     ",
++"                            u v w x y z A m B C D E F G H I t                                   ",
++"                            J K L M N O P Q R S T U V W X Y Z `  .                              ",
++"                            ..+. at .#.$.%.&.*.=.-.;.>.,.'.).!.~.{.` ].                            ",
++"                            ^./.(._.:.<.[.}.R |.1.2.1.3.4.5.6.7.8.9.0.                          ",
++"                          a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.9.}                         ",
++"                        v.w.x.y.z.A.B.U C.D.E.F.l.G.H.I.J.m.K.L.M.N.O.P.Q.                      ",
++"                      R.S.T.U.V.W.g.C.}.h.X.Y.Z.`. +.+++H. at +#+$+%+&+*+=+-+`                     ",
++"                    ;+>+,+'+)+!+~+{+]+^+/+(+_+I.:+<+.+[+}+|+l.1+2+3+4+5+6+7+` 8+                ",
++"                9+0+a+b+)+'+c+d+e+f+e+g+Y.h+i+j+k+l+m+++.+n+`.|+o+p+q+r+s+t+u+v+w+              ",
++"              x+y+z+A+B+C+D+h.E+F+G+H+ +I+J+}+n+K+L+l.M+.+N+n.I.1.[+C.O+P+Q+R+S+T+U+            ",
++"          V+W+X+Y+Z+`+ @L.. at C.+@@@#@i+$@i+j+Y.%@&@I.n.I.*@I.k+C.1.=@-@;@>@,@'@)@!@~@{@          ",
++"          ]@^@/@(@_@:@<@C [@}@|@n.1 at .+2@}+3 at H.4@K+%@K+5 at n.6@7 at n+-@8 at J.9@2.0 at a@b at c@d at e@f@        ",
++"            g at h@i at j@k at l@m at n@B.j+o at 6@p at 1@q at r@6 at J+=@++L+s@ +t at L+u@I.G.$@1 at v@w at x@y at z@A at 9           ",
++"              B at 4@C@$ D at E@F at .+}+G at I+H@i+i+I+H at H@I+_+i+I+I+_+}+H..+:+J.6 at I@J@$ K at L@M@$           ",
++"                $ $ $ N at k.:+n.`.l.k+K+1.l.`.`.k+1.O at J.o+P@,.,.P at Q@R at S@T at U@V@$ $ $ $ $           ",
++"                    $ W at X@o at S@3 at 4@%@p at 5@8 at M+J+$@Y at C.n+r@C.o.N+o.L+J+r at i.W@J@$ $ $               ",
++"                      Z at X@3 at 1.1.K+J.-@`@9@#+ #E.o+.#+#@###$#%#&#+#*#=#v at J@-#$                   ",
++"                      ;#i.o.&@K+>#7@,#J.- at R@C..#'#Q@)#!#~#{#]#^#/#(#F+_#:#-#$                   ",
++"                      <#2.[#>#}#|#1#2#3#4#5#X at r@C.o.6#7#8#9#0#a#b#c#J+d#e#f#$                   ",
++"                      g#v at h#o+i#j#k#l#$ m#n#o#`@#+,.p#q#r#h#s#t#u#v#q at w#x#y#$                   ",
++"                      2.z#A#,#B#C#D#E#F#G#H#I#J#q at 4@K#L#M#h#q@'#N#O#F+P#V@<#$                   ",
++"                      A#Q#T at -@R#S#T#U#V#W#X#Y#++h+h+K at Z#`#l+ $.$+$z#F.B#i#@$$                   ",
++"                      #$Z@@+o+$$%$&$*$=$-$$ ;$Q@>$,$'$)$!$~${$1.]$>.<+^$b#f#$                   ",
++"                      /$($A#o+_$:$<$[$}$|$$ 1$>$,$2$3$4$5$'#7 at 6$7$k.8$9$0$5#$                   ",
++"                      m.e#a$'#K at b$c$d$e$|$$ f$M+++g$h$i$j$3$k$l$m$n$o$-#p$5#                    ",
++"                      @+d#P#,.q$r$s$t$u$v$$ w$S at 3@x$y$z$A$B$C$a$>.<#O#n$p$5#                    ",
++"                      A#>.d#q at D$E$F$G$H$I$$ J$3 at o@K$L$2@*#q@=#J+1 at C$M$o#N$f#                    ",
++"                      c#A#<#Y at D$O$P$Q$R$S$T$U$6 at F+n+<+<+[+h+(+t at a$/$w at V$V at 9$                    ",
++"                        W$n$=@X$Y$Z$`$ %.%X#+%6 at 8@8 at j+r@1 at N+ +@%h+Z.#%$%%%&%                    ",
++"                        *%=%-%;%>%,%'%)%!%~%{%]%^%/%(%_%:%<%[%}%|%1%2%3%4%5%6%7%8%              ",
++"                        9%0%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v%w%x%y%z%A%              ",
++"                  B%C%D%E%F%G%H%I%J%I$K%L%M%N%O%P%Q%R%S%T%U%V%W%X%Y%Z%`% & &.&+&6%@&            ",
++"                #&$&%&&&*&=&*&-&;&>&,&'&)&!&~&{&]&^&/&(&_&_&:&<&[&}&|&1&2&3&4&5&                ",
++"                  6&7&8&9&0&a&b&c&d&e&f&g&h&i&j&k&k&l&m&n&  o&p&q&r&s&t&u&                      ",
++"                            v&w&x&        y&z&      A&x&B&C&D&E&                                ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                "};
++static char * desktop_xpm[] = {
++"48 48 554 2",
++"  	c None",
++". 	c #D6CCB9",
++"+ 	c #DED6C7",
++"@ 	c #BFB090",
++"# 	c #BFB095",
++"$ 	c #9A949A",
++"% 	c #BBB5BE",
++"& 	c #B5AFB9",
++"* 	c #AEA7B1",
++"= 	c #AAA3AE",
++"- 	c #A69FAA",
++"; 	c #A49CA7",
++"> 	c #A199A5",
++", 	c #A098A4",
++"' 	c #A097A4",
++") 	c #9F97A3",
++"! 	c #A098A5",
++"~ 	c #9C94A1",
++"{ 	c #908894",
++"] 	c #9A8F83",
++"^ 	c #776D5A",
++"/ 	c #E5E0D4",
++"( 	c #F0EDE7",
++"_ 	c #E3DDD1",
++": 	c #D9D0BD",
++"< 	c #D0C6B1",
++"[ 	c #746C60",
++"} 	c #C0B29D",
++"| 	c #F2EFE9",
++"1 	c #D0C5B0",
++"2 	c #BFAF90",
++"3 	c #B8A88C",
++"4 	c #38353A",
++"5 	c #4C464F",
++"6 	c #867B8B",
++"7 	c #827787",
++"8 	c #817687",
++"9 	c #7E7383",
++"0 	c #7C7282",
++"a 	c #7A6E80",
++"b 	c #766A7C",
++"c 	c #776B7D",
++"d 	c #736879",
++"e 	c #746879",
++"f 	c #76697C",
++"g 	c #74687A",
++"h 	c #706376",
++"i 	c #6E6174",
++"j 	c #6A5D71",
++"k 	c #66596D",
++"l 	c #5D4F64",
++"m 	c #44384B",
++"n 	c #3F363B",
++"o 	c #B6B3AA",
++"p 	c #F8F8F6",
++"q 	c #ECE8E0",
++"r 	c #CFC3AB",
++"s 	c #C4B699",
++"t 	c #564F41",
++"u 	c #5A4F4B",
++"v 	c #BBAF97",
++"w 	c #FBFAF8",
++"x 	c #C0B192",
++"y 	c #BFAF8F",
++"z 	c #9F9177",
++"A 	c #0F0C10",
++"B 	c #281F2B",
++"C 	c #514259",
++"D 	c #504058",
++"E 	c #52425A",
++"F 	c #4C3C54",
++"G 	c #4B3B53",
++"H 	c #483950",
++"I 	c #4A3B52",
++"J 	c #46374D",
++"K 	c #48384F",
++"L 	c #4A3A52",
++"M 	c #45364C",
++"N 	c #403247",
++"O 	c #43354B",
++"P 	c #221B26",
++"Q 	c #433D3A",
++"R 	c #F6F4F0",
++"S 	c #D1C6B0",
++"T 	c #BEAE8F",
++"U 	c #4A4338",
++"V 	c #443D39",
++"W 	c #CEC2AC",
++"X 	c #F9F7F5",
++"Y 	c #675D52",
++"Z 	c #0A070B",
++"` 	c #2B212F",
++" .	c #493A51",
++"..	c #6A6070",
++"+.	c #706575",
++"@.	c #746979",
++"#.	c #9A939D",
++"$.	c #B4AFB7",
++"%.	c #BBB5BD",
++"&.	c #BDB7BF",
++"*.	c #E6E4E7",
++"=.	c #FDFDFD",
++"-.	c #000000",
++";.	c #281F2D",
++">.	c #221A25",
++",.	c #201A21",
++"'.	c #E8E3DB",
++").	c #C2B396",
++"!.	c #3D392E",
++"~.	c #363129",
++"{.	c #E1D9CB",
++"].	c #E9E4DB",
++"^.	c #312A2D",
++"/.	c #0B080C",
++"(.	c #372B3D",
++"_.	c #C2BDC5",
++":.	c #B8B8B8",
++"<.	c #B1B1B1",
++"[.	c #C8C8C8",
++"}.	c #DBDBDB",
++"|.	c #E6E6E6",
++"1.	c #EDEDED",
++"2.	c #F4F4F4",
++"3.	c #F7F7F7",
++"4.	c #FBFBFB",
++"5.	c #FCFCFC",
++"6.	c #FEFEFE",
++"7.	c #040305",
++"8.	c #2A212F",
++"9.	c #252023",
++"0.	c #BBB098",
++"a.	c #4A4438",
++"b.	c #27241D",
++"c.	c #D7D2C8",
++"d.	c #363237",
++"e.	c #181219",
++"f.	c #5C4F64",
++"g.	c #EAE8EB",
++"h.	c #FFFFFF",
++"i.	c #A7A7A7",
++"j.	c #989898",
++"k.	c #BEBEBE",
++"l.	c #DCDCDC",
++"m.	c #E5E5E5",
++"n.	c #EAEAEA",
++"o.	c #F5F5F5",
++"p.	c #F8F8F8",
++"q.	c #555555",
++"r.	c #020202",
++"s.	c #322835",
++"t.	c #5C524B",
++"u.	c #36312A",
++"v.	c #12100E",
++"w.	c #656263",
++"x.	c #413945",
++"y.	c #423449",
++"z.	c #6D6D6D",
++"A.	c #707070",
++"B.	c #BCBCBC",
++"C.	c #D3D3D3",
++"D.	c #9B9B9B",
++"E.	c #6F6F6F",
++"F.	c #797979",
++"G.	c #929292",
++"H.	c #D1D1D1",
++"I.	c #3D333F",
++"J.	c #120F15",
++"K.	c #C1BDC4",
++"L.	c #56475E",
++"M.	c #44364B",
++"N.	c #3F3246",
++"O.	c #D4D4D4",
++"P.	c #8F8F8F",
++"Q.	c #5D5D5D",
++"R.	c #343434",
++"S.	c #484848",
++"T.	c #5F5F5F",
++"U.	c #4E4E4E",
++"V.	c #373737",
++"W.	c #454545",
++"X.	c #A4A4A4",
++"Y.	c #DFDFDF",
++"Z.	c #B6B6B6",
++"`.	c #493951",
++" +	c #1C1620",
++".+	c #201923",
++"++	c #AEA7B0",
++"@+	c #B6B1B9",
++"#+	c #43354A",
++"$+	c #858585",
++"%+	c #737373",
++"&+	c #787878",
++"*+	c #8D8D8D",
++"=+	c #959595",
++"-+	c #ADADAD",
++";+	c #BFBFBF",
++">+	c #E8E8E8",
++",+	c #F0F0F0",
++"'+	c #F9F9F9",
++")+	c #717171",
++"!+	c #3A2E40",
++"~+	c #28212D",
++"{+	c #BCB6BE",
++"]+	c #A79FAA",
++"^+	c #C3C3C3",
++"/+	c #ACACAC",
++"(+	c #8B8B8B",
++"_+	c #5E5E5E",
++":+	c #808080",
++"<+	c #AAAAAA",
++"[+	c #332839",
++"}+	c #3D3044",
++"|+	c #362B3C",
++"1+	c #342939",
++"2+	c #C0BAC3",
++"3+	c #8F8594",
++"4+	c #CECECE",
++"5+	c #BBBBBB",
++"6+	c #949494",
++"7+	c #595959",
++"8+	c #282828",
++"9+	c #575757",
++"0+	c #6A6A6A",
++"a+	c #EFEFEF",
++"b+	c #E0E0E0",
++"c+	c #CFCFCF",
++"d+	c #D8D8D8",
++"e+	c #281F2C",
++"f+	c #35293B",
++"g+	c #322737",
++"h+	c #C5BFC8",
++"i+	c #7C7081",
++"j+	c #E1E1E1",
++"k+	c #4A4A4A",
++"l+	c #AEAEAE",
++"m+	c #E9E9E9",
++"n+	c #FAFAFA",
++"o+	c #C6C6C6",
++"p+	c #171219",
++"q+	c #C1995E",
++"r+	c #D5A960",
++"s+	c #735B57",
++"t+	c #42344A",
++"u+	c #312636",
++"v+	c #C5C0C7",
++"w+	c #685B6E",
++"x+	c #46374E",
++"y+	c #EBEBEB",
++"z+	c #EEEEEE",
++"A+	c #6C6C6C",
++"B+	c #C4C4C4",
++"C+	c #AD8947",
++"D+	c #FECA65",
++"E+	c #BE8134",
++"F+	c #5A424A",
++"G+	c #312736",
++"H+	c #BEB9C2",
++"I+	c #47384E",
++"J+	c #C9C9C9",
++"K+	c #7E7E7E",
++"L+	c #5C5C5C",
++"M+	c #3B3B3B",
++"N+	c #4C4C4C",
++"O+	c #A9A9A9",
++"P+	c #9F9F9F",
++"Q+	c #9D9D9D",
++"R+	c #FEF9EE",
++"S+	c #C59C4E",
++"T+	c #EABA62",
++"U+	c #CC7300",
++"V+	c #84532E",
++"W+	c #44354B",
++"X+	c #413347",
++"Y+	c #47384F",
++"Z+	c #332939",
++"`+	c #B4AEB7",
++" @	c #AFA8B2",
++".@	c #F3F3F3",
++"+@	c #B2B2B2",
++"@@	c #CDCDCD",
++"#@	c #ECECEC",
++"$@	c #FED076",
++"%@	c #E3B45A",
++"&@	c #C37413",
++"*@	c #AD6510",
++"=@	c #392C3E",
++"-@	c #392D40",
++";@	c #3E3044",
++">@	c #47374F",
++",@	c #B4ADB7",
++"'@	c #A39BA7",
++")@	c #493950",
++"!@	c #FEF3DD",
++"~@	c #D2A456",
++"{@	c #652A0C",
++"]@	c #2C2231",
++"^@	c #2F2535",
++"/@	c #2F2534",
++"(@	c #322838",
++"_@	c #332A37",
++":@	c #352938",
++"<@	c #B1ABB4",
++"[@	c #756C64",
++"}@	c #3A2F3D",
++"|@	c #3F3145",
++"1@	c #444444",
++"2@	c #898989",
++"3@	c #505050",
++"4@	c #3E3E3E",
++"5@	c #C3B290",
++"6@	c #F2C174",
++"7@	c #B06006",
++"8@	c #602105",
++"9@	c #662100",
++"0@	c #2C2230",
++"a@	c #241C28",
++"b@	c #231B26",
++"c@	c #1D1720",
++"d@	c #362B3D",
++"e@	c #2D2332",
++"f@	c #322B30",
++"g@	c #6D605B",
++"h@	c #2E2432",
++"i@	c #B6B0B6",
++"j@	c #C2B7A7",
++"k@	c #63574D",
++"l@	c #3E3245",
++"m@	c #D5D5D5",
++"n@	c #C7B694",
++"o@	c #E6AC5A",
++"p@	c #7E3E02",
++"q@	c #3A1E1B",
++"r@	c #211A25",
++"s@	c #18131B",
++"t@	c #231B27",
++"u@	c #171118",
++"v@	c #3B3333",
++"w@	c #988A77",
++"x@	c #8E8172",
++"y@	c #2B2230",
++"z@	c #C0B6AF",
++"A@	c #F3F0EA",
++"B@	c #B4A489",
++"C@	c #4A413F",
++"D@	c #19141B",
++"E@	c #413348",
++"F@	c #FEDB98",
++"G@	c #FACB71",
++"H@	c #DE9E42",
++"I@	c #612700",
++"J@	c #5E2004",
++"K@	c #2A1B21",
++"L@	c #1B151E",
++"M@	c #1C151E",
++"N@	c #0E0A0E",
++"O@	c #6E6258",
++"P@	c #CDC3B2",
++"Q@	c #D5CCC1",
++"R@	c #9E907B",
++"S@	c #28202D",
++"T@	c #E2DDD5",
++"U@	c #F3F1EE",
++"V@	c #D3C8B3",
++"W@	c #C9BCA4",
++"X@	c #2A2327",
++"Y@	c #120D15",
++"Z@	c #33283A",
++"`@	c #FDCE73",
++" #	c #D58824",
++".#	c #BB6C10",
++"+#	c #622304",
++"@#	c #441600",
++"##	c #1C161F",
++"$#	c #18121A",
++"%#	c #120E14",
++"&#	c #141016",
++"*#	c #100C10",
++"=#	c #998D78",
++"-#	c #E9E5E0",
++";#	c #EAE6E0",
++">#	c #BDAE90",
++",#	c #A4957F",
++"'#	c #29202D",
++")#	c #ABA4AD",
++"!#	c #F1EEE8",
++"~#	c #EFEBE5",
++"{#	c #DDD7C9",
++"]#	c #DBD3C3",
++"^#	c #BEB197",
++"/#	c #302A2B",
++"(#	c #09060A",
++"_#	c #2A212E",
++":#	c #837988",
++"<#	c #807C81",
++"[#	c #B3ADA2",
++"}#	c #EBC274",
++"|#	c #7C3D00",
++"1#	c #220B00",
++"2#	c #100D12",
++"3#	c #130F15",
++"4#	c #130F16",
++"5#	c #100C12",
++"6#	c #0A080A",
++"7#	c #9D9180",
++"8#	c #F3F2F0",
++"9#	c #F2EFEA",
++"0#	c #CBBFA7",
++"a#	c #BAAA8C",
++"b#	c #A3947F",
++"c#	c #ACA4A6",
++"d#	c #F9F8F6",
++"e#	c #E3DDCF",
++"f#	c #CEC3B0",
++"g#	c #BEB099",
++"h#	c #C4B7A0",
++"i#	c #B2A388",
++"j#	c #39342F",
++"k#	c #0A090C",
++"l#	c #251D29",
++"m#	c #17121A",
++"n#	c #1B160B",
++"o#	c #E1B359",
++"p#	c #AF7C2D",
++"q#	c #692900",
++"r#	c #5A1D00",
++"s#	c #110806",
++"t#	c #0C090D",
++"u#	c #0F0C12",
++"v#	c #181414",
++"w#	c #A59D91",
++"x#	c #F2F0EF",
++"y#	c #EDE8E1",
++"z#	c #E3DDD0",
++"A#	c #C0B19A",
++"B#	c #BCAC8D",
++"C#	c #988878",
++"D#	c #2C2331",
++"E#	c #B6ABA2",
++"F#	c #F8F7F4",
++"G#	c #CFC4AD",
++"H#	c #D2C8B3",
++"I#	c #C7BAA2",
++"J#	c #C1B396",
++"K#	c #AB9C80",
++"L#	c #AC9D82",
++"M#	c #352E2D",
++"N#	c #1A151E",
++"O#	c #322738",
++"P#	c #413349",
++"Q#	c #0A080B",
++"R#	c #09070A",
++"S#	c #403220",
++"T#	c #E3B45C",
++"U#	c #B47929",
++"V#	c #AD5D02",
++"W#	c #642102",
++"X#	c #4C1C09",
++"Y#	c #100C11",
++"Z#	c #080609",
++"`#	c #0B090D",
++" $	c #151017",
++".$	c #262120",
++"+$	c #A49987",
++"@$	c #D4CDC1",
++"#$	c #DDD6C9",
++"$$	c #E4DED4",
++"%$	c #D4CCC0",
++"&$	c #CABFAC",
++"*$	c #BDAF96",
++"=$	c #827469",
++"-$	c #584D4B",
++";$	c #2D2330",
++">$	c #B0A28A",
++",$	c #B3B0AC",
++"'$	c #565146",
++")$	c #464035",
++"!$	c #4A4139",
++"~$	c #3C352F",
++"{$	c #302927",
++"]$	c #413936",
++"^$	c #161018",
++"/$	c #251C28",
++"($	c #1E1721",
++"_$	c #271F2B",
++":$	c #6E583E",
++"<$	c #E7B75E",
++"[$	c #BF710F",
++"}$	c #914C06",
++"|$	c #2A110A",
++"1$	c #050406",
++"2$	c #130E14",
++"3$	c #151018",
++"4$	c #1C161D",
++"5$	c #4E4445",
++"6$	c #494044",
++"7$	c #8C7E6E",
++"8$	c #7C6E66",
++"9$	c #766962",
++"0$	c #817368",
++"a$	c #897B6D",
++"b$	c #6B5E5A",
++"c$	c #3C3239",
++"d$	c #1E1720",
++"e$	c #201924",
++"f$	c #736B65",
++"g$	c #544E4A",
++"h$	c #292325",
++"i$	c #110E13",
++"j$	c #17131A",
++"k$	c #1B161F",
++"l$	c #211A23",
++"m$	c #383037",
++"n$	c #241D29",
++"o$	c #241E29",
++"p$	c #261F2B",
++"q$	c #221B25",
++"r$	c #928156",
++"s$	c #D5A556",
++"t$	c #6E2E06",
++"u$	c #5C1E01",
++"v$	c #0F0705",
++"w$	c #030304",
++"x$	c #030203",
++"y$	c #050405",
++"z$	c #1D1721",
++"A$	c #211B25",
++"B$	c #251E2A",
++"C$	c #161118",
++"D$	c #D5D68D",
++"E$	c #E2BB5D",
++"F$	c #C06700",
++"G$	c #692100",
++"H$	c #4B1800",
++"I$	c #BDCC99",
++"J$	c #F2ECC5",
++"K$	c #B2A96D",
++"L$	c #965A05",
++"M$	c #A35502",
++"N$	c #270C00",
++"O$	c #EBE7C0",
++"P$	c #CDC398",
++"Q$	c #1E1D0F",
++"R$	c #0C0900",
++"S$	c #512A04",
++"T$	c #5E1E00",
++"U$	c #0D0400",
++"V$	c #9B9D78",
++"W$	c #938C6A",
++"X$	c #221E17",
++"Y$	c #121001",
++"Z$	c #391900",
++"`$	c #1B1B14",
++" %	c #060505",
++".%	c #090700",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                ",
++"                . + @ @ @ # $ % & * = - ; > , ' > > ) ' > ! > ! ~ { ] ^ / ( _ : < [             ",
++"              } | 1 2 2 3 4 5 6 6 7 8 8 9 0 a b c d e f g h i j k l m n o p q r s t u           ",
++"              v w x y z A B C D E F G H I F F F J K G L M N F F F F F O P Q R S T U V           ",
++"              W X y Y Z ` F F F F L  .F ..+. at .#.$.%.&.*.=.-.;.F F F F F G >.,.'.).!.~.          ",
++"              {.].^./.(.F F F F H _.:.<.[.}.|.1.2.3.4.5.6.-.7.F F F F F F F 8.9.0.a.b.          ",
++"              c.d.e.O F F F H f.g.h.i.j.k.l.m.n.o.p.1.=.6.q.r.F F F F F F F L s.t.u.v.          ",
++"              w.x.F F L y.M 6 h.h.h.z.A.B.C.D.E.F.G.H.=.h.q.-.F F F F F F L I F I.A J.          ",
++"              K.L.M.N.N K F O.P.Q.R.R.S.T.U.V.W.X.Y.Z.h.h.q.-.F F F F F `.F F F F  +.+          ",
++"            ++ at +#+K G F F F $+%+&+*+=+-+;+>+,+'+5.6.h.h.h.)+-.N F F F I G F F F F !+~+          ",
++"            {+]+F F F F F F -+<.Z.^+^+/+(+_+S.A.=+:+,+h.h.<+-.[+F F G L F F F F F }+|+1+        ",
++"            2+3+F F F F F F 4+<+5+6+7+8+9+i.0+a+b+c+d+h.h.<+-.e+F I  .F F F F F F y.f+g+        ",
++"            h+i+F F F F F G j+k.k+Q.l+m+n+5.Z.p.h.h.h.h.h.o+-.p+q+r+s+F F F F F G t+[+u+        ",
++"            v+w+F F F F  .x+y+>+z+2.o.p.5.=.5.-+U.A+B+h.h.h.-.C+D+D+E+F+F G G `.`.x+[+G+        ",
++"            H+C F F F H I+F ,+J+E.K+L+M+)+A.N+&+O+P+Q+h.h.R+S+D+T+E+U+V+H W+X+x+Y+x+|+Z+        ",
++"          `+ @F F F `.`.F F . at b+n.c++@@@4.h.h.h.h.#@h.h.R+$@D+%@&@U+U+*@=@f+-@;@>@J g+1+        ",
++"          ,@'@F F )@G F F F '+n+n+4.=.=.h.X.h.h.h.A.h.!@$@D+~@U+U+U+U+{@]@^@/@(@!+M |+_@:@      ",
++"          <@[@}@|@F F F F F n+n+|.1 at o+O.2@3@:+A+A+4 at 5@D+D+6 at U+U+U+7@8 at 9@0 at a@b at c@d at e@f at g@h@      ",
++"          i at j@k at b@l at F F F F 5.=.4.%+m at 5.p.b+h.h.h.n@D+D+o at U+U+U+p@9 at 9@q at r@c at s@t at u@v at w@x at y@      ",
++"          z at A@B at C@D at E@F F F =.6.6.6.h.h.h.h.h.h.F at D+G@H at U+U+U+I@9 at J@K at c@L at D@M at N@O at P@Q at R@S@      ",
++"          T at U@V at W@X at Y@Z at F F 6.6.6.h.h.h.h.h.h.F at D+`@ #U+U+.#+#9@@###s@$#%#&#*#=#-#;#>#,#'#      ",
++"        )#!#~#{#]#^#/#(#_#G :#<#<+<+<+<+<+[#}#D+~@U+U+U+|#9 at 9@1#2#3#&#4#5#6#7#8#9#0#a#b#y@      ",
++"        c#d#e#f#g#h#i#j#k#l#G m#-.-.-.-.n#o#D+p#U+U+U+q#9 at r#s#t#t#5#%#u#v#w#x#y#z#A#B#C#D#      ",
++"        E#F#G#H#I#J#K#L#M#N#O#P#m#Q#R#S#T#D+U#U+U+V#W#9 at X#Y#R#Z#`# $Y#.$+$@$#$$$%$&$*$=$-$;$    ",
++"        >$,$'$a.)$!$~${$]$^$/$($t at _$:$D+<$[$U+U+}$9 at 9@|$Z#1$1$Q#2$3$4$5$6$7$8$9$0$a$b$c$d$e$    ",
++"        f$g$h$i$j$N#k$l$m$n$o$p$q$r$D+s$[$U+U+t$9 at u$v$w$x$y$R#2#s at z$A$n$B$p$p$p$p$p$p$r at m#C$    ",
++"                                  D$E$U+U+F$G$9 at H$-.-.-.-.-.                                    ",
++"                                I$J$K$L$M$9 at 9@N$-.-.-.-.-.                                      ",
++"                                O$P$Q$R$S$T$U$-.-.-.-.                                          ",
++"                              V$W$X$-.Y$Z$-.-.-.-.                                              ",
++"                              `$ %.%    -.-.-.                                                  ",
++"                                      -.-.                                                      ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                "};
++
++static char * documents_xpm[] = {
++"48 48 317 2",
++"  	c None",
++". 	c #000000",
++"+ 	c #978F7C",
++"@ 	c #8F8775",
++"# 	c #605D52",
++"$ 	c #070706",
++"% 	c #24231F",
++"& 	c #33312C",
++"* 	c #3B3932",
++"= 	c #3A372F",
++"- 	c #676154",
++"; 	c #AE8E53",
++"> 	c #DDAF5A",
++", 	c #F3B94F",
++"' 	c #948C79",
++") 	c #24221E",
++"! 	c #7E7767",
++"~ 	c #857E6D",
++"{ 	c #524D42",
++"] 	c #3E3B34",
++"^ 	c #2F2D29",
++"/ 	c #201F1D",
++"( 	c #191816",
++"_ 	c #282622",
++": 	c #858175",
++"< 	c #A59E8D",
++"[ 	c #99927F",
++"} 	c #B18F52",
++"| 	c #E4B04F",
++"1 	c #B48B3A",
++"2 	c #6F5224",
++"3 	c #DEC277",
++"4 	c #CAAF6F",
++"5 	c #90825F",
++"6 	c #A4A093",
++"7 	c #C8C4B9",
++"8 	c #D0CDC4",
++"9 	c #C5C0B6",
++"0 	c #B2AC9E",
++"a 	c #A7A090",
++"b 	c #7E7867",
++"c 	c #6D6758",
++"d 	c #22201C",
++"e 	c #151411",
++"f 	c #181714",
++"g 	c #232220",
++"h 	c #343432",
++"i 	c #43423F",
++"j 	c #3D3C38",
++"k 	c #524E47",
++"l 	c #716B5C",
++"m 	c #928A78",
++"n 	c #8D8472",
++"o 	c #706557",
++"p 	c #50473D",
++"q 	c #29221E",
++"r 	c #201A17",
++"s 	c #4D3C1F",
++"t 	c #5F4922",
++"u 	c #604A22",
++"v 	c #E9E089",
++"w 	c #FDFAA2",
++"x 	c #FAF5A0",
++"y 	c #D3C28F",
++"z 	c #858481",
++"A 	c #C5C2BC",
++"B 	c #B6B1A5",
++"C 	c #8E8674",
++"D 	c #645F54",
++"E 	c #57544D",
++"F 	c #37352F",
++"G 	c #2C2923",
++"H 	c #2C2A24",
++"I 	c #32302B",
++"J 	c #5D5A54",
++"K 	c #737069",
++"L 	c #A7A59D",
++"M 	c #BBB9B1",
++"N 	c #A5A297",
++"O 	c #A29D93",
++"P 	c #857F6E",
++"Q 	c #8A8371",
++"R 	c #918977",
++"S 	c #857B6A",
++"T 	c #5B5146",
++"U 	c #342D27",
++"V 	c #241D17",
++"W 	c #4E3D1F",
++"X 	c #E5D683",
++"Y 	c #E8E392",
++"Z 	c #BFBD7C",
++"` 	c #312C28",
++" .	c #4E4640",
++"..	c #605750",
++"+.	c #413B34",
++"@.	c #413C36",
++"#.	c #514B42",
++"$.	c #B6B3AD",
++"%.	c #B9B5AF",
++"&.	c #C0BDB4",
++"*.	c #C1BDB2",
++"=.	c #BAB5A8",
++"-.	c #B5AFA2",
++";.	c #B0A99B",
++">.	c #A29B8A",
++",.	c #958C78",
++"'.	c #887E6D",
++").	c #675C50",
++"!.	c #3C342D",
++"~.	c #221B17",
++"{.	c #4C3B1F",
++"].	c #D0B470",
++"^.	c #B8A263",
++"/.	c #332E29",
++"(.	c #3B3530",
++"_.	c #5C524B",
++":.	c #585048",
++"<.	c #4B433E",
++"[.	c #847B75",
++"}.	c #695E56",
++"|.	c #877F78",
++"1.	c #77736D",
++"2.	c #EBE6AB",
++"3.	c #EEECCF",
++"4.	c #DEDDB0",
++"5.	c #C1BE70",
++"6.	c #9C8653",
++"7.	c #9E8B5B",
++"8.	c #1F1916",
++"9.	c #1E1815",
++"0.	c #1E1816",
++"a.	c #948259",
++"b.	c #3E3731",
++"c.	c #3E3732",
++"d.	c #534A44",
++"e.	c #625850",
++"f.	c #574E47",
++"g.	c #413A34",
++"h.	c #99918B",
++"i.	c #463E39",
++"j.	c #867E56",
++"k.	c #E3E2AB",
++"l.	c #C8C7AB",
++"m.	c #938E5B",
++"n.	c #615233",
++"o.	c #3E3522",
++"p.	c #181311",
++"q.	c #1C1714",
++"r.	c #504842",
++"s.	c #423B35",
++"t.	c #938B85",
++"u.	c #332D28",
++"v.	c #B6A267",
++"w.	c #857F4E",
++"x.	c #5F5134",
++"y.	c #352D1C",
++"z.	c #191412",
++"A.	c #5B514A",
++"B.	c #504741",
++"C.	c #645951",
++"D.	c #564D46",
++"E.	c #2F2926",
++"F.	c #3D352B",
++"G.	c #8D7E49",
++"H.	c #493D27",
++"I.	c #161210",
++"J.	c #5D534C",
++"K.	c #5E544D",
++"L.	c #635851",
++"M.	c #594F49",
++"N.	c #37302D",
++"O.	c #99928C",
++"P.	c #3A3430",
++"Q.	c #433924",
++"R.	c #251F17",
++"S.	c #171311",
++"T.	c #1A1512",
++"U.	c #61564F",
++"V.	c #5A514A",
++"W.	c #332D29",
++"X.	c #9E9792",
++"Y.	c #1A1513",
++"Z.	c #514943",
++"`.	c #5A504A",
++" +	c #2C2724",
++".+	c #9D9691",
++"++	c #332D2A",
++"@+	c #3B3531",
++"#+	c #645A52",
++"$+	c #5F554E",
++"%+	c #352F2C",
++"&+	c #A29C97",
++"*+	c #5F554D",
++"=+	c #655A52",
++"-+	c #34302B",
++";+	c #ABA5A1",
++">+	c #2E2926",
++",+	c #665B53",
++"'+	c #342E2A",
++")+	c #A59E9A",
++"!+	c #0C0908",
++"~+	c #595049",
++"{+	c #595048",
++"]+	c #282421",
++"^+	c #9F9893",
++"/+	c #624C27",
++"(+	c #231A0C",
++"_+	c #47403A",
++":+	c #514842",
++"<+	c #27221F",
++"[+	c #AAA39F",
++"}+	c #382C1D",
++"|+	c #E3AF4D",
++"1+	c #372A12",
++"2+	c #48403B",
++"3+	c #4D443F",
++"4+	c #554C46",
++"5+	c #231F1C",
++"6+	c #AFA9A5",
++"7+	c #403833",
++"8+	c #B3893E",
++"9+	c #CE9C43",
++"0+	c #2B200E",
++"a+	c #3A342F",
++"b+	c #48413B",
++"c+	c #5A5049",
++"d+	c #23201D",
++"e+	c #AAA4A0",
++"f+	c #61574F",
++"g+	c #755928",
++"h+	c #423214",
++"i+	c #140F06",
++"j+	c #18130C",
++"k+	c #39332F",
++"l+	c #36312C",
++"m+	c #4A423C",
++"n+	c #37312D",
++"o+	c #9E9995",
++"p+	c #5D544C",
++"q+	c #4F4741",
++"r+	c #665C54",
++"s+	c #040303",
++"t+	c #0B0904",
++"u+	c #71613A",
++"v+	c #242018",
++"w+	c #413A35",
++"x+	c #524A43",
++"y+	c #2F2A27",
++"z+	c #999490",
++"A+	c #120F0D",
++"B+	c #030302",
++"C+	c #D1CD7A",
++"D+	c #454025",
++"E+	c #1C1916",
++"F+	c #4A433D",
++"G+	c #86807E",
++"H+	c #60564E",
++"I+	c #3F3732",
++"J+	c #1D1714",
++"K+	c #D6CD7A",
++"L+	c #A69557",
++"M+	c #2A251D",
++"N+	c #352F2B",
++"O+	c #403934",
++"P+	c #84807D",
++"Q+	c #625750",
++"R+	c #3D3531",
++"S+	c #1B1613",
++"T+	c #38311C",
++"U+	c #9B8652",
++"V+	c #84724C",
++"W+	c #292421",
++"X+	c #3C3631",
++"Y+	c #7F7A76",
++"Z+	c #322C28",
++"`+	c #181411",
++" @	c #1C1614",
++".@	c #0F0C0B",
++"+@	c #070604",
++"@@	c #2D281D",
++"#@	c #1D1A17",
++"$@	c #302B28",
++"%@	c #696561",
++"&@	c #544B45",
++"*@	c #433C37",
++"=@	c #5E5240",
++"-@	c #938151",
++";@	c #2F271D",
++">@	c #1D1815",
++",@	c #1C1917",
++"'@	c #36302C",
++")@	c #726D6B",
++"!@	c #554C45",
++"~@	c #6F6349",
++"{@	c #E4D985",
++"]@	c #B9AF67",
++"^@	c #6A5D39",
++"/@	c #31291C",
++"(@	c #221C16",
++"_@	c #1D1B1A",
++":@	c #49423B",
++"<@	c #C2B570",
++"[@	c #F7F49D",
++"}@	c #C4BE71",
++"|@	c #635333",
++"1@	c #493E24",
++"2@	c #1C1710",
++"3@	c #49413B",
++"4@	c #4A4131",
++"5@	c #B6A864",
++"6@	c #C3AC63",
++"7@	c #78673D",
++"8@	c #252012",
++"9@	c #030202",
++"0@	c #2A2419",
++"a@	c #342D1B",
++"b@	c #17130C",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                    .                                           ",
++"                                          . . . . . . . .                                       ",
++"                                        . . . . . . . . .                                       ",
++"                                        . .             .                                       ",
++"                                      . .         + @ # $ % & * = - +   ; > ,                   ",
++"                                  + ' ) ) ! ~ { ] ^ / ( _ : < [ + + + + } | 1 2                 ",
++"          3 4 5 6 7 8 9 0 a + + + b c d e f g h i j k l m + + n o p q r r s t u                 ",
++"      v w x y z A B C D E F G H I J K L M N O P Q R n S T U r r r r r r r V W t                 ",
++"      X Y Z `  ...+. at .#.$.%.&.*.=.-.;.>.+ ,.'.).!.r r r r r r r r r r r r r ~.{.                ",
++"      ].^./.(._.:.<.[.}.|.1.2.3.4.5.6.7.8.9.0.r r r r r r r r r r r r r r r r r                 ",
++"      a.b.c.d.e.f.g.h.}.}.i.j.k.l.m.n.o.p.q.r r r r r r r r r r r r r r r r r                   ",
++"        r.<._.}.f.s.t.}.}.}.u.v.w.x.y.z.p.8.r r r r r r r r r r r r r r r r r                   ",
++"        A.B.C.}.D.E.t.}.}.}.d.F.G.H.z.I.q.r r r r r r r r r r r r r r r r r r                   ",
++"        J.K.L.}.M.N.O.}.}.}.}.P.Q.R.S.T.r r r r r r r r r r r r r r r r r r r                   ",
++"        A.U.}.}.V.W.X.}.}.}.}.A.Y.T.I.r r r r r r r r r r r r r r r r r r r r                   ",
++"        Z._.e.}.`. +.+}.}.}.}._.r 9.q.r r r r r r r r r r r r r r r r r r r r                   ",
++"        i.U.U.}._.++O.}.}.}.}._.r r r r r r r r r r r r r r r r r r r r r r r                   ",
++"        @+#+$+}._.%+&+}.}.}.}._.r r r r r r r r r r r r r r r r r r r r r r r                   ",
++"         +*+$+=+D.-+;+}.}.}.}._.r r r r r r r r r r r r r r r r r r r r r r 9.                  ",
++"        >+K._.,+V.'+)+}.}.}.}._.r r r r r r r r r r r r r r r r r r r r r 0.!+                  ",
++"          ~+~+C.{+]+^+}.}.}.}._.r r r r r r r r r r r r r r r r r r r r r /+(+                  ",
++"          _+:+A.`.<+[+}.}.}.}._.r r r r r r r r r r r r r r r r r r r r }+|+1+                  ",
++"        . 2+3+4+_.5+6+}.}.}.}.7+r r r r r r r r r r r r r r r r r r r r 8+9+0+                  ",
++"          a+:+b+c+d+e+}.}.f+~+7+r r r r r r r r r r r r r r r r r r r V g+h+i+. . .             ",
++"        . j+k+l+m+n+o+}.p+q+r+7+r r r r r r r r r r r r r r r r r r p.s+. t+. . . . . . .       ",
++"          u+v+w+x+y+z+K.d._.d.7+r r r r r r r r r r r r r r r r A+B+. . . . . . . . . . . .     ",
++"          C+D+E+F+W.G+,+H+f.f+I+J+8.r r r r r r r r r r r r A+B+. . . . . . . . . . . . .       ",
++"        . K+L+M+N+O+P+L._.A.Q+R+q.S+9.r r r r r r r r r A+B+. . . . . . . . . . . . .           ",
++"        . T+U+V+W+X+Y+#+f.A.q+Z+z.`+Y. @r r r r r q.. at B+. . . . . . . . . . . . .               ",
++"          . +@@@#@$@%@H+&@*@=@-@;@I.z.Y.>@r r q.. at . . . . . . . . . . . . . .                   ",
++"              . ,@'@)@!@*@~@{@]@^@/@(@q.r q.. at . . . . . . . . . . . . . .                       ",
++"                  . _ at a+:@<@[@}@|@1 at 2@I.. at . . . . . . . . . . . . .                             ",
++"                        3 at 4@5 at 6@7 at 8@9 at . . . . . . . . . . . . .                                 ",
++"                            0 at a@b at . . . . . . . . . .                                           ",
++"                                . . . .                                                         ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                ",
++"                                                                                                "};
++
+ 
+ #define DIR_LIST_WIDTH   180
+ #define DIR_LIST_HEIGHT  180
+@@ -335,10 +2074,15 @@
+ static void gtk_file_selection_delete_file (GtkWidget *widget, gpointer data);
+ static void gtk_file_selection_rename_file (GtkWidget *widget, gpointer data);
+ 
++static void home_clicked (GtkWidget *widget, gpointer data);
++static void desktop_clicked (GtkWidget *widget, gpointer data);
++static void documents_clicked (GtkWidget *widget, gpointer data);
+ 
+ 
+ static GtkWindowClass *parent_class = NULL;
+ 
++static char *last_dir = NULL;
++
+ /* Saves errno when something cmpl does fails. */
+ static gint cmpl_errno;
+ 
+@@ -379,6 +2123,43 @@
+   object_class->destroy = gtk_file_selection_destroy;
+ }
+ 
++static GtkWidget *
++create_pixmap_button (GtkFileSelection *filesel, 
++		      GtkWidget *parent_hbox,
++		      gchar **xpm_data,
++		      gchar *title)
++{
++  GtkWidget *btn;
++  GtkWidget *hbox;
++  GtkWidget *wpixmap;
++  GtkWidget *label;
++  GdkPixmap *pixmap;
++  GdkPixmap *mask;
++  
++  btn = gtk_button_new ();
++  gtk_box_pack_start (GTK_BOX (parent_hbox), btn, TRUE, FALSE, 5);
++  gtk_widget_realize (btn);
++
++  pixmap = gdk_pixmap_create_from_xpm_d (btn->window, &mask, 
++					 &btn->style->bg[GTK_STATE_NORMAL], 
++					 (gchar**)xpm_data);
++  
++  label = gtk_label_new (title);
++  
++  wpixmap = gtk_pixmap_new (pixmap, mask);
++  
++  hbox = gtk_vbox_new (FALSE, 5);
++
++  gtk_box_pack_start (GTK_BOX (hbox), wpixmap, FALSE, FALSE, 0);
++  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
++
++  gtk_widget_show_all (hbox);
++
++  gtk_container_add (GTK_CONTAINER (btn), hbox);
++
++  return btn;
++}
++
+ static void
+ gtk_file_selection_init (GtkFileSelection *filesel)
+ {
+@@ -388,7 +2169,10 @@
+   GtkWidget *confirm_area;
+   GtkWidget *pulldown_hbox;
+   GtkWidget *scrolled_win;
++  GtkWidget *navigation_area;
++  GtkWidget *btn;
+ 
++  char *dirname;
+   char *dir_title [2];
+   char *file_title [2];
+   
+@@ -400,16 +2184,6 @@
+   gtk_container_add (GTK_CONTAINER (filesel), filesel->main_vbox);
+   gtk_widget_show (filesel->main_vbox);
+ 
+-  /* The horizontal box containing create, rename etc. buttons */
+-  filesel->button_area = gtk_hbutton_box_new ();
+-  gtk_button_box_set_layout(GTK_BUTTON_BOX(filesel->button_area), GTK_BUTTONBOX_START);
+-  gtk_button_box_set_spacing(GTK_BUTTON_BOX(filesel->button_area), 0);
+-  gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area, 
+-		      FALSE, FALSE, 0);
+-  gtk_widget_show (filesel->button_area);
+-  
+-  gtk_file_selection_show_fileop_buttons(filesel);
+-
+   /* hbox for pulldown menu */
+   pulldown_hbox = gtk_hbox_new (TRUE, 5);
+   gtk_box_pack_start (GTK_BOX (filesel->main_vbox), pulldown_hbox, FALSE, FALSE, 0);
+@@ -419,13 +2193,56 @@
+   filesel->history_pulldown = gtk_option_menu_new ();
+   gtk_widget_show (filesel->history_pulldown);
+   gtk_box_pack_start (GTK_BOX (pulldown_hbox), filesel->history_pulldown, 
+-		      FALSE, FALSE, 0);
++		      TRUE, FALSE, 0);
+     
+   /*  The horizontal box containing the directory and file listboxes  */
+   list_hbox = gtk_hbox_new (FALSE, 5);
+   gtk_box_pack_start (GTK_BOX (filesel->main_vbox), list_hbox, TRUE, TRUE, 0);
+   gtk_widget_show (list_hbox);
+ 
++  /* The navigation buttons */
++  navigation_area = gtk_vbox_new (TRUE, 0);
++  gtk_box_pack_start (GTK_BOX (list_hbox), navigation_area, FALSE, FALSE, 5);
++  gtk_widget_show (navigation_area);
++
++  if (g_get_home_dir () != NULL) 
++    {
++      struct stat sb;
++      btn = create_pixmap_button (filesel, navigation_area, 
++				  (gchar **)home_xpm, 
++				  _("Home"));
++      gtk_widget_show (btn);
++      gtk_signal_connect (GTK_OBJECT (btn), "clicked",
++			  home_clicked, filesel);
++
++      dirname = g_strdup_printf ("%s/.gnome-desktop/", g_get_home_dir ());
++      if (stat (dirname, &sb) == 0 && S_ISDIR(sb.st_mode))
++	{
++	  btn = create_pixmap_button (filesel, navigation_area, 
++				      (gchar **)desktop_xpm, 
++				      _("Desktop"));
++	  gtk_widget_show (btn);
++	  gtk_signal_connect (GTK_OBJECT (btn), "clicked",
++			      desktop_clicked, filesel);
++
++	  
++	}
++      g_free (dirname);
++      
++      dirname = g_strdup_printf ("%s/Documents/", g_get_home_dir ());
++      if (stat (dirname, &sb) == 0 && S_ISDIR(sb.st_mode))
++	{
++	  btn = create_pixmap_button (filesel, navigation_area, 
++				      (gchar **)documents_xpm, 
++				      _("Documents"));
++	  gtk_widget_show (btn);
++	  gtk_signal_connect (GTK_OBJECT (btn), "clicked",
++			      documents_clicked, filesel);
++	}
++      
++      g_free (dirname);
++    }
++
+   /* The directories clist */
+   dir_title[0] = _("Directories");
+   dir_title[1] = NULL;
+@@ -464,6 +2281,16 @@
+   gtk_widget_show (filesel->file_list);
+   gtk_widget_show (scrolled_win);
+ 
++  /* The horizontal box containing create, rename etc. buttons */
++  filesel->button_area = gtk_hbutton_box_new ();
++  gtk_button_box_set_layout(GTK_BUTTON_BOX(filesel->button_area), GTK_BUTTONBOX_END);
++  gtk_button_box_set_spacing(GTK_BUTTON_BOX(filesel->button_area), 0);
++  gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area, 
++		      FALSE, FALSE, 0);
++  gtk_widget_show (filesel->button_area);
++  
++  gtk_file_selection_show_fileop_buttons(filesel);
++
+   /* action area for packing buttons into. */
+   filesel->action_area = gtk_hbox_new (TRUE, 0);
+   gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area, 
+@@ -510,6 +2337,7 @@
+                              (GtkSignalFunc) gtk_button_clicked,
+                              GTK_OBJECT (filesel->ok_button));
+   gtk_box_pack_start (GTK_BOX (entry_vbox), filesel->selection_entry, TRUE, TRUE, 0);
++  gtk_object_set_data (GTK_OBJECT (filesel->selection_entry), "last_entry_was_dir_selection", (gpointer) FALSE);
+   gtk_widget_show (filesel->selection_entry);
+ 
+   if (!cmpl_state_okay (filesel->cmpl_state))
+@@ -522,7 +2350,14 @@
+     }
+   else
+     {
+-      gtk_file_selection_populate (filesel, "", FALSE);
++      if (last_dir) 
++	{
++	  gtk_file_selection_populate (filesel, last_dir, FALSE);
++	}
++      else
++	{
++	  gtk_file_selection_populate (filesel, "", FALSE);
++	}
+     }
+ 
+   gtk_widget_grab_focus (filesel->selection_entry);
+@@ -1094,6 +2929,41 @@
+ }
+ 
+ 
++static void
++home_clicked (GtkWidget *widget, gpointer data)
++{
++  char *dir;
++  
++  dir = g_strdup_printf ("%s/", g_get_home_dir());
++  
++  gtk_file_selection_populate (GTK_FILE_SELECTION (data), 
++			       dir, FALSE);
++  g_free (dir);
++}
++
++static void
++desktop_clicked (GtkWidget *widget, gpointer data)
++{
++  char *dir;
++  
++  dir = g_strdup_printf ("%s/.gnome-desktop/", g_get_home_dir ());
++  
++  gtk_file_selection_populate (GTK_FILE_SELECTION (data), 
++			       dir, FALSE);
++  g_free (dir);
++}
++
++static void 
++documents_clicked (GtkWidget *widget, gpointer data)
++{
++  char *dir;
++  dir = g_strdup_printf ("%s/Documents/", g_get_home_dir ());
++  
++  gtk_file_selection_populate (GTK_FILE_SELECTION (data), dir, FALSE);
++  
++  g_free (dir);
++}
++
+ static gint
+ gtk_file_selection_key_press (GtkWidget   *widget,
+ 			      GdkEventKey *event,
+@@ -1105,9 +2975,11 @@
+   g_return_val_if_fail (widget != NULL, FALSE);
+   g_return_val_if_fail (event != NULL, FALSE);
+ 
++  fs = GTK_FILE_SELECTION (user_data);
++  gtk_object_set_data (GTK_OBJECT (fs->selection_entry), "last_entry_was_dir_selection", (gpointer) FALSE);
++
+   if (event->keyval == GDK_Tab)
+     {
+-      fs = GTK_FILE_SELECTION (user_data);
+       text = gtk_entry_get_text (GTK_ENTRY (fs->selection_entry));
+ 
+       text = g_strdup (text);
+@@ -1246,7 +3118,8 @@
+ 
+   if (filename)
+     {
+-      if (bevent)
++      gtk_object_set_data (GTK_OBJECT (fs->selection_entry), "last_entry_was_dir_selection", (gpointer) FALSE);
++			if (bevent)
+ 	switch (bevent->type)
+ 	  {
+ 	  case GDK_2BUTTON_PRESS:
+@@ -1273,6 +3146,8 @@
+ {
+   GtkFileSelection *fs = NULL;
+   gchar *filename, *temp = NULL;
++  const gchar *entry_text;
++  gboolean last_entry_was_dir_selection;
+ 
+   g_return_if_fail (GTK_IS_CLIST (widget));
+ 
+@@ -1283,6 +3158,10 @@
+   gtk_clist_get_text (GTK_CLIST (fs->dir_list), row, 0, &temp);
+   filename = g_strdup (temp);
+ 
++  entry_text = gtk_entry_get_text (GTK_ENTRY (fs->selection_entry));
++  last_entry_was_dir_selection = (gboolean) gtk_object_get_data (GTK_OBJECT (fs->selection_entry),
++								 "last_entry_was_dir_selection");
++
+   if (filename)
+     {
+       if (bevent)
+@@ -1293,14 +3172,24 @@
+ 	    break;
+ 	  
+ 	  default:
+-	    gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), filename);
++	    if (!entry_text || !strlen (entry_text) || last_entry_was_dir_selection)
++	      {
++		gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), filename);
++		last_entry_was_dir_selection = TRUE;
++	      }
+ 	    break;
+ 	  }
+-      else
+-	gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), filename);
++      else if (!entry_text || !strlen (entry_text) || last_entry_was_dir_selection)
++	  {
++	    gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), filename);
++	    last_entry_was_dir_selection = TRUE;
++	  }
+ 
+       g_free (filename);
+     }
++
++  gtk_object_set_data (GTK_OBJECT (fs->selection_entry), "last_entry_was_dir_selection",
++		       (gpointer) last_entry_was_dir_selection);
+ }
+ 
+ static void
+@@ -1443,12 +3332,19 @@
+     }
+   else
+     {
+-      if (fs->selection_entry)
++      gboolean last_entry_was_dir_selection;
++
++      last_entry_was_dir_selection = (gboolean) gtk_object_get_data (GTK_OBJECT (fs->selection_entry),
++								     "last_entry_was_dir_selection");
++
++      if (fs->selection_entry && last_entry_was_dir_selection)
+ 	gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), "");
+     }
+ 
+   if (!did_recurse)
+     {
++      char *dirname;
++      struct stat ent_sbuf;
+       if (fs->selection_entry)
+ 	gtk_entry_set_position (GTK_ENTRY (fs->selection_entry), selection_index);
+ 
+@@ -1466,7 +3362,19 @@
+ 	{
+ 	  gtk_file_selection_update_history_menu (fs, cmpl_reference_position (cmpl_state));
+ 	}
+-      
++
++      dirname = cmpl_reference_position (cmpl_state);
++      if(dirname && stat(dirname, &ent_sbuf) >= 0 && S_ISDIR(ent_sbuf.st_mode))
++        {
++          if (last_dir) 
++            {
++              g_free (last_dir);
++            }
++
++
++          
++          last_dir = g_strdup_printf ("%s%c", dirname, G_DIR_SEPARATOR);
++        }
+     }
+ }
+ 
+diff -Naur gtk+-1.2.10.orig/gtk/gtklabel.c gtk+-1.2.10/gtk/gtklabel.c
+--- gtk+-1.2.10.orig/gtk/gtklabel.c	2001-04-01 20:12:38.000000000 -0700
++++ gtk+-1.2.10/gtk/gtklabel.c	2006-07-06 20:28:57.717201905 -0700
+@@ -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);
+diff -Naur gtk+-1.2.10.orig/gtk/gtklist.c gtk+-1.2.10/gtk/gtklist.c
+--- gtk+-1.2.10.orig/gtk/gtklist.c	2001-01-31 13:19:29.000000000 -0800
++++ gtk+-1.2.10/gtk/gtklist.c	2006-07-06 20:28:57.721201801 -0700
+@@ -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)
+diff -Naur gtk+-1.2.10.orig/gtk/gtkmenu.h gtk+-1.2.10/gtk/gtkmenu.h
+--- gtk+-1.2.10.orig/gtk/gtkmenu.h	2000-10-21 11:22:22.000000000 -0700
++++ gtk+-1.2.10/gtk/gtkmenu.h	2006-07-06 20:28:57.721201801 -0700
+@@ -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__
+diff -Naur gtk+-1.2.10.orig/gtk/gtkmenubar.c gtk+-1.2.10/gtk/gtkmenubar.c
+--- gtk+-1.2.10.orig/gtk/gtkmenubar.c	2000-10-21 11:22:22.000000000 -0700
++++ gtk+-1.2.10/gtk/gtkmenubar.c	2006-07-06 20:28:57.721201801 -0700
+@@ -217,6 +217,8 @@
+   GList *children;
+   gint nchildren;
+   GtkRequisition child_requisition;
++  gint xthickness;
++  gint ythickness;
+ 
+   g_return_if_fail (widget != NULL);
+   g_return_if_fail (GTK_IS_MENU_BAR (widget));
+@@ -256,12 +258,21 @@
+ 	    }
+ 	}
+ 
++      if (menu_bar->shadow_type == GTK_SHADOW_NONE)
++	{
++	  xthickness = 0;
++	  ythickness = 0;
++	}
++      else
++	{
++	  xthickness = widget->style->klass->xthickness;
++	  ythickness = widget->style->klass->ythickness;
++	}
++      
+       requisition->width += (GTK_CONTAINER (menu_bar)->border_width +
+-			     widget->style->klass->xthickness +
+-			     BORDER_SPACING) * 2;
++			     xthickness + BORDER_SPACING) * 2;
+       requisition->height += (GTK_CONTAINER (menu_bar)->border_width +
+-			      widget->style->klass->ythickness +
+-			      BORDER_SPACING) * 2;
++			      ythickness + BORDER_SPACING) * 2;
+ 
+       if (nchildren > 0)
+ 	requisition->width += 2 * CHILD_SPACING * (nchildren - 1);
+@@ -279,6 +290,8 @@
+   GtkAllocation child_allocation;
+   GtkRequisition child_requisition;
+   guint offset;
++  gint xthickness;
++  gint ythickness;
+   
+   g_return_if_fail (widget != NULL);
+   g_return_if_fail (GTK_IS_MENU_BAR (widget));
+@@ -295,14 +308,23 @@
+ 
+   if (menu_shell->children)
+     {
++      if (menu_bar->shadow_type == GTK_SHADOW_NONE)
++	{
++	  xthickness = 0;
++	  ythickness = 0;
++	}
++      else
++	{
++	  xthickness = widget->style->klass->xthickness;
++	  ythickness = widget->style->klass->ythickness;
++	}
++
+       child_allocation.x = (GTK_CONTAINER (menu_bar)->border_width +
+-			    widget->style->klass->xthickness +
+-			    BORDER_SPACING);
++			    xthickness + BORDER_SPACING);
+       offset = child_allocation.x; 	/* Window edge to menubar start */
+ 
+       child_allocation.y = (GTK_CONTAINER (menu_bar)->border_width +
+-			    widget->style->klass->ythickness +
+-			    BORDER_SPACING);
++			    ythickness + BORDER_SPACING);
+       child_allocation.height = MAX (1, (gint)allocation->height - child_allocation.y * 2);
+ 
+       children = menu_shell->children;
+diff -Naur gtk+-1.2.10.orig/gtk/gtkmenuitem.c gtk+-1.2.10/gtk/gtkmenuitem.c
+--- gtk+-1.2.10.orig/gtk/gtkmenuitem.c	2001-01-29 16:44:02.000000000 -0800
++++ gtk+-1.2.10/gtk/gtkmenuitem.c	2006-07-06 20:28:57.721201801 -0700
+@@ -34,7 +34,7 @@
+ 
+ 
+ #define BORDER_SPACING  3
+-#define SELECT_TIMEOUT  75
++#define SELECT_TIMEOUT  150
+ 
+ #define MENU_ITEM_CLASS(w)  GTK_MENU_ITEM_CLASS (GTK_OBJECT (w)->klass)
+ 
+diff -Naur gtk+-1.2.10.orig/gtk/gtkoptionmenu.c gtk+-1.2.10/gtk/gtkoptionmenu.c
+--- gtk+-1.2.10.orig/gtk/gtkoptionmenu.c	2001-02-12 12:36:37.000000000 -0800
++++ gtk+-1.2.10/gtk/gtkoptionmenu.c	2006-07-06 20:28:57.725201697 -0700
+@@ -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
+diff -Naur gtk+-1.2.10.orig/gtk/gtkrange.c gtk+-1.2.10/gtk/gtkrange.c
+--- gtk+-1.2.10.orig/gtk/gtkrange.c	2001-02-19 17:14:13.000000000 -0800
++++ gtk+-1.2.10/gtk/gtkrange.c	2006-07-06 20:28:57.725201697 -0700
+@@ -161,8 +161,8 @@
+   widget_class->focus_out_event = gtk_range_focus_out;
+   widget_class->style_set = gtk_range_style_set;
+ 
+-  class->slider_width = 11;
+-  class->stepper_size = 11;
++  class->slider_width = 13;
++  class->stepper_size = 13;
+   class->stepper_slider_spacing = 1;
+   class->min_slider_size = 7;
+   class->trough = 1;
 diff -Naur gtk+-1.2.10.orig/gtk/gtkrc.c gtk+-1.2.10/gtk/gtkrc.c
 --- gtk+-1.2.10.orig/gtk/gtkrc.c	2001-03-15 10:41:40.000000000 -0800
-+++ gtk+-1.2.10/gtk/gtkrc.c	2006-07-06 18:36:29.899294709 -0700
-@@ -451,7 +451,7 @@
++++ gtk+-1.2.10/gtk/gtkrc.c	2006-07-06 20:30:01.227547982 -0700
+@@ -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,9 +453,7 @@
+ 
+   if (!initted)
      {
-       gint length;
-       
+-      gint length;
+-      
 -      char *locale = setlocale (LC_CTYPE, NULL);
 +      char *locale = g_strdup (setlocale (LC_CTYPE, NULL));
        char *p;
        
        initted = TRUE;
-@@ -585,6 +585,7 @@
+@@ -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);
+ 
+-	  g_free (normalized_locale);
++	  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 );
++
++	  if (tmp) g_free (tmp);
+ 	}
+     }
+   
+@@ -585,6 +640,7 @@
  	  rc_file->canonical_name = str->str;
  	  g_string_free (str, FALSE);
  	}
@@ -25,9 +2917,112 @@
      }
  
    if (!lstat (rc_file->canonical_name, &statbuf))
+diff -Naur gtk+-1.2.10.orig/gtk/gtkstyle.c gtk+-1.2.10/gtk/gtkstyle.c
+--- gtk+-1.2.10.orig/gtk/gtkstyle.c	2001-02-20 08:46:58.000000000 -0800
++++ gtk+-1.2.10/gtk/gtkstyle.c	2006-07-06 20:28:57.729201592 -0700
+@@ -2255,8 +2255,7 @@
+   else if (height == -1)
+     gdk_window_get_size (window, NULL, &height);
+   
+-  if (!style->bg_pixmap[state_type] || 
+-      gdk_window_get_type (window) == GDK_WINDOW_PIXMAP)
++  if (!style->bg_pixmap[state_type])
+     {
+       if (area)
+ 	gdk_gc_set_clip_rectangle (style->bg_gc[state_type], area);
+@@ -2327,8 +2326,7 @@
+   else
+     gc1 = style->bg_gc[state_type];
+   
+-  if (!style->bg_pixmap[state_type] || gc1 != style->bg_gc[state_type] ||
+-      gdk_window_get_type (window) == GDK_WINDOW_PIXMAP)
++  if (!style->bg_pixmap[state_type] || gc1 != style->bg_gc[state_type])
+     {
+       if (area)
+ 	gdk_gc_set_clip_rectangle (gc1, area);
+diff -Naur gtk+-1.2.10.orig/gtk/gtktypeutils.h gtk+-1.2.10/gtk/gtktypeutils.h
+--- gtk+-1.2.10.orig/gtk/gtktypeutils.h	2000-08-18 14:36:34.000000000 -0700
++++ gtk+-1.2.10/gtk/gtktypeutils.h	2006-07-06 20:28:57.729201592 -0700
+@@ -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
+diff -Naur gtk+-1.2.10.orig/gtk/gtkwindow.c gtk+-1.2.10/gtk/gtkwindow.c
+--- gtk+-1.2.10.orig/gtk/gtkwindow.c	2001-03-09 15:39:16.000000000 -0800
++++ gtk+-1.2.10/gtk/gtkwindow.c	2006-07-06 20:28:57.733201488 -0700
+@@ -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;
+diff -Naur gtk+-1.2.10.orig/gtk/testdnd.c gtk+-1.2.10/gtk/testdnd.c
+--- gtk+-1.2.10.orig/gtk/testdnd.c	1999-04-06 11:50:38.000000000 -0700
++++ gtk+-1.2.10/gtk/testdnd.c	2006-07-06 20:28:57.733201488 -0700
+@@ -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,11 +329,20 @@
+ 			    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)
+     {
+       gtk_drag_get_data (widget, context, 
 diff -Naur gtk+-1.2.10.orig/gtk.m4 gtk+-1.2.10/gtk.m4
 --- gtk+-1.2.10.orig/gtk.m4	1999-02-18 08:43:35.000000000 -0800
-+++ gtk+-1.2.10/gtk.m4	2006-07-06 18:37:08.134294021 -0700
++++ gtk+-1.2.10/gtk.m4	2006-07-06 20:29:04.781017941 -0700
 @@ -4,7 +4,7 @@
  dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
  dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
@@ -37,3 +3032,1325 @@
  [dnl 
  dnl Get the cflags and libraries from the gtk-config script
  dnl
+diff -Naur gtk+-1.2.10.orig/po/ChangeLog gtk+-1.2.10/po/ChangeLog
+--- gtk+-1.2.10.orig/po/ChangeLog	2001-03-27 12:12:43.000000000 -0800
++++ gtk+-1.2.10/po/ChangeLog	2006-07-06 20:28:57.733201488 -0700
+@@ -1,3 +1,30 @@
++2001-08-14  Abel Cheung  <maddog at 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 at gnome.pl>
++          
++	* pl.po: Updated Polish translation.
++
++2001-08-01  Peteris Krisjanis  <peterisk at apollo.lv>
++
++	* lv.po: Added Latvian translation.
++
++2001-07-24  Darin Adler  <darin at bentspoon.com>
++
++	* ta.po: Placeholder empty Tamil translation to make
++	things build until the real translation is committed.
++
++2001-07-18  Zbigniew Chyla  <cyba at gnome.pl>
++          
++	* pl.po: Updated Polish translation.
++
++2001-06-26  Fatih Demir <kabalak at gtranslator.org>
++
++	* ta.po: Added Tamil translation by Dinesh.
++
+ 2001-03-27  Ole Laursen  <olau at hardworking.dk>
+ 
+ 	* da.po: Updated and fixed some issues in the Danish translation.
+diff -Naur gtk+-1.2.10.orig/po/ko.po gtk+-1.2.10/po/ko.po
+--- gtk+-1.2.10.orig/po/ko.po	2001-04-01 20:14:09.000000000 -0700
++++ gtk+-1.2.10/po/ko.po	2006-07-06 20:28:57.733201488 -0700
+@@ -3,10 +3,10 @@
+ # Sung-Hyun Nam <namsh at 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 at 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 at kldp.org>\n"
+ "Language-Team: Korean <ko at li.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=euc-kr\n"
+diff -Naur gtk+-1.2.10.orig/po/pl.po gtk+-1.2.10/po/pl.po
+--- gtk+-1.2.10.orig/po/pl.po	2001-04-01 20:14:09.000000000 -0700
++++ gtk+-1.2.10/po/pl.po	2006-07-06 20:28:57.733201488 -0700
+@@ -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 at 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 at 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 at 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 at gnome.pl>\n"
++"Language-Team: Polish <pl at 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 ---"
+diff -Naur gtk+-1.2.10.orig/po/sl.po gtk+-1.2.10/po/sl.po
+--- gtk+-1.2.10.orig/po/sl.po	2001-04-01 20:14:09.000000000 -0700
++++ gtk+-1.2.10/po/sl.po	2006-07-06 20:28:57.737201384 -0700
+@@ -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 at guest.arnes.si>\n"
+ "Language-Team: slovenian <sl at 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\""
+diff -Naur gtk+-1.2.10.orig/po/zh_CN.GB2312.po gtk+-1.2.10/po/zh_CN.GB2312.po
+--- gtk+-1.2.10.orig/po/zh_CN.GB2312.po	2001-04-01 20:14:09.000000000 -0700
++++ gtk+-1.2.10/po/zh_CN.GB2312.po	2006-07-06 20:28:57.737201384 -0700
+@@ -1,8 +1,12 @@
++# simplified Chinese translation for gtk+
++# Copyright (C) 1999-2001 Free Software Foundation, Inc.
++# Wu Yulun <migr at 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 at operamail.com>\n"
+ "Language-Team: Chinese <zh at 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"
+diff -Naur gtk+-1.2.10.orig/po/zh_TW.Big5.po gtk+-1.2.10/po/zh_TW.Big5.po
+--- gtk+-1.2.10.orig/po/zh_TW.Big5.po	2001-04-01 20:14:09.000000000 -0700
++++ gtk+-1.2.10/po/zh_TW.Big5.po	2006-07-06 20:28:57.737201384 -0700
+@@ -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 at 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 at med.cgu.edu.tw>\n"
+-"Language-Team: Chinese <zh at 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 at linux.org.hk>\n"
++"Language-Team: traditional Chinese <zh-l10n at 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´£¥Ü ---"




More information about the patches mailing list