GMC i18n fix



Here's a small patch to fix a major GMC i18n problem.
(yes, I know it's going to die, but this is urgent)

Any objections?

-- 
Robert Brady
robert suse co uk
Index: po/POTFILES.in
===================================================================
RCS file: /cvs/gnome/mc/po/POTFILES.in,v
retrieving revision 1.34
diff -u -r1.34 POTFILES.in
--- po/POTFILES.in	2000/09/23 01:48:48	1.34
+++ po/POTFILES.in	2000/10/31 22:29:54
@@ -4,12 +4,14 @@
 gnome/gcustom-layout.c
 gnome/gdesktop.c
 gnome/gdesktop-prefs.c
+gnome/gdesktop-icon.c
 gnome/gdesktop-init.c
 gnome/gdialogs.c
 gnome/gdnd.c
 gnome/gicon.c
 gnome/glayout.c
 gnome/gmain.c
+gnome/gmc-chargrid.c
 gnome/gmc-window.c
 gnome/gmount.c
 gnome/gnome-file-property-dialog.c
Index: gnome/gdesktop-icon.c
===================================================================
RCS file: /cvs/gnome/mc/gnome/gdesktop-icon.c,v
retrieving revision 1.33
diff -u -r1.33 gdesktop-icon.c
--- gnome/gdesktop-icon.c	2000/01/25 10:31:00	1.33
+++ gnome/gdesktop-icon.c	2000/10/31 22:29:55
@@ -15,6 +15,16 @@
 #include "gdesktop-icon.h"
 #include "dir.h"
 
+#if 0
+static const char *i18n_dummy = 
+_("-*-helvetica-medium-r-normal--10-*-*-*-p-*-*-*," \
+  "-*-*-medium-r-normal-*-10-*-*-*-*-*-*-*,*");
+
+static const char *i18n_dummy_2 = 
+_("-*-helvetica-medium-r-normal--10-*-*-*-p-*-*-*," \
+  "-*-*-bold-r-normal-*-10-*-*-*-*-*-*-*,*");
+#endif
+
 
 /* Spacing between icon and text */
 #define SPACING 2
Index: gnome/gdesktop-icon.h
===================================================================
RCS file: /cvs/gnome/mc/gnome/gdesktop-icon.h,v
retrieving revision 1.10
diff -u -r1.10 gdesktop-icon.h
--- gnome/gdesktop-icon.h	2000/04/05 03:23:40	1.10
+++ gnome/gdesktop-icon.h	2000/10/31 22:29:56
@@ -17,14 +17,13 @@
 
 
 #if OLD_DESKTOP_FONT
-#define DESKTOP_ICON_FONT "-*-helvetica-medium-r-normal--10-*-*-*-p-*-*-*," \
-			"-*-*-medium-r-normal-*-10-*-*-*-*-*-*-*,*"
+#define DESKTOP_ICON_FONT _("-*-helvetica-medium-r-normal--10-*-*-*-p-*-*-*," \
+			"-*-*-medium-r-normal-*-10-*-*-*-*-*-*-*,*")
 #else
 #define DESKTOP_ICON_FONT \
-     "-*-helvetica-bold-r-normal--10-*-*-*-p-*-*-*," \
-     "-*-*-bold-r-normal-*-10-*-*-*-*-*-*-*,*"
+     _("-*-helvetica-bold-r-normal--10-*-*-*-p-*-*-*," \
+     "-*-*-bold-r-normal-*-10-*-*-*-*-*-*-*,*")
 #endif
-
 
 #define TYPE_DESKTOP_ICON            (desktop_icon_get_type ())
 #define DESKTOP_ICON(obj)            (GTK_CHECK_CAST ((obj), TYPE_DESKTOP_ICON, DesktopIcon))
Index: gnome/gmc-chargrid.c
===================================================================
RCS file: /cvs/gnome/mc/gnome/gmc-chargrid.c,v
retrieving revision 1.9
diff -u -r1.9 gmc-chargrid.c
--- gnome/gmc-chargrid.c	1999/06/24 21:53:42	1.9
+++ gnome/gmc-chargrid.c	2000/10/31 22:29:57
@@ -12,8 +12,11 @@
 
 #define DEFAULT_WIDTH  80
 #define DEFAULT_HEIGHT 25
-#define DEFAULT_FONT   "fixed,-*-*-medium-r-normal-*-12-*-*-*-*-*-*-*,*"
+#define DEFAULT_FONT   _("fixed,-*-*-medium-r-normal-*-12-*-*-*-*-*-*-*,*")
 
+#if 0
+static char *something = N_("fixed,-*-*-medium-r-normal-*-12-*-*-*-*-*-*-*,*");
+#endif
 
 #define CHARS(cgrid) ((char *) cgrid->chars)
 #define ATTRS(cgrid) ((struct attr *) cgrid->attrs)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]