[Freeciv-Dev] (PR#11293) City Management Agent would be more intuitively called "City Governor"

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=11293 >

Here's a patch that renames the CMA/City Management Agent as "Citizen
Governor".  I suppose there may be other types of governor (build
governor) so it's best not to call it just "governor".  However in some
places it is shortened to that.

Surely I've missed some places.  Also I noticed README.cma needs a major
update.  And maybe some strings are too long (Vasco, you should check
this out).  And I may have broken the gtk and/or xaw clients (should be
easy to fix).

Does anyone object to this renaming?

-jason

? fog
? fog.c
? fog.png
? foo
? data/isotrident/grid.png
? data/isotrident/grid.xcf
Index: client/attribute.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/attribute.c,v
retrieving revision 1.20
diff -u -r1.20 attribute.c
--- client/attribute.c  1 Dec 2004 06:58:00 -0000       1.20
+++ client/attribute.c  7 Feb 2005 08:46:59 -0000
@@ -239,7 +239,7 @@
        * value_length (above) is set to a random value, which can also
        * cause a bug. */
       freelog(LOG_ERROR, _("There has been a CMA error.  "
-                          "Your CMA settings may be broken."));
+                          "Your citizen governor settings may be broken."));
       free(pvalue);
       free(pkey);
       hash_delete_all_entries(hash);
Index: client/cityrepdata.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/cityrepdata.c,v
retrieving revision 1.46
diff -u -r1.46 cityrepdata.c
--- client/cityrepdata.c        5 Feb 2005 01:32:10 -0000       1.46
+++ client/cityrepdata.c        7 Feb 2005 08:46:59 -0000
@@ -491,7 +491,7 @@
     NULL, FUNC_TAG(corruption) },
   { FALSE,  3, 1, NULL, N_("?waste:Was"), N_("Waste"),
     NULL, FUNC_TAG(waste) },
