[Freeciv-Dev] (PR#10546) GTK: client uses different names of menu items
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
|
To: |
undisclosed-recipients: ; |
|
Subject: |
[Freeciv-Dev] (PR#10546) GTK: client uses different names of menu items |
|
From: |
"Egor Vyscrebentsov" <evyscr@xxxxxxxxx> |
|
Date: |
Fri, 15 Oct 2004 15:34:00 -0700 |
|
Reply-to: |
rt@xxxxxxxxxxx |
<URL: http://rt.freeciv.org/Ticket/Display.html?id=10546 >
Good daytime!
In client/gui-gtk/menu.c different names of menu items are used
(for example, "_Government" and "Government")
gettext allow to give different translations for such item,
and we may get two different menus.
Also, "Game" and "Government" uses the same accelerator.
Attached patch should fix both problem for gui-gtk.
(gui-gtk2 has same strings in menu.c. Therefore it has problem with
accelerator. However, two different menus do not appear in this client.)
Thanks, evyscr.
Index: client/gui-gtk/menu.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/menu.c,v
retrieving revision 1.90
diff -u -r1.90 menu.c
--- client/gui-gtk/menu.c 29 Sep 2004 02:24:21 -0000 1.90
+++ client/gui-gtk/menu.c 15 Oct 2004 22:20:32 -0000
@@ -583,254 +583,254 @@
/* Game menu ... */
{ "/" N_("_Game"), NULL,
NULL, 0,
"<Branch>" },
- { "/" N_("Game") "/tearoff1", NULL,
+ { "/" N_("_Game") "/tearoff1", NULL,
NULL, 0,
"<Tearoff>" },
- { "/" N_("Game") "/sep1", NULL,
+ { "/" N_("_Game") "/sep1", NULL,
NULL, 0,
"<Separator>" },
- { "/" N_("Game") "/" N_("_Local Options"), NULL,
+ { "/" N_("_Game") "/" N_("_Local Options"), NULL,
game_menu_callback, MENU_GAME_OPTIONS
},
- { "/" N_("Game") "/" N_("Messa_ge Options"), NULL,
+ { "/" N_("_Game") "/" N_("Messa_ge Options"), NULL,
game_menu_callback, MENU_GAME_MSG_OPTIONS
},
- { "/" N_("Game") "/" N_("_Save Settings"), NULL,
+ { "/" N_("_Game") "/" N_("_Save Settings"), NULL,
game_menu_callback, MENU_GAME_SAVE_SETTINGS
},
- { "/" N_("Game") "/sep2", NULL,
+ { "/" N_("_Game") "/sep2", NULL,
NULL, 0,
"<Separator>" },
- { "/" N_("Game") "/" N_("Server Opt _initial"), NULL,
+ { "/" N_("_Game") "/" N_("Server Opt _initial"), NULL,
game_menu_callback, MENU_GAME_SERVER_OPTIONS1
},
- { "/" N_("Game") "/" N_("Server Opt _ongoing"), NULL,
+ { "/" N_("_Game") "/" N_("Server Opt _ongoing"), NULL,
game_menu_callback, MENU_GAME_SERVER_OPTIONS2
},
- { "/" N_("Game") "/sep3", NULL,
+ { "/" N_("_Game") "/sep3", NULL,
NULL, 0,
"<Separator>" },
- { "/" N_("Game") "/" N_("_Export Log"), NULL,
+ { "/" N_("_Game") "/" N_("_Export Log"), NULL,
game_menu_callback, MENU_GAME_OUTPUT_LOG
},
- { "/" N_("Game") "/" N_("_Clear Log"), NULL,
+ { "/" N_("_Game") "/" N_("_Clear Log"), NULL,
game_menu_callback, MENU_GAME_CLEAR_OUTPUT
},
- { "/" N_("Game") "/sep4", NULL,
+ { "/" N_("_Game") "/sep4", NULL,
NULL, 0,
"<Separator>" },
- { "/" N_("Game") "/" N_("_Disconnect"), NULL,
+ { "/" N_("_Game") "/" N_("_Disconnect"), NULL,
game_menu_callback, MENU_GAME_DISCONNECT
},
- { "/" N_("Game") "/" N_("_Quit"), "<control>q",
+ { "/" N_("_Game") "/" N_("_Quit"), "<control>q",
gtk_main_quit, 0
},
/* Government menu ... */
- { "/" N_("_Government"), NULL,
+ { "/" N_("Gov_ernment"), NULL,
NULL, 0,
"<Branch>" },
- { "/" N_("Government") "/tearoff1", NULL,
+ { "/" N_("Gov_ernment") "/tearoff1", NULL,
NULL, 0,
"<Tearoff>" },
- { "/" N_("Government") "/" N_("_Tax Rates"), "<shift>t",
+ { "/" N_("Gov_ernment") "/" N_("_Tax Rates"), "<shift>t",
government_menu_callback,MENU_GOVERNMENT_TAX_RATE
},
- { "/" N_("Government") "/sep1", NULL,
+ { "/" N_("Gov_ernment") "/sep1", NULL,
NULL, 0,
"<Separator>" },
- { "/" N_("Government") "/" N_("_Find City"), "<shift>f",
+ { "/" N_("Gov_ernment") "/" N_("_Find City"), "<shift>f",
government_menu_callback,MENU_GOVERNMENT_FIND_CITY
},
- { "/" N_("Government") "/" N_("Work_lists"), "<shift>l",
+ { "/" N_("Gov_ernment") "/" N_("Work_lists"), "<shift>l",
government_menu_callback,MENU_GOVERNMENT_WORKLISTS
},
- { "/" N_("Government") "/sep2", NULL,
+ { "/" N_("Gov_ernment") "/sep2", NULL,
NULL, 0,
"<Separator>" },
- { "/" N_("Government") "/" N_("_Change Government"), NULL,
+ { "/" N_("Gov_ernment") "/" N_("_Change Government"), NULL,
NULL, 0, "<Branch>" },
- { "/" N_("Government") "/" N_("_Change Government") "/" N_("_Revolution!"),
+ { "/" N_("Gov_ernment") "/" N_("_Change Government") "/" N_("_Revolution!"),
"<shift>r",
government_menu_callback, MENU_GOVERNMENT_REVOLUTION },
- { "/" N_("_Government") "/" N_("_Change Government") "/sep1", NULL,
+ { "/" N_("Gov_ernment") "/" N_("_Change Government") "/sep1", NULL,
NULL, 0, "<Separator>" },
/* View menu ... */
{ "/" N_("_View"), NULL,
NULL, 0,
"<Branch>" },
- { "/" N_("View") "/tearoff1", NULL,
+ { "/" N_("_View") "/tearoff1", NULL,
NULL, 0,
"<Tearoff>" },
- { "/" N_("View") "/" N_("Map _Grid"), "<control>g",
+ { "/" N_("_View") "/" N_("Map _Grid"), "<control>g",
view_menu_callback, MENU_VIEW_SHOW_MAP_GRID,
"<CheckItem>" },
- { "/" N_("View") "/" N_("National _Borders"), "<control>b",
+ { "/" N_("_View") "/" N_("National _Borders"), "<control>b",
view_menu_callback, MENU_VIEW_SHOW_NATIONAL_BORDERS,
"<CheckItem>" },
- { "/" N_("View") "/" N_("City _Names"), "<control>n",
+ { "/" N_("_View") "/" N_("City _Names"), "<control>n",
view_menu_callback, MENU_VIEW_SHOW_CITY_NAMES,
"<CheckItem>" },
- { "/" N_("View") "/" N_("City G_rowth"), "<control>r",
+ { "/" N_("_View") "/" N_("City G_rowth"), "<control>r",
view_menu_callback, MENU_VIEW_SHOW_CITY_GROWTH_TURNS,
"<CheckItem>" },
- { "/" N_("View") "/" N_("City _Productions"), "<control>p",
+ { "/" N_("_View") "/" N_("City _Productions"), "<control>p",
view_menu_callback, MENU_VIEW_SHOW_CITY_PRODUCTIONS,
"<CheckItem>" },
- { "/" N_("View") "/sep1", NULL,
+ { "/" N_("_View") "/sep1", NULL,
NULL, 0,
"<Separator>" },
- { "/" N_("View") "/" N_("Terrain"), NULL,
+ { "/" N_("_View") "/" N_("Terrain"), NULL,
view_menu_callback, MENU_VIEW_SHOW_TERRAIN,
"<CheckItem>" },
- { "/" N_("View") "/" N_("Coastline"), NULL,
+ { "/" N_("_View") "/" N_("Coastline"), NULL,
view_menu_callback, MENU_VIEW_SHOW_COASTLINE,
"<CheckItem>" },
- { "/" N_("View") "/" N_("Improvements"), NULL,
+ { "/" N_("_View") "/" N_("Improvements"), NULL,
NULL, 0,
"<Branch>" },
- { "/" N_("View") "/" N_("Improvements") "/tearoff1", NULL,
+ { "/" N_("_View") "/" N_("Improvements") "/tearoff1", NULL,
NULL, 0,
"<Tearoff>" },
- { "/" N_("View") "/" N_("Improvements") "/" N_("Roads & Rails"), NULL,
+ { "/" N_("_View") "/" N_("Improvements") "/" N_("Roads & Rails"), NULL,
view_menu_callback, MENU_VIEW_SHOW_ROADS_RAILS,
"<CheckItem>" },
- { "/" N_("View") "/" N_("Improvements") "/" N_("Irrigation"), NULL,
+ { "/" N_("_View") "/" N_("Improvements") "/" N_("Irrigation"), NULL,
view_menu_callback, MENU_VIEW_SHOW_IRRIGATION,
"<CheckItem>" },
- { "/" N_("View") "/" N_("Improvements") "/" N_("Mines"), NULL,
+ { "/" N_("_View") "/" N_("Improvements") "/" N_("Mines"), NULL,
view_menu_callback, MENU_VIEW_SHOW_MINES,
"<CheckItem>" },
- { "/" N_("View") "/" N_("Improvements") "/" N_("Fortress & Airbase"), NULL,
+ { "/" N_("_View") "/" N_("Improvements") "/" N_("Fortress & Airbase"), NULL,
view_menu_callback, MENU_VIEW_SHOW_FORTRESS_AIRBASE,
"<CheckItem>" },
- { "/" N_("View") "/" N_("Specials"), NULL,
+ { "/" N_("_View") "/" N_("Specials"), NULL,
view_menu_callback, MENU_VIEW_SHOW_SPECIALS,
"<CheckItem>" },
- { "/" N_("View") "/" N_("Pollution & Fallout"), NULL,
+ { "/" N_("_View") "/" N_("Pollution & Fallout"), NULL,
view_menu_callback, MENU_VIEW_SHOW_POLLUTION,
"<CheckItem>" },
- { "/" N_("View") "/" N_("Cities"), NULL,
+ { "/" N_("_View") "/" N_("Cities"), NULL,
view_menu_callback, MENU_VIEW_SHOW_CITIES,
"<CheckItem>" },
- { "/" N_("View") "/" N_("Units"), NULL,
+ { "/" N_("_View") "/" N_("Units"), NULL,
view_menu_callback, MENU_VIEW_SHOW_UNITS,
"<CheckItem>" },
- { "/" N_("View") "/" N_("Focus Unit"), NULL,
+ { "/" N_("_View") "/" N_("Focus Unit"), NULL,
view_menu_callback, MENU_VIEW_SHOW_FOCUS_UNIT,
"<CheckItem>" },
- { "/" N_("View") "/" N_("Fog of War"), NULL,
+ { "/" N_("_View") "/" N_("Fog of War"), NULL,
view_menu_callback, MENU_VIEW_SHOW_FOG_OF_WAR,
"<CheckItem>" },
- { "/" N_("View") "/sep2", NULL,
+ { "/" N_("_View") "/sep2", NULL,
NULL, 0,
"<Separator>" },
- { "/" N_("View") "/" N_("_Center View"), "c",
+ { "/" N_("_View") "/" N_("_Center View"), "c",
view_menu_callback, MENU_VIEW_CENTER_VIEW
},
/* Orders menu ... */
{ "/" N_("_Orders"), NULL,
NULL, 0,
"<Branch>" },
- { "/" N_("Orders") "/tearoff1", NULL,
+ { "/" N_("_Orders") "/tearoff1", NULL,
NULL, 0,
"<Tearoff>" },
- { "/" N_("Orders") "/" N_("_Build City"), "b",
+ { "/" N_("_Orders") "/" N_("_Build City"), "b",
orders_menu_callback, MENU_ORDER_BUILD_CITY
},
- { "/" N_("Orders") "/" N_("Build _Road"), "r",
+ { "/" N_("_Orders") "/" N_("Build _Road"), "r",
orders_menu_callback, MENU_ORDER_ROAD
},
- { "/" N_("Orders") "/" N_("Build _Irrigation"), "i",
+ { "/" N_("_Orders") "/" N_("Build _Irrigation"), "i",
orders_menu_callback, MENU_ORDER_IRRIGATE
},
- { "/" N_("Orders") "/" N_("Build _Mine"), "m",
+ { "/" N_("_Orders") "/" N_("Build _Mine"), "m",
orders_menu_callback, MENU_ORDER_MINE
},
- { "/" N_("Orders") "/" N_("Transf_orm Terrain"), "o",
+ { "/" N_("_Orders") "/" N_("Transf_orm Terrain"), "o",
orders_menu_callback, MENU_ORDER_TRANSFORM
},
- { "/" N_("Orders") "/" N_("Build _Fortress"), "f",
+ { "/" N_("_Orders") "/" N_("Build _Fortress"), "f",
orders_menu_callback, MENU_ORDER_FORTRESS
},
- { "/" N_("Orders") "/" N_("Build Airbas_e"), "e",
+ { "/" N_("_Orders") "/" N_("Build Airbas_e"), "e",
orders_menu_callback, MENU_ORDER_AIRBASE
},
- { "/" N_("Orders") "/" N_("Clean _Pollution"), "p",
+ { "/" N_("_Orders") "/" N_("Clean _Pollution"), "p",
orders_menu_callback, MENU_ORDER_POLLUTION
},
- { "/" N_("Orders") "/" N_("Clean _Nuclear Fallout"), "n",
+ { "/" N_("_Orders") "/" N_("Clean _Nuclear Fallout"), "n",
orders_menu_callback, MENU_ORDER_FALLOUT
},
- { "/" N_("Orders") "/sep1", NULL,
+ { "/" N_("_Orders") "/sep1", NULL,
NULL, 0,
"<Separator>" },
- { "/" N_("Orders") "/" N_("_Sentry"), "s",
+ { "/" N_("_Orders") "/" N_("_Sentry"), "s",
orders_menu_callback, MENU_ORDER_SENTRY
},
- { "/" N_("Orders") "/" N_("Pillage"), "<shift>p",
+ { "/" N_("_Orders") "/" N_("Pillage"), "<shift>p",
orders_menu_callback, MENU_ORDER_PILLAGE
},
- { "/" N_("Orders") "/sep2", NULL,
+ { "/" N_("_Orders") "/sep2", NULL,
NULL, 0,
"<Separator>" },
- { "/" N_("Orders") "/" N_("Make _Homecity"), "h",
+ { "/" N_("_Orders") "/" N_("Make _Homecity"), "h",
orders_menu_callback, MENU_ORDER_HOMECITY
},
- { "/" N_("Orders") "/" N_("_Unload Transporter"), "u",
+ { "/" N_("_Orders") "/" N_("_Unload Transporter"), "u",
orders_menu_callback, MENU_ORDER_UNLOAD_TRANSPORTER
},
- { "/" N_("Orders") "/" N_("Load"), "",
+ { "/" N_("_Orders") "/" N_("Load"), "",
orders_menu_callback, MENU_ORDER_LOAD},
- { "/" N_("Orders") "/" N_("Unload"), "",
+ { "/" N_("_Orders") "/" N_("Unload"), "",
orders_menu_callback, MENU_ORDER_UNLOAD},
- { "/" N_("Orders") "/" N_("Wake up o_thers"), "<shift>w",
+ { "/" N_("_Orders") "/" N_("Wake up o_thers"), "<shift>w",
orders_menu_callback, MENU_ORDER_WAKEUP_OTHERS
},
- { "/" N_("Orders") "/sep3", NULL,
+ { "/" N_("_Orders") "/sep3", NULL,
NULL, 0,
"<Separator>" },
- { "/" N_("Orders") "/" N_("_Auto Settler"), "a",
+ { "/" N_("_Orders") "/" N_("_Auto Settler"), "a",
orders_menu_callback, MENU_ORDER_AUTO_SETTLER
},
- { "/" N_("Orders") "/" N_("Auto E_xplore"), "x",
+ { "/" N_("_Orders") "/" N_("Auto E_xplore"), "x",
orders_menu_callback, MENU_ORDER_AUTO_EXPLORE
},
- {"/" N_("Orders") "/" N_("_Connect") "/" N_("_Road"), "<ctrl><shift>r",
+ { "/" N_("_Orders") "/" N_("_Connect") "/" N_("_Road"), "<ctrl><shift>r",
orders_menu_callback, MENU_ORDER_CONNECT_ROAD},
- {"/" N_("Orders") "/" N_("_Connect") "/" N_("Rai_l"), "<ctrl><shift>l",
+ { "/" N_("_Orders") "/" N_("_Connect") "/" N_("Rai_l"), "<ctrl><shift>l",
orders_menu_callback, MENU_ORDER_CONNECT_RAIL},
- {"/" N_("Orders") "/" N_("_Connect") "/" N_("_Irrigate"), "<ctrl><shift>i",
+ { "/" N_("_Orders") "/" N_("_Connect") "/" N_("_Irrigate"), "<ctrl><shift>i",
orders_menu_callback, MENU_ORDER_CONNECT_IRRIGATE},
- { "/" N_("Orders") "/" N_("Patrol (_Q)"), "q",
+ { "/" N_("_Orders") "/" N_("Patrol (_Q)"), "q",
orders_menu_callback, MENU_ORDER_PATROL
},
- { "/" N_("Orders") "/" N_("_Go to"), "g",
+ { "/" N_("_Orders") "/" N_("_Go to"), "g",
orders_menu_callback, MENU_ORDER_GOTO
},
- { "/" N_("Orders") "/" N_("Go|Airlift to City"), "l",
+ { "/" N_("_Orders") "/" N_("Go|Airlift to City"), "l",
orders_menu_callback, MENU_ORDER_GOTO_CITY
},
- { "/" N_("Orders") "/" N_("Return to nearest city"), "<shift>g",
+ { "/" N_("_Orders") "/" N_("Return to nearest city"), "<shift>g",
orders_menu_callback, MENU_ORDER_RETURN },
- { "/" N_("Orders") "/sep4", NULL,
+ { "/" N_("_Orders") "/sep4", NULL,
NULL, 0,
"<Separator>" },
- { "/" N_("Orders") "/" N_("_Disband Unit"), "<shift>d",
+ { "/" N_("_Orders") "/" N_("_Disband Unit"), "<shift>d",
orders_menu_callback, MENU_ORDER_DISBAND
},
- { "/" N_("Orders") "/" N_("Diplomat|Spy Actions"), "d",
+ { "/" N_("_Orders") "/" N_("Diplomat|Spy Actions"), "d",
orders_menu_callback, MENU_ORDER_DIPLOMAT_DLG
},
- { "/" N_("Orders") "/" N_("Explode Nuclear"), "<shift>n",
+ { "/" N_("_Orders") "/" N_("Explode Nuclear"), "<shift>n",
orders_menu_callback, MENU_ORDER_NUKE
},
- { "/" N_("Orders") "/sep5", NULL,
+ { "/" N_("_Orders") "/sep5", NULL,
NULL, 0,
"<Separator>" },
- { "/" N_("Orders") "/" N_("_Wait"), "w",
+ { "/" N_("_Orders") "/" N_("_Wait"), "w",
orders_menu_callback, MENU_ORDER_WAIT
},
- { "/" N_("Orders") "/" N_("Done"), "space",
+ { "/" N_("_Orders") "/" N_("Done"), "space",
orders_menu_callback, MENU_ORDER_DONE
},
/* Reports menu ... */
{ "/" N_("_Reports"), NULL,
NULL, 0,
"<Branch>" },
- { "/" N_("Reports") "/tearoff1", NULL,
+ { "/" N_("_Reports") "/tearoff1", NULL,
NULL, 0,
"<Tearoff>" },
- { "/" N_("Reports") "/" N_("_Cities"), "F1",
+ { "/" N_("_Reports") "/" N_("_Cities"), "F1",
reports_menu_callback, MENU_REPORT_CITIES
},
- { "/" N_("Reports") "/" N_("_Units"), "F2",
+ { "/" N_("_Reports") "/" N_("_Units"), "F2",
reports_menu_callback, MENU_REPORT_UNITS
},
- { "/" N_("Reports") "/" N_("_Players"), "F3",
+ { "/" N_("_Reports") "/" N_("_Players"), "F3",
reports_menu_callback, MENU_REPORT_PLAYERS
},
- { "/" N_("Reports") "/" N_("_Economy"), "F5",
+ { "/" N_("_Reports") "/" N_("_Economy"), "F5",
reports_menu_callback, MENU_REPORT_ECONOMY
},
- { "/" N_("Reports") "/" N_("_Science"), "F6",
+ { "/" N_("_Reports") "/" N_("_Science"), "F6",
reports_menu_callback, MENU_REPORT_SCIENCE
},
- { "/" N_("Reports") "/sep1", NULL,
+ { "/" N_("_Reports") "/sep1", NULL,
NULL, 0,
"<Separator>" },
- { "/" N_("Reports") "/" N_("_Wonders of the World"), "F7",
+ { "/" N_("_Reports") "/" N_("_Wonders of the World"), "F7",
reports_menu_callback, MENU_REPORT_WOW
},
- { "/" N_("Reports") "/" N_("_Top Five Cities"), "F8",
+ { "/" N_("_Reports") "/" N_("_Top Five Cities"), "F8",
reports_menu_callback, MENU_REPORT_TOP_CITIES
},
- { "/" N_("Reports") "/" N_("_Messages"), "F10",
+ { "/" N_("_Reports") "/" N_("_Messages"), "F10",
reports_menu_callback, MENU_REPORT_MESSAGES
},
- { "/" N_("Reports") "/" N_("_Demographics"), "F11",
+ { "/" N_("_Reports") "/" N_("_Demographics"), "F11",
reports_menu_callback, MENU_REPORT_DEMOGRAPHIC
},
- { "/" N_("Reports") "/" N_("S_paceship"), "F12",
+ { "/" N_("_Reports") "/" N_("S_paceship"), "F12",
reports_menu_callback, MENU_REPORT_SPACESHIP
},
/* Help menu ... */
{ "/" N_("_Help"), NULL,
NULL, 0,
"<LastBranch>" },
- { "/" N_("Help") "/tearoff1", NULL,
+ { "/" N_("_Help") "/tearoff1", NULL,
NULL, 0,
"<Tearoff>" },
- { "/" N_("Help") "/" N_("Language_s"), NULL,
+ { "/" N_("_Help") "/" N_("Language_s"), NULL,
help_menu_callback, MENU_HELP_LANGUAGES
},
- { "/" N_("Help") "/" N_("Co_nnecting"), NULL,
+ { "/" N_("_Help") "/" N_("Co_nnecting"), NULL,
help_menu_callback, MENU_HELP_CONNECTING
},
- { "/" N_("Help") "/" N_("C_ontrols"), NULL,
+ { "/" N_("_Help") "/" N_("C_ontrols"), NULL,
help_menu_callback, MENU_HELP_CONTROLS
},
- { "/" N_("Help") "/" N_("C_hatline"), NULL,
+ { "/" N_("_Help") "/" N_("C_hatline"), NULL,
help_menu_callback, MENU_HELP_CHATLINE
},
- { "/" N_("Help") "/" N_("_Worklist Editor"), NULL,
+ { "/" N_("_Help") "/" N_("_Worklist Editor"), NULL,
help_menu_callback, MENU_HELP_WORKLIST_EDITOR
},
- { "/" N_("Help") "/" N_("Citizen _Management"), NULL,
+ { "/" N_("_Help") "/" N_("Citizen _Management"), NULL,
help_menu_callback, MENU_HELP_CMA
},
- { "/" N_("Help") "/" N_("_Playing"), NULL,
+ { "/" N_("_Help") "/" N_("_Playing"), NULL,
help_menu_callback, MENU_HELP_PLAYING
},
- { "/" N_("Help") "/sep1", NULL,
+ { "/" N_("_Help") "/sep1", NULL,
NULL, 0,
"<Separator>" },
- { "/" N_("Help") "/" N_("City _Improvements"), NULL,
+ { "/" N_("_Help") "/" N_("City _Improvements"), NULL,
help_menu_callback, MENU_HELP_IMPROVEMENTS
},
- { "/" N_("Help") "/" N_("_Units"), NULL,
+ { "/" N_("_Help") "/" N_("_Units"), NULL,
help_menu_callback, MENU_HELP_UNITS
},
- { "/" N_("Help") "/" N_("Com_bat"), NULL,
+ { "/" N_("_Help") "/" N_("Com_bat"), NULL,
help_menu_callback, MENU_HELP_COMBAT
},
- { "/" N_("Help") "/" N_("_ZOC"), NULL,
+ { "/" N_("_Help") "/" N_("_ZOC"), NULL,
help_menu_callback, MENU_HELP_ZOC
},
- { "/" N_("Help") "/" N_("Techno_logy"), NULL,
+ { "/" N_("_Help") "/" N_("Techno_logy"), NULL,
help_menu_callback, MENU_HELP_TECH
},
- { "/" N_("Help") "/" N_("_Terrain"), NULL,
+ { "/" N_("_Help") "/" N_("_Terrain"), NULL,
help_menu_callback, MENU_HELP_TERRAIN
},
- { "/" N_("Help") "/" N_("Won_ders"), NULL,
+ { "/" N_("_Help") "/" N_("Won_ders"), NULL,
help_menu_callback, MENU_HELP_WONDERS
},
- { "/" N_("Help") "/" N_("_Government"), NULL,
+ { "/" N_("_Help") "/" N_("_Government"), NULL,
help_menu_callback, MENU_HELP_GOVERNMENT
},
- { "/" N_("Help") "/" N_("Happin_ess"), NULL,
+ { "/" N_("_Help") "/" N_("Happin_ess"), NULL,
help_menu_callback, MENU_HELP_HAPPINESS
},
- { "/" N_("Help") "/" N_("Space _Race"), NULL,
+ { "/" N_("_Help") "/" N_("Space _Race"), NULL,
help_menu_callback, MENU_HELP_SPACE_RACE
},
- { "/" N_("Help") "/sep2", NULL,
+ { "/" N_("_Help") "/sep2", NULL,
NULL, 0,
"<Separator>" },
- { "/" N_("Help") "/" N_("_Copying"), NULL,
+ { "/" N_("_Help") "/" N_("_Copying"), NULL,
help_menu_callback, MENU_HELP_COPYING
},
- { "/" N_("Help") "/" N_("_About"), NULL,
+ { "/" N_("_Help") "/" N_("_About"), NULL,
help_menu_callback, MENU_HELP_ABOUT
}
};
@@ -1029,14 +1029,14 @@
{
if (!can_client_change_view()) {
menus_set_sensitive("<main>/_Reports", FALSE);
- menus_set_sensitive("<main>/_Government", FALSE);
+ menus_set_sensitive("<main>/Gov_ernment", FALSE);
menus_set_sensitive("<main>/_View", FALSE);
menus_set_sensitive("<main>/_Orders", FALSE);
} else {
struct unit *punit;
GtkWidget *item;
const char *path =
- translate_menu_path("<main>/_Government/_Change Government", TRUE);
+ translate_menu_path("<main>/Gov_ernment/_Change Government", TRUE);
GtkWidget *parent = gtk_item_factory_get_widget(item_factory, path);
if (parent) {
@@ -1073,15 +1073,15 @@
}
menus_set_sensitive("<main>/_Reports", TRUE);
- menus_set_sensitive("<main>/_Government", TRUE);
+ menus_set_sensitive("<main>/Gov_ernment", TRUE);
menus_set_sensitive("<main>/_View", TRUE);
menus_set_sensitive("<main>/_Orders", can_client_issue_orders());
- menus_set_sensitive("<main>/_Government/_Tax Rates",
+ menus_set_sensitive("<main>/Gov_ernment/_Tax Rates",
can_client_issue_orders());
- menus_set_sensitive("<main>/_Government/Work_lists",
+ menus_set_sensitive("<main>/Gov_ernment/Work_lists",
can_client_issue_orders());
- menus_set_sensitive("<main>/_Government/_Change Government",
+ menus_set_sensitive("<main>/Gov_ernment/_Change Government",
can_client_issue_orders());
menus_set_sensitive("<main>/_Reports/S_paceship",
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Freeciv-Dev] (PR#10546) GTK: client uses different names of menu items,
Egor Vyscrebentsov <=
|
|
