diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/cityrepdata.c freeciv/client/cityrepdata.c
--- FreecivCVS/client/cityrepdata.c	Sat Apr  1 20:08:08 2000
+++ freeciv/client/cityrepdata.c	Tue Oct 10 11:32:33 2000
@@ -65,8 +65,9 @@
 {
   static char buf[16];
   my_snprintf(buf, sizeof(buf), "%s",
-	      (city_celebrating(pcity) ? _("Rapture") :
-	       (city_unhappy(pcity) ? _("Disorder") : _("Peace"))));
+	      (city_celebrating(pcity) ? Q_("?city_state:Rapture") :
+	       (city_unhappy(pcity) ? Q_("?city_state:Disorder") :
+		Q_("?city_state:Peace"))));
   return buf;
 }
 
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/gui-gtk/diplodlg.c freeciv/client/gui-gtk/diplodlg.c
--- FreecivCVS/client/gui-gtk/diplodlg.c	Sun Sep 24 07:38:11 2000
+++ freeciv/client/gui-gtk/diplodlg.c	Tue Oct 10 11:32:33 2000
@@ -443,17 +443,17 @@
 
   pdialog->dip_pact_menu=gtk_menu_new();
 
-  item=gtk_menu_item_new_with_label(_("Cease-fire"));
+  item=gtk_menu_item_new_with_label(Q_("?diplomatic_state:Cease-fire"));
   gtk_menu_append(GTK_MENU(pdialog->dip_pact_menu),item);
   gtk_signal_connect(GTK_OBJECT(item),"activate",
 	GTK_SIGNAL_FUNC(diplomacy_dialog_ceasefire_callback),(gpointer)pdialog);
 
-  item=gtk_menu_item_new_with_label(_("Peace"));
+  item=gtk_menu_item_new_with_label(Q_("?diplomatic_state:Peace"));
   gtk_menu_append(GTK_MENU(pdialog->dip_pact_menu),item);
   gtk_signal_connect(GTK_OBJECT(item),"activate",
 	GTK_SIGNAL_FUNC(diplomacy_dialog_peace_callback),(gpointer)pdialog);
 
-  item=gtk_menu_item_new_with_label(_("Alliance"));
+  item=gtk_menu_item_new_with_label(Q_("?diplomatic_state:Alliance"));
   gtk_menu_append(GTK_MENU(pdialog->dip_pact_menu),item);
   gtk_signal_connect(GTK_OBJECT(item),"activate",
 	GTK_SIGNAL_FUNC(diplomacy_dialog_alliance_callback),(gpointer)pdialog);
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/gui-mui/diplodlg.c freeciv/client/gui-mui/diplodlg.c
--- FreecivCVS/client/gui-mui/diplodlg.c	Sun Sep 24 07:38:11 2000
+++ freeciv/client/gui-mui/diplodlg.c	Tue Oct 10 11:32:33 2000
@@ -629,15 +629,15 @@
     if(menu_strip)
     {
       Object *entry;
-      entry = MUI_MakeObject(MUIO_Menuitem,_("Cease-fire"),NULL,0,0);
+      entry = MUI_MakeObject(MUIO_Menuitem, Q_("?diplomatic_state:Cease-fire"), NULL,0,0);
       DoMethod(entry,MUIM_Notify,MUIA_Menuitem_Trigger, MUIV_EveryTime, entry,4, MUIM_CallHook, &civstandard_hook, diplomacy_ceasefire, pdialog);
       DoMethod(menu_title,MUIM_Family_AddTail, entry);
 
-      entry = MUI_MakeObject(MUIO_Menuitem,_("Peace"),NULL,0,0);
+      entry = MUI_MakeObject(MUIO_Menuitem,Q_("?diplomatic_state:Peace"),NULL,0,0);
       DoMethod(entry,MUIM_Notify,MUIA_Menuitem_Trigger, MUIV_EveryTime, entry,4, MUIM_CallHook, &civstandard_hook, diplomacy_peace, pdialog);
       DoMethod(menu_title,MUIM_Family_AddTail, entry);
 
-      entry = MUI_MakeObject(MUIO_Menuitem,_("Alliance"),NULL,0,0);
+      entry = MUI_MakeObject(MUIO_Menuitem,Q_("?diplomatic_state:Alliance"),NULL,0,0);
       DoMethod(entry,MUIM_Notify,MUIA_Menuitem_Trigger, MUIV_EveryTime, entry,4, MUIM_CallHook, &civstandard_hook, diplomacy_alliance, pdialog);
       DoMethod(menu_title,MUIM_Family_AddTail, entry);
       set(pdialog->plr0_pacts_button,MUIA_ContextMenu, menu_strip);
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/gui-xaw/diplodlg.c freeciv/client/gui-xaw/diplodlg.c
--- FreecivCVS/client/gui-xaw/diplodlg.c	Thu Sep  7 18:55:41 2000
+++ freeciv/client/gui-xaw/diplodlg.c	Tue Oct 10 11:32:33 2000
@@ -513,16 +513,16 @@
 				 simpleMenuWidgetClass, 
 				 pdialog->dip_pact_menubutton, 
 				 NULL);
-  entry=XtVaCreateManagedWidget(_("Cease-fire"), smeBSBObjectClass, popupmenu,
-				NULL);
+  entry=XtVaCreateManagedWidget(Q_("?diplomatic_state:Cease-fire"),
+				smeBSBObjectClass, popupmenu, NULL);
   XtAddCallback(entry, XtNcallback, diplomacy_dialog_ceasefire_callback,
 		(XtPointer)pdialog);
-  entry=XtVaCreateManagedWidget(_("Peace"), smeBSBObjectClass, popupmenu,
-				NULL);
+  entry=XtVaCreateManagedWidget(Q_("?diplomatic_state:Peace"),
+				smeBSBObjectClass, popupmenu, NULL);
   XtAddCallback(entry, XtNcallback, diplomacy_dialog_peace_callback,
 		(XtPointer)pdialog);
-  entry=XtVaCreateManagedWidget(_("Alliance"), smeBSBObjectClass, popupmenu,
-				NULL);
+  entry=XtVaCreateManagedWidget(Q_("?diplomatic_state:Alliance"),
+				smeBSBObjectClass, popupmenu, NULL);
   XtAddCallback(entry, XtNcallback, diplomacy_dialog_alliance_callback,
 		(XtPointer)pdialog);
   
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/common/player.c freeciv/common/player.c
--- FreecivCVS/common/player.c	Tue Sep 12 13:55:04 2000
+++ freeciv/common/player.c	Tue Oct 10 11:43:38 2000
@@ -435,16 +435,16 @@
 {
   static const char *ds_names[DS_LAST] = 
   {
-    N_("Neutral"),
-    N_("War"), 
-    N_("Cease-fire"),
-    N_("Peace"),
-    N_("Alliance"),
-    N_("No Contact")
+    N_("?diplomatic_state:Neutral"),
+    N_("?diplomatic_state:War"), 
+    N_("?diplomatic_state:Cease-fire"),
+    N_("?diplomatic_state:Peace"),
+    N_("?diplomatic_state:Alliance"),
+    N_("?diplomatic_state:No Contact")
   };
 
   if (type < DS_LAST)
-    return _(ds_names[type]);
+    return Q_(ds_names[type]);
   freelog(LOG_FATAL, "Bad diplstate_type in diplstate_text: %d", type);
   abort();
 }