-  { TRUE,  15, 1, NULL, N_("CMA"),           N_("City Management Agent"),
+  { TRUE,  15, 1, NULL, N_("Governor"),              N_("Citizen Governor"),
     NULL, FUNC_TAG(cma) },
   { TRUE,   0, 1, N_("Currently Building"), N_("(Stock,Target,Turns,Buy)"),
                                             N_("Currently Building"),
Index: client/options.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/options.c,v
retrieving revision 1.119
diff -u -r1.119 options.c
--- client/options.c    7 Feb 2005 08:09:10 -0000       1.119
+++ client/options.c    7 Feb 2005 08:46:59 -0000
@@ -286,7 +286,7 @@
   GEN_EV(N_("City: Needs Aqueduct Being Built"),      E_CITY_AQ_BUILDING),
   GEN_EV(N_("City: Normal"),                          E_CITY_NORMAL),
   GEN_EV(N_("City: Nuked"),                           E_CITY_NUKED),
-  GEN_EV(N_("City: Released from CMA"),               E_CITY_CMA_RELEASE),
+  GEN_EV(N_("City: Released from citizen governor"),  E_CITY_CMA_RELEASE),
   GEN_EV(N_("City: Suggest Growth Throttling"),       E_CITY_GRAN_THROTTLE),
   GEN_EV(N_("City: Transfer"),                        E_CITY_TRANSFER),
   GEN_EV(N_("City: Was Built"),                       E_CITY_BUILD),
Index: client/agents/cma_core.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/agents/cma_core.c,v
retrieving revision 1.71
diff -u -r1.71 cma_core.c
--- client/agents/cma_core.c    2 Feb 2005 02:46:37 -0000       1.71
+++ client/agents/cma_core.c    7 Feb 2005 08:46:59 -0000
@@ -177,9 +177,6 @@
 
   if (city_owner(pcity) != game.player_ptr) {
     cma_release_city(pcity);
-    create_event(pcity->tile, E_CITY_CMA_RELEASE,
-                _("CMA: You lost control of %s. Detaching from city."),
-                pcity->name);
     return FALSE;
   }
 
@@ -402,7 +399,7 @@
       cma_release_city(pcity);
 
       create_event(pcity->tile, E_CITY_CMA_RELEASE,
-                  _("CMA: The agent can't fulfill the requirements "
+                  _("The citizen governor can't fulfill the requirements "
                     "for %s. Passing back control."), pcity->name);
       handled = TRUE;
       break;
@@ -411,8 +408,8 @@
        freelog(HANDLE_CITY_LOG_LEVEL2, "  doesn't cleanly apply");
        if (check_city(city_id, NULL) && i == 0) {
          create_event(pcity->tile, E_NOEVENT,
-                      _("CMA: %s has changed and the calculated "
-                        "result can't be applied. Will retry."),
+                      _("The citizen governor has gotten confused dealing "
+                        "with %s.  You may want to have a look."),
                       pcity->name);
        }
       } else {
@@ -430,10 +427,10 @@
     assert(pcity != NULL);
     freelog(HANDLE_CITY_LOG_LEVEL2, "  not handled");
 
-    create_event(pcity->tile, E_CITY_CMA_RELEASE,
-                _("CMA: %s has changed multiple times. This may be "
-                  "an error in Freeciv or bad luck. The CMA will detach "
-                  "itself from the city now."), pcity->name);
+    create_event(pcity->tile, E_NOEVENT,
+                _("The citizen governor has gotten confused dealing "
+                  "with %s.  You may want to have a look."),
+                pcity->name);
 
     cma_release_city(pcity);
 
Index: client/gui-gtk/citydlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/citydlg.c,v
retrieving revision 1.194
diff -u -r1.194 citydlg.c
--- client/gui-gtk/citydlg.c    22 Jan 2005 19:45:39 -0000      1.194
+++ client/gui-gtk/citydlg.c    7 Feb 2005 08:47:00 -0000
@@ -1281,7 +1281,7 @@
     N_("Units page"),
     N_("Worklist page"),
     N_("Happiness page"),
-    N_("CMA page"),
+    N_("Governor page"),
     N_("Trade Routes page"),
     N_("This Misc. Settings page"),
     N_("Last active page")
Index: client/gui-gtk/cityrep.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/cityrep.c,v
retrieving revision 1.89
diff -u -r1.89 cityrep.c
--- client/gui-gtk/cityrep.c    22 Jan 2005 19:45:39 -0000      1.89
+++ client/gui-gtk/cityrep.c    7 Feb 2005 08:47:00 -0000
@@ -560,7 +560,7 @@
   append_impr_or_unit_to_menu(menu, _("Wonders"), TRUE, FALSE, FALSE, TRUE,
                               city_can_build_impr_or_unit, TRUE);
 
-  item = gtk_menu_item_new_with_label(_("CMA"));
+  item = gtk_menu_item_new_with_label(_("Citizen Governor"));
   gtk_menu_append(GTK_MENU(menu), item);
   submenu = gtk_menu_new();
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
@@ -937,7 +937,7 @@
                              FALSE, TRUE, city_can_build_impr_or_unit,
                              FALSE);
 
-  item=gtk_menu_item_new_with_label( _("CMA") );
+  item=gtk_menu_item_new_with_label( _("Citizen Governor") );
   gtk_menu_append(GTK_MENU(menu),item);  
   submenu = gtk_menu_new();
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
Index: client/gui-gtk/cma_fe.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/cma_fe.c,v
retrieving revision 1.28
diff -u -r1.28 cma_fe.c
--- client/gui-gtk/cma_fe.c     22 Jan 2005 19:45:39 -0000      1.28
+++ client/gui-gtk/cma_fe.c     7 Feb 2005 08:47:00 -0000
@@ -149,7 +149,7 @@
     preset_title = intl_slist(1, preset_title_);
   }
 
-  frame = gtk_frame_new(_("Citizen Management Agent"));
+  frame = gtk_frame_new(_("Citizen Governor"));
   gtk_box_pack_start(GTK_BOX(pdialog->shell), frame, TRUE, TRUE, 0);
 
   page = gtk_hbox_new(FALSE, 0);
@@ -390,11 +390,11 @@
       gtk_clist_insert(GTK_CLIST(pdialog->preset_list), i, row);
     }
   } else {
-    static const char *info_message_[4] = {
-      N_("For information on:"),
-      N_("CMA and presets"),
-      N_("including sample presets,"),
-      N_("see README.cma.")
+    static const char *info_message_ = {
+      N_("For information on\n"
+        "the citizen governor and governor presets,\n"
+        "including sample presets,\n"
+        "see README.cma.")),
     };
     static char **info_message = NULL;
 
Index: client/gui-gtk-2.0/citydlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/citydlg.c,v
retrieving revision 1.115
diff -u -r1.115 citydlg.c
--- client/gui-gtk-2.0/citydlg.c        5 Feb 2005 17:56:35 -0000       1.115
+++ client/gui-gtk-2.0/citydlg.c        7 Feb 2005 08:47:00 -0000
@@ -1006,7 +1006,7 @@
 static void create_and_append_cma_page(struct city_dialog *pdialog)
 {
   GtkWidget *page, *label;
-  const char *tab_title = _("C_MA");
+  const char *tab_title = _("_Governor");
 
   page = gtk_vbox_new(FALSE, 0);
 
@@ -1049,7 +1049,7 @@
     N_("Overview page"),
     N_("Production page"),
     N_("Happiness page"),
-    N_("CMA page"),
+    N_("Governor page"),
     N_("This Settings page"),
     N_("Last active page")
   };
Index: client/gui-gtk-2.0/cityrep.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/cityrep.c,v
retrieving revision 1.68
diff -u -r1.68 cityrep.c
--- client/gui-gtk-2.0/cityrep.c        5 Feb 2005 17:56:35 -0000       1.68
+++ client/gui-gtk-2.0/cityrep.c        7 Feb 2005 08:47:00 -0000
@@ -1202,7 +1202,7 @@
   gtk_menu_shell_append(GTK_MENU_SHELL(menu), change_improvements_item);
   change_wonders_item = gtk_menu_item_new_with_label(_("Wonders"));
   gtk_menu_shell_append(GTK_MENU_SHELL(menu), change_wonders_item);
-  change_cma_item = gtk_menu_item_new_with_label(_("CMA"));
+  change_cma_item = gtk_menu_item_new_with_label(_("Citizen Governor"));
   gtk_menu_shell_append(GTK_MENU_SHELL(menu), change_cma_item);
 }
 
