diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/ai/aicity.c freeciv/ai/aicity.c
--- FreecivCVS/ai/aicity.c	Wed May 24 15:13:21 2000
+++ freeciv/ai/aicity.c	Thu Jun 15 12:12:58 2000
@@ -354,7 +354,7 @@
             if (cost < pplayer->economic.gold) { /* let's just upgrade */
               pplayer->economic.gold -= cost;
               notify_player(pplayer,
-			    _("Game: %s upgraded to %s in %s for %d credits."),
+			    _("Game: %s upgraded to %s in %s for %d gold."),
 			    unit_types[punit->type].name, unit_types[id].name,
 			    pcity->name, cost);
 	      upgrade_unit(punit, id);
@@ -482,7 +482,7 @@
         pplayer->economic.gold -= cost;
 	upgrade_unit(punit, id);
         notify_player(pplayer,
-		      _("Game: %s upgraded to %s in %s for %d credits."),
+		      _("Game: %s upgraded to %s in %s for %d gold."),
 		      unit_types[punit->type].name, unit_types[id].name,
 		      pcity->name, cost);
         send_player_info(pplayer, pplayer);
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/server/cityhand.c freeciv/server/cityhand.c
--- FreecivCVS/server/cityhand.c	Mon Jun 12 10:07:35 2000
+++ freeciv/server/cityhand.c	Thu Jun 15 12:13:25 2000
@@ -406,7 +406,7 @@
 
   pcity->did_sell=1;
   notify_player_ex(pplayer, pcity->x, pcity->y, E_IMP_SOLD,
-		   _("Game: You sell %s in %s for %d credits."), 
+		   _("Game: You sell %s in %s for %d gold."), 
 		   get_improvement_name(id), pcity->name,
 		   improvement_value(id));
   do_sell_building(pplayer, pcity, id);
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/server/unitfunc.c freeciv/server/unitfunc.c
--- FreecivCVS/server/unitfunc.c	Tue Jun 13 15:07:39 2000
+++ freeciv/server/unitfunc.c	Thu Jun 15 12:13:40 2000
@@ -1962,7 +1962,7 @@
 	    do_sell_building(pplayer, pcity, coastal_improvements[k]);
 	    notify_player_ex(pplayer, x+i, y+j, E_IMP_SOLD,
 			     _("Game: You sell %s in %s (now landlocked)"
-			       " for %d credits."),
+			       " for %d gold."),
 			     get_improvement_name(coastal_improvements[k]),
 			     pcity->name,
 			     improvement_value(coastal_improvements[k]));
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/server/unithand.c freeciv/server/unithand.c
--- FreecivCVS/server/unithand.c	Tue Jun 13 15:07:39 2000
+++ freeciv/server/unithand.c	Thu Jun 15 12:14:06 2000
@@ -135,7 +135,7 @@
   unit_list_iterate_end;
   connection_do_unbuffer(pplayer->conn);
   if (upgraded > 0) {
-    notify_player(pplayer, _("Game: %d %s upgraded to %s for %d credits."), 
+    notify_player(pplayer, _("Game: %d %s upgraded to %s for %d gold."), 
 		  upgraded, unit_types[packet->type].name, 
 		  unit_types[to_unit].name, cost * upgraded);
     send_player_info(pplayer, pplayer);
@@ -177,7 +177,7 @@
   pplayer->economic.gold -= cost;
   upgrade_unit(punit, to_unit);
   send_player_info(pplayer, pplayer);
-  notify_player(pplayer, _("Game: %s upgraded to %s for %d credits."), 
+  notify_player(pplayer, _("Game: %s upgraded to %s for %d gold."), 
 		unit_name(from_unit), unit_name(to_unit), cost);
 }
 
@@ -702,7 +702,7 @@
   case 0:
     cred = 25;
     notify_player_ex(pplayer, punit->x, punit->y, E_NOEVENT, 
-		     _("Game: You found %d credits."), cred);
+		     _("Game: You found %d gold."), cred);
     pplayer->economic.gold += cred;
     break;
   case 1:
@@ -710,13 +710,13 @@
   case 3:
     cred = 50;
     notify_player_ex(pplayer, punit->x, punit->y, E_NOEVENT,
-		     _("Game: You found %d credits."), cred);
+		     _("Game: You found %d gold."), cred);
     pplayer->economic.gold+=50;
     break;
   case 4:
     cred = 100;
     notify_player_ex(pplayer, punit->x, punit->y, E_NOEVENT,
-		     _("Game: You found %d credits."), cred); 
+		     _("Game: You found %d gold."), cred); 
     pplayer->economic.gold += cred;
     break;
   case 5: