diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/civclient.c freeciv/client/civclient.c
--- FreecivCVS/client/civclient.c	Sun Apr 30 16:53:51 2000
+++ freeciv/client/civclient.c	Sat May 20 14:51:30 2000
@@ -154,6 +154,13 @@
     mystrlcpy(name, user_username(), 512);
   }
 
+  /* tell C library which locale */
+#ifdef ENABLE_NLS
+  if (!(setlocale (LC_ALL, ""))) {
+    freelog(LOG_VERBOSE, "Warning: locale not supported by C library.");
+  }
+#endif
+
   init_messages_where();
   init_our_capability();
   game_init();
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/gui-gtk/gui_main.c freeciv/client/gui-gtk/gui_main.c
--- FreecivCVS/client/gui-gtk/gui_main.c	Sun Apr 23 21:19:42 2000
+++ freeciv/client/gui-gtk/gui_main.c	Sat May 20 14:51:59 2000
@@ -564,6 +564,11 @@
 
   parse_options(argc, argv);
 
+  /* tell GTK+ and C library which locale */
+#ifdef ENABLE_NLS
+  gtk_set_locale();
+#endif
+
   /* GTK withdraw gtk options */
   /* Process GTK arguments */
   gtk_init(&argc, &argv);
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/server/civserver.c freeciv/server/civserver.c
--- FreecivCVS/server/civserver.c	Sat May 20 08:53:39 2000
+++ freeciv/server/civserver.c	Sat May 20 14:51:01 2000
@@ -284,6 +284,13 @@
   
   con_flush();
 
+  /* tell C library which locale */
+#ifdef ENABLE_NLS
+  if (!(setlocale (LC_ALL, ""))) {
+    freelog(LOG_VERBOSE, "Warning: locale not supported by C library.");
+  }
+#endif
+
   init_our_capability();
   game_init();