@@ -1475,7 +1475,7 @@
        gtk_menu_item_new_with_label(_("Available Wonders"));
   gtk_menu_shell_append(GTK_MENU_SHELL(menu), select_wonders_item);
   select_cma_item =
-       gtk_menu_item_new_with_label(_("CMA"));
+       gtk_menu_item_new_with_label(_("Citizen Governor"));
   gtk_menu_shell_append(GTK_MENU_SHELL(menu), select_cma_item);
 }
 
Index: client/gui-gtk-2.0/cma_fe.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/cma_fe.c,v
retrieving revision 1.28
diff -u -r1.28 cma_fe.c
--- client/gui-gtk-2.0/cma_fe.c 3 Feb 2005 20:16:26 -0000       1.28
+++ client/gui-gtk-2.0/cma_fe.c 7 Feb 2005 08:47:01 -0000
@@ -246,8 +246,8 @@
                   G_CALLBACK(button_press_callback), pdialog);
 
   gtk_tooltips_set_tip(pdialog->tips, view,
-                      _("For information on:\n"
-                        "CMA and presets\n"
+                      _("For information on\n"
+                        "the citizen governor and governor presets,\n"
                         "including sample presets,\n"
                         "see README.cma."),
                       "");
@@ -456,12 +456,12 @@
     gtk_image_set_from_stock(GTK_IMAGE(pdialog->active_image),
        GTK_STOCK_YES, GTK_ICON_SIZE_DND);
     gtk_label_set_text_with_mnemonic(GTK_LABEL(pdialog->active_label),
-       _("CMA Enabl_ed"));
+       _("Governor Enabl_ed"));
   } else {
     gtk_image_set_from_stock(GTK_IMAGE(pdialog->active_image),
        GTK_STOCK_NO, GTK_ICON_SIZE_DND);
     gtk_label_set_text_with_mnemonic(GTK_LABEL(pdialog->active_label),
-       _("CMA Disabl_ed"));
+       _("Governor Disabl_ed"));
   }
   gtk_widget_set_sensitive(pdialog->result_label, controlled);
 }
