Author: sveinung
Date: Thu Aug  6 15:01:05 2015
New Revision: 29351

URL: http://svn.gna.org/viewcvs/freeciv?rev=29351&view=rev
Log:
menu items: use the nuking UI name

Use the ruleset defined UI name of the "Explode Nuclear" action in client
menu items.

See patch #6183

Modified:
    trunk/client/gui-gtk-2.0/menu.c
    trunk/client/gui-gtk-3.0/menu.c
    trunk/client/gui-sdl/menu.c
    trunk/client/gui-sdl2/menu.c

Modified: trunk/client/gui-gtk-2.0/menu.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/menu.c?rev=29351&r1=29350&r2=29351&view=diff
==============================================================================
--- trunk/client/gui-gtk-2.0/menu.c     (original)
+++ trunk/client/gui-gtk-2.0/menu.c     Thu Aug  6 15:01:05 2015
@@ -1718,7 +1718,7 @@
        "<Shift>p", NULL, G_CALLBACK(do_pillage_callback)},
       {"DIPLOMAT_ACTION", NULL, _("_Diplomat/Spy Actions"),
        "d", NULL, G_CALLBACK(diplomat_action_callback)},
-      {"EXPLODE_NUKE", NULL, _("Explode _Nuclear"),
+      {"EXPLODE_NUKE", NULL, action_get_ui_name(ACTION_NUKE),
        "<Shift>n", NULL, G_CALLBACK(explode_nuke_callback)},
     };
 

Modified: trunk/client/gui-gtk-3.0/menu.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/menu.c?rev=29351&r1=29350&r2=29351&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/menu.c     (original)
+++ trunk/client/gui-gtk-3.0/menu.c     Thu Aug  6 15:01:05 2015
@@ -1719,7 +1719,7 @@
        "<Shift>p", NULL, G_CALLBACK(do_pillage_callback)},
       {"DIPLOMAT_ACTION", NULL, _("_Diplomat/Spy Actions"),
        "d", NULL, G_CALLBACK(diplomat_action_callback)},
-      {"EXPLODE_NUKE", NULL, _("Explode _Nuclear"),
+      {"EXPLODE_NUKE", NULL, action_get_ui_name(ACTION_NUKE),
        "<Shift>n", NULL, G_CALLBACK(explode_nuke_callback)},
     };
 

Modified: trunk/client/gui-sdl/menu.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/menu.c?rev=29351&r1=29350&r2=29351&view=diff
==============================================================================
--- trunk/client/gui-sdl/menu.c (original)
+++ trunk/client/gui-sdl/menu.c Thu Aug  6 15:01:05 2015
@@ -430,7 +430,8 @@
   /* --------- */  
 
   /* Explode Nuclear */
-  fc_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Explode Nuclear"), "Shift+N");
+  fc_snprintf(cBuf, sizeof(cBuf),"%s (%s)",
+              action_get_ui_name(ACTION_NUKE), "Shift+N");
   pBuf = create_themeicon(pTheme->ONuke_Icon, Main.gui,
                           WF_HIDDEN | WF_RESTORE_BACKGROUND
                           | WF_WIDGET_HAS_INFO_LABEL);

Modified: trunk/client/gui-sdl2/menu.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/menu.c?rev=29351&r1=29350&r2=29351&view=diff
==============================================================================
--- trunk/client/gui-sdl2/menu.c        (original)
+++ trunk/client/gui-sdl2/menu.c        Thu Aug  6 15:01:05 2015
@@ -422,7 +422,8 @@
   /* --------- */
 
   /* Explode Nuclear */
-  fc_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Explode Nuclear"), "Shift+N");
+  fc_snprintf(cBuf, sizeof(cBuf),"%s (%s)",
+              action_get_ui_name(ACTION_NUKE), "Shift+N");
   pBuf = create_themeicon(pTheme->ONuke_Icon, Main.gui,
                           WF_HIDDEN | WF_RESTORE_BACKGROUND
                           | WF_WIDGET_HAS_INFO_LABEL);


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to