widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/menus into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~hjd/widelands/menus/+merge/177922

Changed various strings a bit.

* Remove 'menu' from the title of various windows, mainly in the editor. This seemed rather redundant to me, as the titles were already explaining what the window contained.
* Remove exclamation marks from encourangments/instructions in various menus. Unless they are for error messages, it seems like they are shouting at the user. :p
-- 
https://code.launchpad.net/~hjd/widelands/menus/+merge/177922
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/menus into lp:widelands.

=== modified file 'src/editor/ui_menus/editor_tool_change_resources_options_menu.cc'
--- src/editor/ui_menus/editor_tool_change_resources_options_menu.cc	2013-07-26 20:19:36 +0000
+++ src/editor/ui_menus/editor_tool_change_resources_options_menu.cc	2013-07-31 18:38:25 +0000
@@ -42,7 +42,7 @@
 		 UI::UniqueWindow::Registry     & registry)
 	:
 	Editor_Tool_Options_Menu
-		(parent, registry, 164, 120, _("Resources Tools Options")),
+		(parent, registry, 164, 120, _("Resources")),
 	m_change_by_label
 		(this,
 		 hmargin(), vmargin(), get_inner_w() - 2 * hmargin(), BUTTON_HEIGHT,

=== modified file 'src/editor/ui_menus/editor_tool_menu.cc'
--- src/editor/ui_menus/editor_tool_menu.cc	2013-07-26 20:19:36 +0000
+++ src/editor/ui_menus/editor_tool_menu.cc	2013-07-31 18:38:25 +0000
@@ -43,7 +43,7 @@
 Editor_Tool_Menu::Editor_Tool_Menu
 	(Editor_Interactive & parent, UI::UniqueWindow::Registry & registry)
 :
-UI::UniqueWindow(&parent, "tool_menu", &registry, 350, 400, _("Tool Menu"))
+UI::UniqueWindow(&parent, "tool_menu", &registry, 350, 400, _("Tools"))
 {
 
 #define spacing 5
@@ -65,9 +65,9 @@
 	ADD_BUTTON("change_height",    _("Change height"));
 	ADD_BUTTON("noise_height",     _("Noise height"));
 	ADD_BUTTON("set_terrain",      _("Terrain"));
-	ADD_BUTTON("place_immovable",  _("Immovable"));
-	ADD_BUTTON("place_bob",        _("Bob"));
-	ADD_BUTTON("change_resources", _("Resource"));
+	ADD_BUTTON("place_immovable",  _("Immovables"));
+	ADD_BUTTON("place_bob",        _("Bobs"));
+	ADD_BUTTON("change_resources", _("Resources"));
 	ADD_BUTTON("set_port_space",   _("Set port space"));
 
 	set_inner_size

=== modified file 'src/editor/ui_menus/editor_tool_place_bob_options_menu.cc'
--- src/editor/ui_menus/editor_tool_place_bob_options_menu.cc	2013-07-26 20:19:36 +0000
+++ src/editor/ui_menus/editor_tool_place_bob_options_menu.cc	2013-07-31 18:38:25 +0000
@@ -42,7 +42,7 @@
 	 Editor_Place_Bob_Tool      & pit,
 	 UI::UniqueWindow::Registry & registry)
 :
-Editor_Tool_Options_Menu(parent, registry, 100, 100, _("Bobs Menu")),
+Editor_Tool_Options_Menu(parent, registry, 100, 100, _("Bobs")),
 
 m_tabpanel          (this, 0, 0, g_gr->images().get("pics/but1.png")),
 m_pit               (pit),

=== modified file 'src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc'
--- src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc	2013-07-26 20:19:36 +0000
+++ src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc	2013-07-31 18:38:25 +0000
@@ -42,7 +42,7 @@
 		 Editor_Place_Immovable_Tool & pit,
 		 UI::UniqueWindow::Registry  & registry)
 :
-Editor_Tool_Options_Menu(parent, registry, 100, 100, _("Immovable Bobs Menu")),
+Editor_Tool_Options_Menu(parent, registry, 100, 100, _("Immovable Bobs")),
 m_tabpanel(this, 0, 0, g_gr->images().get("pics/but1.png")),
 m_pit     (pit),
 m_click_recursion_protect(false)