Index: client/gui-mui/citydlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-mui/citydlg.c,v
retrieving revision 1.90
diff -u -r1.90 citydlg.c
--- client/gui-mui/citydlg.c    22 Jan 2005 19:45:40 -0000      1.90
+++ client/gui-mui/citydlg.c    7 Feb 2005 08:47:01 -0000
@@ -1371,7 +1371,7 @@
   page_labels[1] = _("Units");
   page_labels[2] = _("Worklist");
   page_labels[3] = _("Happiness");
-  page_labels[4] = _("CMA");
+  page_labels[4] = _("Citizen Governor");
   page_labels[5] = _("Trade Routes");
   page_labels[6] = _("Misc. Settings");
 
@@ -1379,7 +1379,7 @@
   misc_whichtab_label[1] = _("Units page");
   misc_whichtab_label[2] = _("Worklist page");
   misc_whichtab_label[3] = _("Happiness page");
-  misc_whichtab_label[4] = _("CMA page");
+  misc_whichtab_label[4] = _("Governor page");
   misc_whichtab_label[5] = _("Trade Routes page");
   misc_whichtab_label[6] = _("This Misc. Settings page");
   misc_whichtab_label[7] = _("Last active page");
Index: client/gui-win32/citydlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/citydlg.c,v
retrieving revision 1.94
diff -u -r1.94 citydlg.c
--- client/gui-win32/citydlg.c  23 Jan 2005 23:11:31 -0000      1.94
+++ client/gui-win32/citydlg.c  7 Feb 2005 08:47:01 -0000
@@ -707,7 +707,7 @@
   struct worklist_window_init wl_init;
   void *user_data[NUM_TABS];
   static char *titles_[NUM_TABS]={N_("City Overview"),N_("Worklist"),
-                                 N_("Happiness"),  N_("CMA"), 
+                                 N_("Happiness"),  N_("Citizen Governor"), 
                                  N_("Trade Routes"),
                                  N_("Misc. Settings")};
   static char *titles[NUM_TABS];
Index: client/gui-xaw/citydlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/citydlg.c,v
retrieving revision 1.131
diff -u -r1.131 citydlg.c
--- client/gui-xaw/citydlg.c    22 Jan 2005 19:45:41 -0000      1.131
+++ client/gui-xaw/citydlg.c    7 Feb 2005 08:47:02 -0000
@@ -1770,7 +1770,7 @@
   char buf[512];
   String now;
   
-  my_snprintf(buf, sizeof(buf), _("%s - %s citizens  CMA: %s"),
+  my_snprintf(buf, sizeof(buf), _("%s - %s citizens  Governor: %s"),
              pdialog->pcity->name,
              population_to_text(city_population(pdialog->pcity)),
                    cmafec_get_short_descr_of_city(pdialog->pcity));
Index: client/gui-xaw/cma_fe.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/cma_fe.c,v
retrieving revision 1.8
diff -u -r1.8 cma_fe.c
--- client/gui-xaw/cma_fe.c     26 Nov 2004 22:15:11 -0000      1.8
+++ client/gui-xaw/cma_fe.c     7 Feb 2005 08:47:02 -0000
@@ -74,16 +74,10 @@
 
 int minimal_surplus[O_MAX], factors[O_MAX + 1];
 struct city *current_city;
-char *initial_preset_list[] = {
-      N_("For information on:"),
-      N_("CMA and presets"),
-      N_("including sample presets,"),
-      N_("see README.cma."),
-      "                  ",
-      "                  ",
-      "                  ",
-      "                  ",
-      0};
+char *initial_preset_list = N_("For information on\n"
+                              "the citizen governor and governor presets,\n"
+                              "including sample presets,\n"
+                              "see README.cma.")),
 
 
 static void update_cma_preset_list(void);
Index: data/Freeciv.in
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/Freeciv.in,v
retrieving revision 1.7
diff -u -r1.7 Freeciv.in
--- data/Freeciv.in     29 Jan 2005 21:06:23 -0000      1.7
+++ data/Freeciv.in     7 Feb 2005 08:47:02 -0000
@@ -1483,13 +1483,13 @@
 !
 ! Citizen Management Agent dialog 
 !
-Freeciv*cmapopup.title:                   _("Citizen Management Agent")
+Freeciv*cmapopup.title:                   _("Citizen Governor")
 Freeciv*cmapresetviewport.allowVert:      True
 Freeciv*cmapresetlist.defaultColumns:     1
 Freeciv*cmapresetlist.forceColumns:       true
 Freeciv*cmapresetlist.background:         white
 
