[Freeciv-Dev] (PR#19755) Renaming CMA -> City Governor not complete

["Christian Prochaska" <cp.ml.freeciv.dev@xxxxxxxxxxxxxx>]

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

> [jdorje@xxxxxxxxx - Fr 18. Aug 2006, 18:29:58]:
> 
> Christian Knoke wrote:
> > <URL: http://bugs.freeciv.org/Ticket/Display.html?id=19755 >
> > 
> > 
> > SVN V21 16 AUG 2006 GTK2, SDL, WIN32
> > 
> > 
> > Hello,
> > 
> > in Beta2 in some places the old name CMA is used instead of City
> > Governor. Should be changed, IMHO.
> 
> Patch wanted.
> 
> -jason
> 

Fixed for gui-sdl in trunk. I intend to backport the patch to S2_1
together with other patches later.

Index: client/gui-sdl/citydlg.c
===================================================================
--- client/gui-sdl/citydlg.c    (Revision 12312)
+++ client/gui-sdl/citydlg.c    (Arbeitskopie)
@@ -3694,7 +3694,7 @@
   }
 
   if (cma_is_city_under_agent(pCity, NULL)) {
-    mystrlcat(cBuf, _(" - under CMA control."), sizeof(cBuf));
+    mystrlcat(cBuf, _(" - under Citizen Governor control."), sizeof(cBuf));
   }
   
   copy_chars_to_string16(pWindow->string16, cBuf);
@@ -3894,7 +3894,7 @@
   pBuf = create_themeicon(pTheme->CMA_Icon, pWindow->dst,
                         (WF_WIDGET_HAS_INFO_LABEL |
                          WF_RESTORE_BACKGROUND));
-  pBuf->string16 = create_str16_from_char(_("Citizen Management Agent"), 
adj_font(12));
+  pBuf->string16 = create_str16_from_char(_("Citizen Governor"), adj_font(12));
   pBuf->action = cma_city_dlg_callback;
   pBuf->key = SDLK_a;
   pBuf->size.x = pWindow->size.x + adj_size(10) + (pBuf->size.w + adj_size(2)) 
* 2;
Index: client/gui-sdl/cma_fe.c
===================================================================
--- client/gui-sdl/cma_fe.c     (Revision 12312)
+++ client/gui-sdl/cma_fe.c     (Arbeitskopie)
@@ -852,7 +852,7 @@
   my_snprintf(cBuf, sizeof(cBuf),
         _("City of %s (Population %s citizens) : %s"),
          pCity->name, population_to_text(city_population(pCity)),
-                                       _("Citizen Management Agent"));
+                                       _("Citizen Governor"));
   
   pStr = create_str16_from_char(cBuf, adj_font(12));
   pStr->style |= TTF_STYLE_BOLD;
Index: client/gui-sdl/dialogs.c
===================================================================
--- client/gui-sdl/dialogs.c    (Revision 12312)
+++ client/gui-sdl/dialogs.c    (Arbeitskopie)
@@ -1272,7 +1272,7 @@
     /* ----------- */
   
     create_active_iconlabel(pBuf, pWindow->dst, pStr,
-           _("Change C.M.A Settings"), cma_callback);
+           _("Change City Governor settings"), cma_callback);
            
     pBuf->data.city = pCity;
     set_wstate(pBuf, FC_WS_NORMAL);