Index: client/gui-gtk/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/dialogs.c,v
retrieving revision 1.78
diff -u -r1.78 dialogs.c
--- client/gui-gtk/dialogs.c	2001/09/15 15:31:20	1.78
+++ client/gui-gtk/dialogs.c	2001/10/15 23:44:58
@@ -1947,7 +1947,7 @@
   for(i=0; i<g_list_length(sorted_races_list); i++) {
     gint nat_id=GPOINTER_TO_INT(g_list_nth_data(sorted_races_list,i));
     races_toggles[i]=gtk_radio_button_new_with_label(group,
-						     get_nation_name(nat_id));
+						     get_nation_name_plural(nat_id));
     gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(races_toggles[i]), FALSE);
     group = gtk_radio_button_group( GTK_RADIO_BUTTON( races_toggles[i] ) );
     gtk_table_attach_defaults(GTK_TABLE(races_toggles_form),races_toggles[i],
Index: client/gui-mui/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-mui/dialogs.c,v
retrieving revision 1.33
diff -u -r1.33 dialogs.c
--- client/gui-mui/dialogs.c	2001/09/15 15:31:21	1.33
+++ client/gui-mui/dialogs.c	2001/10/15 23:44:59
@@ -1781,7 +1781,7 @@
     {
       DoMethod(nations_nation_listview, MUIM_List_Clear);
       for(i=0;i<game.playable_nation_count && i<64;i++)
-	DoMethod(nations_nation_listview, MUIM_List_InsertSingle, get_nation_name(i), MUIV_List_Insert_Sorted);
+	DoMethod(nations_nation_listview, MUIM_List_InsertSingle, get_nation_name_plural(i), MUIV_List_Insert_Sorted);
 
       DoMethod(nations_nation_listview, MUIM_Notify, MUIA_List_Active, MUIV_EveryTime, app, 3, MUIM_CallHook, &civstandard_hook, nations_nation_active);
       DoMethod(nations_ok_button, MUIM_Notify, MUIA_Pressed, FALSE, app, 3, MUIM_CallHook, &civstandard_hook, nations_ok);
Index: client/gui-win32/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/dialogs.c,v
retrieving revision 1.4
diff -u -r1.4 dialogs.c
--- client/gui-win32/dialogs.c	2001/09/15 15:31:22	1.4
+++ client/gui-win32/dialogs.c	2001/10/15 23:45:01
@@ -432,7 +432,7 @@
       i=0;
     id=(int)ITERATOR_PTR(myiter);
     fcwin_box_add_radiobutton(vboxes[i],
-			      get_nation_name(id-ID_RACESDLG_NATION_BASE),
+			      get_nation_name_plural(id-ID_RACESDLG_NATION_BASE),
 			      id,0,FALSE,FALSE,0);			      
   }
   genlist_unlink_all(&nation_list);
Index: client/gui-xaw/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/dialogs.c,v
retrieving revision 1.57
diff -u -r1.57 dialogs.c
--- client/gui-xaw/dialogs.c	2001/09/15 15:31:23	1.57
+++ client/gui-xaw/dialogs.c	2001/10/15 23:45:03
@@ -1806,7 +1806,7 @@
 
   maxracelen = 0;
   for(i=0; i<game.playable_nation_count; i++) {
-    len = strlen(get_nation_name(i));
+    len = strlen(get_nation_name_plural(i));
     maxracelen = MAX(maxracelen, len);
   }
   maxracelen = MIN(maxracelen, MAX_LEN_NAME-1);
@@ -2075,7 +2075,7 @@
   qsort(races_toggles_to_nations, i, sizeof(int), races_indirect_compare);
   for(i=0; i<game.playable_nation_count; i++) {
     XtVaSetValues (races_toggles[i],
-		   XtNlabel, (XtArgVal)get_nation_name(races_toggles_to_nations[i]),
+		   XtNlabel, (XtArgVal)get_nation_name_plural(races_toggles_to_nations[i]),
 		   NULL);
   }