[Freeciv-Dev] (PR#11477) gen imprs
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
<URL: http://bugs.freeciv.org/Ticket/Display.html?id=11477 >
> [cazfi - Sat Dec 18 16:39:16 2004]:
>
> - Small wonders are not under 'Wonders' in help; menu item for
> 'Wonders' should be renamed to 'Great Wonders'
Here is a patch that should call Great Wonders by their proper name.
Index: client/gui-gtk/cityrep.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/cityrep.c,v
retrieving revision 1.88
diff -u -r1.88 cityrep.c
--- client/gui-gtk/cityrep.c 19 Dec 2004 18:53:12 -0000 1.88
+++ client/gui-gtk/cityrep.c 20 Dec 2004 21:32:24 -0000
@@ -371,7 +371,7 @@
}
/* Add all wonders */
- append_impr_or_unit_to_menu_sub(submenu, _("No Wonders Available"),
+ append_impr_or_unit_to_menu_sub(submenu, _("No Great Wonders Available"),
FALSE, TRUE, change_prod,
(bool(*)(struct city *, gint))
test_func, select_impr_or_unit_callback);
@@ -557,7 +557,7 @@
append_impr_or_unit_to_menu(menu, _("Units"), TRUE, FALSE, TRUE, FALSE,
city_can_build_impr_or_unit, TRUE);
- append_impr_or_unit_to_menu(menu, _("Wonders"), TRUE, FALSE, FALSE, TRUE,
+ append_impr_or_unit_to_menu(menu, _("Great Wonders"), TRUE, FALSE, FALSE,
TRUE,
city_can_build_impr_or_unit, TRUE);
item = gtk_menu_item_new_with_label(_("CMA"));
@@ -906,7 +906,7 @@
GTK_SIGNAL_FUNC(city_select_building_callback),
GINT_TO_POINTER(TYPE_UNIT));
- item=gtk_menu_item_new_with_label( _("Building Wonders") );
+ item=gtk_menu_item_new_with_label( _("Building Great Wonders") );
gtk_menu_append(GTK_MENU(menu),item);
gtk_signal_connect(GTK_OBJECT(item),"activate",
GTK_SIGNAL_FUNC(city_select_building_callback),
@@ -933,7 +933,7 @@
TRUE, FALSE, city_can_build_impr_or_unit,
FALSE);
- append_impr_or_unit_to_menu(menu, _("Available Wonders"), FALSE, FALSE,
+ append_impr_or_unit_to_menu(menu, _("Available Great Wonders"), FALSE, FALSE,
FALSE, TRUE, city_can_build_impr_or_unit,
FALSE);
Index: client/gui-gtk/menu.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/menu.c,v
retrieving revision 1.96
diff -u -r1.96 menu.c
--- client/gui-gtk/menu.c 11 Dec 2004 23:10:06 -0000 1.96
+++ client/gui-gtk/menu.c 20 Dec 2004 21:32:26 -0000
@@ -775,7 +775,7 @@
reports_menu_callback, MENU_REPORT_SCIENCE
},
{ "/" N_("_Reports") "/sep1", NULL,
NULL, 0,
"<Separator>" },
- { "/" N_("_Reports") "/" N_("_Wonders of the World"), "F7",
+ { "/" N_("_Reports") "/" N_("Great _Wonders"), "F7",
reports_menu_callback, MENU_REPORT_WOW
},
{ "/" N_("_Reports") "/" N_("_Top Five Cities"), "F8",
reports_menu_callback, MENU_REPORT_TOP_CITIES
},
@@ -818,7 +818,7 @@
help_menu_callback, MENU_HELP_TECH
},
{ "/" N_("_Help") "/" N_("_Terrain"), NULL,
help_menu_callback, MENU_HELP_TERRAIN
},
- { "/" N_("_Help") "/" N_("Won_ders"), NULL,
+ { "/" N_("_Help") "/" N_("Great Won_ders"), NULL,
help_menu_callback, MENU_HELP_WONDERS
},
{ "/" N_("_Help") "/" N_("_Government"), NULL,
help_menu_callback, MENU_HELP_GOVERNMENT
},
@@ -1191,7 +1191,7 @@
menus_set_sensitive("<main>/_Orders/Explode Nuclear",
unit_flag(punit, F_NUCLEAR));
if (unit_flag(punit, F_HELP_WONDER))
- menus_rename("<main>/_Orders/_Build City", _("Help _Build Wonder"));
+ menus_rename("<main>/_Orders/_Build City", _("Help _Build Great
Wonder"));
else if (unit_flag(punit, F_CITIES)) {
if (map_get_city(punit->tile))
menus_rename("<main>/_Orders/_Build City", _("Add to City (_B)"));
Index: client/gui-gtk/repodlgs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/repodlgs.c,v
retrieving revision 1.88
diff -u -r1.88 repodlgs.c
--- client/gui-gtk/repodlgs.c 19 Dec 2004 18:53:12 -0000 1.88
+++ client/gui-gtk/repodlgs.c 20 Dec 2004 21:32:26 -0000
@@ -1102,7 +1102,7 @@
N_("Cities\n"),
N_("Technologies\n"),
N_("Military Service\n(months)"),
- N_("Wonders\n"),
+ N_("Great Wonders\n"),
N_("Research Speed\n(%)"),
N_("Land Area\n(sq. mi.)"),
N_("Settled Area\n(sq. mi.)"),
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.67
diff -u -r1.67 cityrep.c
--- client/gui-gtk-2.0/cityrep.c 30 Nov 2004 06:54:06 -0000 1.67
+++ client/gui-gtk-2.0/cityrep.c 20 Dec 2004 21:32:27 -0000
@@ -1199,7 +1199,7 @@
gtk_menu_shell_append(GTK_MENU_SHELL(menu), change_units_item);
change_improvements_item = gtk_menu_item_new_with_label(_("Improvements"));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), change_improvements_item);
- change_wonders_item = gtk_menu_item_new_with_label(_("Wonders"));
+ change_wonders_item = gtk_menu_item_new_with_label(_("Great Wonders"));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), change_wonders_item);
change_cma_item = gtk_menu_item_new_with_label(_("CMA"));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), change_cma_item);
@@ -1220,7 +1220,7 @@
gtk_menu_shell_append(GTK_MENU_SHELL(menu), last_units_item);
last_improvements_item = gtk_menu_item_new_with_label(_("Improvements"));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), last_improvements_item);
- last_wonders_item = gtk_menu_item_new_with_label(_("Wonders"));
+ last_wonders_item = gtk_menu_item_new_with_label(_("Great Wonders"));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), last_wonders_item);
}
@@ -1239,7 +1239,7 @@
gtk_menu_shell_append(GTK_MENU_SHELL(menu), first_units_item);
first_improvements_item = gtk_menu_item_new_with_label(_("Improvements"));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), first_improvements_item);
- first_wonders_item = gtk_menu_item_new_with_label(_("Wonders"));
+ first_wonders_item = gtk_menu_item_new_with_label(_("Great Wonders"));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), first_wonders_item);
}
@@ -1258,7 +1258,7 @@
gtk_menu_shell_append(GTK_MENU_SHELL(menu), next_units_item);
next_improvements_item = gtk_menu_item_new_with_label(_("Improvements"));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), next_improvements_item);
- next_wonders_item = gtk_menu_item_new_with_label(_("Wonders"));
+ next_wonders_item = gtk_menu_item_new_with_label(_("Great Wonders"));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), next_wonders_item);
}
@@ -1402,7 +1402,7 @@
G_CALLBACK(city_select_building_callback),
GINT_TO_POINTER(TYPE_NORMAL_IMPROVEMENT));
- item = gtk_menu_item_new_with_label(_("Building Wonders"));
+ item = gtk_menu_item_new_with_label(_("Building Great Wonders"));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
g_signal_connect(item, "activate",
G_CALLBACK(city_select_building_callback),
@@ -1456,7 +1456,7 @@
gtk_menu_shell_append(GTK_MENU_SHELL(menu), select_built_improvements_item);
select_built_wonders_item =
- gtk_menu_item_new_with_label(_("Wonders in City"));
+ gtk_menu_item_new_with_label(_("Great Wonders in City"));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), select_built_wonders_item);
@@ -1471,7 +1471,7 @@
gtk_menu_item_new_with_label(_("Available Improvements"));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), select_improvements_item);
select_wonders_item =
- gtk_menu_item_new_with_label(_("Available Wonders"));
+ gtk_menu_item_new_with_label(_("Available Great Wonders"));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), select_wonders_item);
select_cma_item =
gtk_menu_item_new_with_label(_("CMA"));
Index: client/gui-gtk-2.0/menu.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/menu.c,v
retrieving revision 1.57
diff -u -r1.57 menu.c
--- client/gui-gtk-2.0/menu.c 25 Nov 2004 06:57:17 -0000 1.57
+++ client/gui-gtk-2.0/menu.c 20 Dec 2004 21:32:28 -0000
@@ -826,7 +826,7 @@
reports_menu_callback, MENU_REPORT_SCIENCE
},
{ "/" N_("Reports") "/sep1", NULL,
NULL, 0,
"<Separator>" },
- { "/" N_("Reports") "/" N_("_Wonders of the World"), "F7",
+ { "/" N_("Reports") "/" N_("Great _Wonders"), "F7",
reports_menu_callback, MENU_REPORT_WOW
},
{ "/" N_("Reports") "/" N_("_Top Five Cities"), "F8",
reports_menu_callback, MENU_REPORT_TOP_CITIES
},
@@ -869,7 +869,7 @@
help_menu_callback, MENU_HELP_TECH
},
{ "/" N_("Help") "/" N_("_Terrain"), NULL,
help_menu_callback, MENU_HELP_TERRAIN
},
- { "/" N_("Help") "/" N_("Won_ders"), NULL,
+ { "/" N_("Help") "/" N_("Great Won_ders"), NULL,
help_menu_callback, MENU_HELP_WONDERS
},
{ "/" N_("Help") "/" N_("_Government"), NULL,
help_menu_callback, MENU_HELP_GOVERNMENT
},
@@ -1343,7 +1343,7 @@
menus_set_sensitive("<main>/_Orders/Explode Nuclear",
unit_flag(punit, F_NUCLEAR));
if (unit_flag(punit, F_HELP_WONDER))
- menus_rename("<main>/_Orders/_Build City", _("Help _Build Wonder"));
+ menus_rename("<main>/_Orders/_Build City", _("Help _Build Great
Wonder"));
else if (unit_flag(punit, F_CITIES)) {
if (map_get_city(punit->tile))
menus_rename("<main>/_Orders/_Build City", _("Add to City (_B)"));
Index: client/gui-gtk-2.0/repodlgs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/repodlgs.c,v
retrieving revision 1.74
diff -u -r1.74 repodlgs.c
--- client/gui-gtk-2.0/repodlgs.c 19 Dec 2004 16:47:08 -0000 1.74
+++ client/gui-gtk-2.0/repodlgs.c 20 Dec 2004 21:32:30 -0000
@@ -1252,7 +1252,7 @@
N_("Cities\n"),
N_("Technologies\n"),
N_("Military Service\n(months)"),
- N_("Wonders\n"),
+ N_("Great Wonders\n"),
N_("Research Speed\n(%)"),
N_("Land Area\n(sq. mi.)"),
N_("Settled Area\n(sq. mi.)"),
Index: client/gui-mui/gui_main.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-mui/gui_main.c,v
retrieving revision 1.88
diff -u -r1.88 gui_main.c
--- client/gui-mui/gui_main.c 22 Nov 2004 07:54:46 -0000 1.88
+++ client/gui-mui/gui_main.c 20 Dec 2004 21:32:30 -0000
@@ -266,7 +266,7 @@
MAKE_ITEM(N_("Go/Airlift to City"), MENU_ORDER_GOTO_CITY, "l",
NM_COMMANDSTRING),
MAKE_SEPERATOR,
MAKE_ITEM(N_("Disband Unit"), MENU_ORDER_DISBAND, "SHIFT D",
NM_COMMANDSTRING),
- MAKE_ITEM(N_("Help Build Wonder"), MENU_ORDER_BUILD_WONDER, "SHIFT B",
NM_COMMANDSTRING),
+ MAKE_ITEM(N_("Help Build Great Wonder"), MENU_ORDER_BUILD_WONDER, "SHIFT B",
NM_COMMANDSTRING),
MAKE_ITEM(N_("Make Trade Route"), MENU_ORDER_TRADEROUTE, "SHIFT M",
NM_COMMANDSTRING),
MAKE_ITEM(N_("Diplomat/Spy Actions"), MENU_ORDER_DIPLOMAT_DLG, "SHIFT B",
NM_COMMANDSTRING),
MAKE_ITEM(N_("Explode Nuclear"), MENU_ORDER_NUKE, "SHIFT N",
NM_COMMANDSTRING),
@@ -280,7 +280,7 @@
MAKE_ITEM(N_("Trade Report..."), MENU_REPORT_TRADE, "F5", NM_COMMANDSTRING),
MAKE_ITEM(N_("Military Report..."), MENU_REPORT_MILITARY, "F2",
NM_COMMANDSTRING),
MAKE_SEPERATOR,
- MAKE_ITEM(N_("Wonders of the World"), MENU_REPORT_WOW, "F7",
NM_COMMANDSTRING),
+ MAKE_ITEM(N_("Great Wonders"), MENU_REPORT_WOW, "F7", NM_COMMANDSTRING),
MAKE_ITEM(N_("Top Five Cities"), MENU_REPORT_TOP_CITIES, "F8",
NM_COMMANDSTRING),
MAKE_ITEM(N_("Demographics"), MENU_REPORT_DEMOGRAPHIC, "F9",
NM_COMMANDSTRING),
MAKE_ITEM(N_("Spaceship"), MENU_REPORT_SPACESHIP, "F10", NM_COMMANDSTRING),
Index: client/gui-mui/worklistclass.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-mui/worklistclass.c,v
retrieving revision 1.26
diff -u -r1.26 worklistclass.c
--- client/gui-mui/worklistclass.c 25 Feb 2004 20:09:51 -0000 1.26
+++ client/gui-mui/worklistclass.c 20 Dec 2004 21:32:31 -0000
@@ -111,7 +111,7 @@
return _("Built");
if (wonder_obsolete(id))
return _("Obsolete");
- return _("Wonder");
+ return _("Great Wonder");
}
return "";
}
Index: client/gui-win32/cityrep.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/cityrep.c,v
retrieving revision 1.34
diff -u -r1.34 cityrep.c
--- client/gui-win32/cityrep.c 5 Dec 2004 22:03:00 -0000 1.34
+++ client/gui-win32/cityrep.c 20 Dec 2004 21:32:32 -0000
@@ -267,7 +267,7 @@
}
/* Add all wonders */
- append_impr_or_unit_to_menu_sub(menu, _("No Wonders Available"),
+ append_impr_or_unit_to_menu_sub(menu, _("No Great Wonders Available"),
FALSE, TRUE, change_prod,
(bool (*)(struct city *, int))
test_func,
Index: client/gui-win32/menu.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/menu.c,v
retrieving revision 1.34
diff -u -r1.34 menu.c
--- client/gui-win32/menu.c 10 Dec 2004 01:27:36 -0000 1.34
+++ client/gui-win32/menu.c 20 Dec 2004 21:32:33 -0000
@@ -401,7 +401,7 @@
{N_("_Economy") "\tF5", IDM_REPORTS_ECONOMY},
{N_("_Science") "\tF6", IDM_REPORTS_SCIENCE},
{"", IDM_SEPARATOR},
- {N_("_Wonders of the World") "\tF7", IDM_REPORTS_WONDERS},
+ {N_("Great _Wonders") "\tF7", IDM_REPORTS_WONDERS},
{N_("_Top Five Cities") "\tF8", IDM_REPORTS_TOP_CITIES},
{N_("_Messages") "\tF10", IDM_REPORTS_MESSAGES},
{N_("_Demographics") "\tF11", IDM_REPORTS_DEMOGRAPHICS},
@@ -424,7 +424,7 @@
{N_("_ZOC"), IDM_HELP_ZOC},
{N_("Techno_logy"), IDM_HELP_TECH},
{N_("_Terrain"), IDM_HELP_TERRAIN},
- {N_("Won_ders"), IDM_HELP_WONDERS},
+ {N_("Great Won_ders"), IDM_HELP_WONDERS},
{N_("_Government"), IDM_HELP_GOVERNMENT},
{N_("Happin_ess"), IDM_HELP_HAPPINESS},
{N_("Space _Race"), IDM_HELP_SPACE_RACE},
Index: client/gui-xaw/menu.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/menu.c,v
retrieving revision 1.75
diff -u -r1.75 menu.c
--- client/gui-xaw/menu.c 15 Dec 2004 13:09:54 -0000 1.75
+++ client/gui-xaw/menu.c 20 Dec 2004 21:32:34 -0000
@@ -218,7 +218,7 @@
{ { N_("Economy"), 0 }, "F5", MENU_REPORT_ECONOMY, 0 },
{ { N_("Science"), 0 }, "F6", MENU_REPORT_SCIENCE, 0 },
{ { 0 }, "", MENU_SEPARATOR_LINE, 0 },
- { { N_("Wonders of the World"), 0 }, "F7", MENU_REPORT_WOW, 0 },
+ { { N_("Great Wonders"), 0 }, "F7", MENU_REPORT_WOW, 0 },
{ { N_("Top Five Cities"), 0 }, "F8", MENU_REPORT_TOP_CITIES, 0 },
{ { N_("Messages"), 0 }, "F10", MENU_REPORT_MESSAGES, 0 },
{ { N_("Demographics"), 0 }, "F11", MENU_REPORT_DEMOGRAPHIC, 0 },
@@ -239,7 +239,7 @@
{ { N_("ZOC"), 0 }, "", MENU_HELP_ZOC, 0 },
{ { N_("Technology"), 0 }, "", MENU_HELP_TECH, 0 },
{ { N_("Terrain"), 0 }, "", MENU_HELP_TERRAIN, 0 },
- { { N_("Wonders"), 0 }, "", MENU_HELP_WONDERS, 0 },
+ { { N_("Great Wonders"), 0 }, "", MENU_HELP_WONDERS, 0 },
{ { N_("Government"), 0 }, "", MENU_HELP_GOVERNMENT, 0 },
{ { N_("Happiness"), 0 }, "", MENU_HELP_HAPPINESS, 0 },
{ { N_("Space Race"), 0 }, "", MENU_HELP_SPACE_RACE, 0 },
Index: client/include/helpdlg_g.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/include/helpdlg_g.h,v
retrieving revision 1.9
diff -u -r1.9 helpdlg_g.h
--- client/include/helpdlg_g.h 18 Dec 2002 13:08:13 -0000 1.9
+++ client/include/helpdlg_g.h 20 Dec 2004 21:32:34 -0000
@@ -34,7 +34,7 @@
#define HELP_ZOC_ITEM "Zones of Control"
#define HELP_TECHS_ITEM "Technology"
#define HELP_TERRAIN_ITEM "Terrain"
-#define HELP_WONDERS_ITEM "Wonders of the World"
+#define HELP_WONDERS_ITEM "Great Wonders"
#define HELP_GOVERNMENT_ITEM "Government"
#define HELP_HAPPINESS_ITEM "Happiness"
#define HELP_SPACE_RACE_ITEM "Space Race"
Index: data/helpdata.txt
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/helpdata.txt,v
retrieving revision 1.132
diff -u -r1.132 helpdata.txt
--- data/helpdata.txt 16 Dec 2004 20:04:58 -0000 1.132
+++ data/helpdata.txt 20 Dec 2004 21:32:37 -0000
@@ -500,7 +500,7 @@
3: move south-east F3: open Players dialog\n\
4: move west F5: open Economy Report\n\
5: focus on previous unit F6: open Science Report\n\
- 6: move east F7: open World Wonders\n\
+ 6: move east F7: open Great Wonders\n\
7: move north-west F8: open Top Five Cities\n\
8: move north F10: open Messages dialog\n\
9: move north-east F11: open Demographics\n\
@@ -818,8 +818,8 @@
[help_gen_techs]
generate = "Techs"
-[help_wonders_of_the_world]
-name = _("Wonders of the World")
+[help_great_wonders]
+name = _("Great Wonders")
text = _("\
Each wonder has specific benefits for your civilization. \
Each wonder is unique and is placed in the city which \
Index: server/report.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/report.c,v
retrieving revision 1.59
diff -u -r1.59 report.c
--- server/report.c 19 Dec 2004 16:47:10 -0000 1.59
+++ server/report.c 20 Dec 2004 21:32:38 -0000
@@ -322,7 +322,7 @@
} impr_type_iterate_end;
page_conn(dest, _("Traveler's Report:"),
- _("Wonders of the World"), buffer);
+ _("Great Wonders"), buffer);
}
/**************************************************************************
- [Freeciv-Dev] (PR#11477) gen imprs, (continued)
- [Freeciv-Dev] (PR#11477) gen imprs, Vasco Alexandre da Silva Costa, 2004/12/18
- [Freeciv-Dev] Re: (PR#11477) gen imprs, Marko Lindqvist, 2004/12/19
- [Freeciv-Dev] (PR#11477) gen imprs, Vasco Alexandre da Silva Costa, 2004/12/19
- [Freeciv-Dev] (PR#11477) gen imprs, Vasco Alexandre da Silva Costa, 2004/12/19
- [Freeciv-Dev] Re: (PR#11477) gen imprs, Marko Lindqvist, 2004/12/19
- [Freeciv-Dev] Re: (PR#11477) gen imprs, Marko Lindqvist, 2004/12/19
- [Freeciv-Dev] (PR#11477) gen imprs, Vasco Alexandre da Silva Costa, 2004/12/19
- [Freeciv-Dev] (PR#11477) gen imprs, Vasco Alexandre da Silva Costa, 2004/12/19
- [Freeciv-Dev] (PR#11477) gen imprs, Jason Short, 2004/12/19
- [Freeciv-Dev] (PR#11477) gen imprs, Vasco Alexandre da Silva Costa, 2004/12/19
- [Freeciv-Dev] (PR#11477) gen imprs,
Vasco Alexandre da Silva Costa <=
- [Freeciv-Dev] (PR#11477) META-TICKET: gen imprs, Vasco Alexandre da Silva Costa, 2004/12/20
- [Freeciv-Dev] (PR#11477) META-TICKET: gen imprs, Vasco Alexandre da Silva Costa, 2004/12/20
|
|