=== modified file 'src/editor/ui_menus/editor_toolsize_menu.cc'
--- src/editor/ui_menus/editor_toolsize_menu.cc	2013-07-26 20:19:36 +0000
+++ src/editor/ui_menus/editor_toolsize_menu.cc	2013-07-31 18:38:25 +0000
@@ -38,7 +38,7 @@
 	(Editor_Interactive & parent, UI::UniqueWindow::Registry & registry)
 	:
 	UI::UniqueWindow
-		(&parent, "toolsize_menu", &registry, 160, 50, _("Toolsize Menu")),
+		(&parent, "toolsize_menu", &registry, 160, 50, _("Toolsize")),
 	m_textarea(this, 5, 5, 150, 10, std::string(), UI::Align_HCenter),
 	m_increase
 		(this, "incr",

=== modified file 'src/ui_fsmenu/campaign_select.cc'
--- src/ui_fsmenu/campaign_select.cc	2013-07-26 20:19:36 +0000
+++ src/ui_fsmenu/campaign_select.cc	2013-07-31 18:38:25 +0000
@@ -262,7 +262,7 @@
 // Text labels
 	title
 		(this,
-		 get_w() / 2, get_h() * 9 / 50, _("Choose your map!"),
+		 get_w() / 2, get_h() * 9 / 50, _("Choose a map"),
 		 UI::Align_HCenter),
 	label_mapname (this, get_w() * 3 / 5,  get_h() * 17 / 50, _("Name:")),
 	tamapname     (this, get_w() * 61 / 100, get_h() * 3 / 8, ""),

=== modified file 'src/ui_fsmenu/editor.cc'
--- src/ui_fsmenu/editor.cc	2013-07-26 20:19:36 +0000
+++ src/ui_fsmenu/editor.cc	2013-07-31 18:38:25 +0000
@@ -33,7 +33,7 @@
 
 // Title
 	title
-		(this, get_w() / 2, get_h() * 3 / 40, _("Editor Menu"), UI::Align_HCenter),
+		(this, get_w() / 2, get_h() * 3 / 40, _("Editor"), UI::Align_HCenter),
 
 // Buttons
 	new_map

=== modified file 'src/ui_fsmenu/editor_mapselect.cc'
--- src/ui_fsmenu/editor_mapselect.cc	2013-07-26 20:19:36 +0000
+++ src/ui_fsmenu/editor_mapselect.cc	2013-07-31 18:38:25 +0000
@@ -49,7 +49,7 @@
 	m_title
 		(this,
 		 get_w() / 2, get_h() * 9 / 50,
-		 _("Choose your map!"), UI::Align_HCenter),
+		 _("Choose a map"), UI::Align_HCenter),
 	m_label_name
 		(this,
 		 get_w() * 7 / 10, get_h() * 17 / 50,

=== modified file 'src/ui_fsmenu/loadgame.cc'
--- src/ui_fsmenu/loadgame.cc	2013-07-26 20:19:36 +0000
+++ src/ui_fsmenu/loadgame.cc	2013-07-31 18:38:25 +0000
@@ -73,7 +73,7 @@
 	m_title
 		(this,
 		 get_w() / 2, get_h() * 3 / 20,
-		 _("Choose saved game!"), UI::Align_HCenter),
+		 _("Choose saved game"), UI::Align_HCenter),
 	m_label_mapname
 		(this,
 		 get_w() * 7 / 10,  get_h() * 17 / 50,

=== modified file 'src/ui_fsmenu/loadreplay.cc'
--- src/ui_fsmenu/loadreplay.cc	2013-07-26 20:19:36 +0000
+++ src/ui_fsmenu/loadreplay.cc	2013-07-31 18:38:25 +0000
@@ -64,7 +64,7 @@
 	m_title
 		(this,
 		 get_w() / 2, get_h() * 3 / 20,
-		 _("Choose a replay!"), UI::Align_HCenter),
+		 _("Choose a replay"), UI::Align_HCenter),
 	m_label_mapname
 		(this,
 		 get_w() * 7 / 10,  get_h() * 17 / 50,

=== modified file 'src/ui_fsmenu/mapselect.cc'
--- src/ui_fsmenu/mapselect.cc	2013-07-26 20:19:36 +0000
+++ src/ui_fsmenu/mapselect.cc	2013-07-31 18:38:25 +0000
@@ -51,7 +51,7 @@
 	m_title
 		(this,
 		 get_w() / 2, get_h() * 7 / 50,
-		 _("Choose your map!"),
+		 _("Choose a map"),
 		 UI::Align_HCenter),
 	m_label_load_map_as_scenario
 		(this,