-Freeciv*cmacommand.label:                 _("CMA...")
+Freeciv*cmacommand.label:                 _("Citizen governor...")
 Freeciv*cmahelpbutton.label:              _("Help")
 Freeciv*cmaclosebutton.label:             _("Close")
 Freeciv*cmaaddbutton.label:               _("Add Preset")
Index: data/helpdata.txt
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/helpdata.txt,v
retrieving revision 1.134
diff -u -r1.134 helpdata.txt
--- data/helpdata.txt   30 Dec 2004 17:42:58 -0000      1.134
+++ data/helpdata.txt   7 Feb 2005 08:47:03 -0000
@@ -766,18 +766,18 @@
 other player isn't getting a better deal than you expect.\
 ")
 
-[help_cma]
-name = _("Citizen Management Agent")
+[help_governor]
+name = _("Citizen Governor")
 text = _("\
-The Citizen Management Agent (CMA) helps you manage your cities. \
+The Citizen Governor (formerly called the CMA) helps you manage your cities. \
 It deploys the available workers on the free tiles around the \
 city to achieve maximal city output. It also changes workers to \
-scientists, taxmen, or entertainers, if appropriate. And the CMA \
-has another astonishing ability: whenever possible, it keeps \
+scientists, taxmen, or entertainers, if appropriate. And the governor \
+has another ability: whenever possible, it keeps \
 your cities content.\
 \n\n\
-There are various means to tell the CMA what kind of output you \
-would like. Open the city window and click on the CMA tab. There \
+There are various means to tell the governor what kind of output you \
+would like. Open the city window and click on the governor tab. There \
 are two kinds of sliders: On the left, you can set a Minimal \
 Surplus for each kind of production; e.g. Gold = +3 means the city \
 earns 3 gold more than it needs to upkeep its improvements. On the \
@@ -788,7 +788,7 @@
 needs.\
 \n\n\
 If you set up some Minimal Surpluses which are impossible to fulfill, \
-the CMA can't be activated. Whenever the CMA can't fulfill its task \
+the governor can't be activated. Whenever the governor can't fulfill its task \
 in the ongoing game, it passes back control to you. So you'd better \
 not define too high a surplus; instead, use factors to achieve your \
 goals.\
@@ -797,22 +797,22 @@
 only with a high luxury rate. See help about 'Happiness'.\
 \n\n\
 Clicking on 'Control city' puts the city under control of \
-the CMA, 'Release city' passes control back to you.\
+the governor, 'Release city' passes control back to you.\
 \n\n\
 For ease of use, you can save your slider setting as a preset \
 with a name. Click on 'add preset' and enter a name for your \
 setting. You can use this preset in every city by just clicking \
 on its name. Also, you can control your setting from within the \
-city report, in the CMA column. And you can change it from there \
-(use 'change' --> 'CMA'), if you have saved it as a preset.\
+city report, in the governor column. And you can change it from there \
+(use 'change' --> 'Citizen Governor'), if you have saved it as a preset.\
 \n\n\
 Use 'Game' --> 'Save Settings' to store your presets \
 permanently.\
 \n\n\
-But beware! If you use the CMA for some of your cities, you will \
+But beware! If you use the governor for some of your cities, you will \
 encounter some difficulties with managing cities nearby, by hand. \
 It's best to manage all cities on an island either by hand or by \
-CMA. Read more hints, some background information, and some \
+governor. Read more hints, some background information, and some \
 preset examples in the file README.cma, included with Freeciv.\n\
 ")
 
Index: doc/README.cma
===================================================================
RCS file: /home/freeciv/CVS/freeciv/doc/README.cma,v
retrieving revision 1.2
diff -u -r1.2 README.cma
--- doc/README.cma      28 Jul 2002 13:42:50 -0000      1.2
+++ doc/README.cma      7 Feb 2005 08:47:03 -0000
@@ -1,5 +1,5 @@
 
-  Citizen Management Agent (CMA)
+  Citizen Governor (aka Citizen Management Agent, or CMA)
 ==================================
 
 The CMA is a rather new tool built into the GTK+ client of Freeciv