<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39913 >
William Allen Simpson wrote:
> I will change Gover_nment to Gov_ernment, so gui-gtk2 matches gui-win32,
> to eliminate the conflict with other _n's. No po changes.
>
Committed S2_1 revision 14083.
Index: client/gui-gtk-2.0/menu.c
===================================================================
--- client/gui-gtk-2.0/menu.c (revision 14082)
+++ client/gui-gtk-2.0/menu.c (working copy)
@@ -726,17 +726,17 @@
game_menu_callback, MENU_GAME_QUIT,
"<StockItem>",
GTK_STOCK_QUIT
},
/* Government menu ... */
- { "/" N_("Gover_nment"), NULL,
+ { "/" N_("Gov_ernment"), NULL,
NULL, 0,
"<Branch>" },
{ "/" N_("Government") "/tearoff1", NULL,
NULL, 0,
"<Tearoff>" },
- { "/" N_("Government") "/" N_("_Tax Rates"), "<shift>t",
+ { "/" N_("Government") "/" N_("Tax Rates"), "<shift>t",
government_menu_callback, MENU_GOVERNMENT_TAX_RATE
},
{ "/" N_("Government") "/sep1", NULL,
NULL, 0,
"<Separator>" },
- { "/" N_("Government") "/" N_("_Find City"), "<shift>f",
+ { "/" N_("Government") "/" N_("Find City"), "<shift>f",
government_menu_callback, MENU_GOVERNMENT_FIND_CITY
},
- { "/" N_("Government") "/" N_("_Worklists"), "<control>l",
+ { "/" N_("Government") "/" N_("Worklists"), "<control>l",
government_menu_callback, MENU_GOVERNMENT_WORKLISTS
},
{ "/" N_("Government") "/sep2", NULL,
NULL, 0,
"<Separator>" },
Index: client/gui-win32/menu.c
===================================================================
--- client/gui-win32/menu.c (revision 14082)
+++ client/gui-win32/menu.c (working copy)
@@ -321,8 +321,8 @@
{N_("Gov_ernment"), IDM_SUBMENU},
{N_("Tax Rates") "\tShift+T", IDM_GOVERNMENT_TAX_RATE},
{ "", IDM_SEPARATOR},
- {N_("_Find City") "\tCtl+F", IDM_GOVERNMENT_FIND_CITY},
- {N_("Work_lists") "\tCtl+W", IDM_GOVERNMENT_WORKLISTS},
+ {N_("Find City") "\tCtl+F", IDM_GOVERNMENT_FIND_CITY},
+ {N_("Worklists") "\tCtl+W", IDM_GOVERNMENT_WORKLISTS},
{ "", IDM_SEPARATOR},
{N_("_Change Government"), IDM_SUBMENU},
{N_("_Revolution"), IDM_GOVERNMENT_REVOLUTION},
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
