Merge lp:~widelands-dev/widelands/bug_1736095_improve_text_for_resources_height into lp:widelands

[kaputtnik]

Changed texts for editor place resources and set height. Instituted policy for Title Case/Sentence case.

Changed texts for editor place resources and set height.

There is one thing with place resource: The text "Increase/Decrease Amount by:" breaks after "Amount" and is shown now in two rows.

And i am not sure if "Amount" should be uppercase.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 2953. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/315834498.
Appveyor build 2762. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1736095_improve_text_for_resources_height-2762.

[GunChleoc (gunchleoc)]

I have made some more room for the label. Dynamic width would be better for translations, but that's a problem for another day.

> And i am not sure if "Amount" should be uppercase.

Good point - we're not entirely consistent here. So, I have established some conventions (documented in the code in ui_basic) and fixed the labels. What do you think?

Conventions are inspired by:

https://wiki.eclipse.org/User_Interface_Guidelines#Capitalization

[kaputtnik (franku)]

I found another "Set Value" in the "Random height" tool and changed it.

> What do you think?

You're asking the wrong person here, i am struggling already with german spelling rules :-D

But having a general rule is good.

I tried to run through all menus with those rules in mind, at least in the editor, and found three things:

Terrains: The tooltip for each terrain says "Name: properties" starting lowercase after the colon. Not sure if this is good practice in english.

Load/Save map: There is the string "Current Directory". It should be "Current directory"? If the "Title Rule" applies here, there are other terms which should be changed, eg. in Map Options: "Map name:" -> "Map Name:" or in Random Map: "Random number" -> "Random Number"?

Bottom menu: There we have e.g. "Main Menu" and "Tool Size" but "Reset zoom" (lowercase "z"). If we apply the rule here, it should be e.g. "Main menu"? On the other side i think the bottom menu is very importand and the Tooltips are more like a Window title. So the rule "title case" would also fit and we change "Reset zoom" to "Reset Zoom"?

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 2959. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/316371193.
Appveyor build 2768. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1736095_improve_text_for_resources_height-2768.

[kaputtnik (franku)]

The text "... This will replace already set resources." is obviously wrong. At least with trunk holding down CTRL and place resources does not remove already set resources.

review: Needs Fixing

[GunChleoc (gunchleoc)]

> Terrains: The tooltip for each terrain says "Name: properties" starting lowercase after the colon. Not sure if this is good practice in english.

It is:

https://en.wikipedia.org/wiki/Colon_(punctuation)#Usage

> While it is acceptable to capitalize the first letter after the colon in American English, it is not the case in British English.

So, we can pick either one, as long as we're consistent. I like the lower-case option better, simply because it makes life easier for the BE translation.

Unlike the Eclipse project, I decided not to use Title Case in tooltips. Some of your tooltips are quite long, and would be hard to read. We could still have title case for short tooltips and sentence case for long tooltips, but then it would become confusing, because we would have to decide for each tooltip whether it is short or long.

I have fixed some more tooltips to switch them to sentence case.

> The text "... This will replace already set resources." is obviously wrong. At least with trunk holding down CTRL and place resources does not remove already set resources.

I just tested it and this is exactly what it does - I placed a lot of coal, switched to gold, held down CTRL and it gave me the set amount of gold. So, I don't know what you mean here.

[kaputtnik (franku)]

Please only one rule for tooltips.

>> The text "... This will replace already set resources." is obviously wrong. At least with trunk holding down CTRL and place resources does not remove already set resources.

> I just tested it and this is exactly what it does - I placed a lot of coal, switched to gold, held down CTRL and it gave me the set amount of gold. So, I don't know what you mean here.

Please try this:
1. Place one coal
2. Set 'Set Value' to 63
3. Choose Iron
4. Hold CTRL and replacing the coal with iron works
5. Choose Gold
6. Hold down CTRL and try to replace Iron with Gold

Now it's not working, Iron stays there. Didn't i understand how this works or is there a bug?

[GunChleoc (gunchleoc)]

You have found a bug. I've files it: https://bugs.launchpad.net/widelands/+bug/1738641

[kaputtnik (franku)]

So the new bug is what the bug description of this merge proposal depends on ;)

Is there anything left what i can do in this merge proposal then? Feel free to give me some stupid work :-)

[GunChleoc (gunchleoc)]

No, let's have it!

@bunnybot merge

review: Approve

[bunnybot (widelandsofficial)]

Error merging this proposal:

Output:
stdout:

stderr:
 M data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua
 M data/campaigns/tutorial04_economy.wmf/scripting/texts.lua
 M src/editor/editorinteractive.cc
 M src/editor/ui_menus/main_menu_load_map.cc
 M src/editor/ui_menus/main_menu_map_options.cc
 M src/editor/ui_menus/main_menu_random_map.cc
 M src/editor/ui_menus/main_menu_save_map.cc
 M src/editor/ui_menus/tool_change_height_options_menu.cc
 M src/editor/ui_menus/tool_change_resources_options_menu.cc
 M src/editor/ui_menus/tool_noise_height_options_menu.cc
 M src/logic/replay_game_controller.cc
 M src/ui_basic/button.h
 M src/ui_basic/checkbox.h
 M src/ui_basic/dropdown.h
 M src/ui_basic/editbox.h
 M src/ui_basic/listselect.h
 M src/ui_basic/messagebox.h
 M src/ui_basic/multilineeditbox.h
 M src/ui_basic/radiobutton.h
 M src/ui_basic/slider.h
 M src/ui_basic/spinbox.h
 M src/ui_basic/table.h
 M src/ui_basic/tabpanel.h
 M src/ui_basic/window.h
 M src/ui_fsmenu/internet_lobby.cc
 M src/ui_fsmenu/launch_mpg.cc
 M src/ui_fsmenu/options.cc
 M src/wlapplication.cc
 M src/wui/building_statistics_menu.cc
 M src/wui/game_options_sound_menu.cc
 M src/wui/game_statistics_menu.cc
 M src/wui/interactive_player.cc
 M src/wui/interactive_spectator.cc
 M src/wui/load_or_save_game.cc
 M src/wui/shipwindow.cc
 M src/wui/soldierlist.cc
 M src/wui/ware_statistics_menu.cc
Text conflict in src/ui_fsmenu/internet_lobby.cc
1 conflicts encountered.

[GunChleoc (gunchleoc)]

@bunnybot merge

=== modified file 'data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua'
--- data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua	2017-03-04 08:23:06 +0000
+++ data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua	2017-12-19 08:24:19 +0000
@@ -41,7 +41,7 @@
       h1(_"Let’s dive right in!") ..
       p(_[[There are three different tribes in Widelands: the Barbarians, the Empire and the Atlanteans. All tribes have a different economy, strength and weaknesses, but the general gameplay is the same for all. We will play the Barbarians for now.]]) ..
       p(_[[You will usually start the game with one headquarters. This is the big building with the blue flag in front of it. The headquarters is a warehouse that stores wares, workers and soldiers. Some wares are needed for building houses, others for making other wares. Obviously, the wares in the headquarters will not last forever, so you must make sure to replace them. The most important wares in the early game are the basic construction wares: logs and granite. Let’s make sure that we do not run out of logs. For this, we need a lumberjack and a hut for him to stay in.]]) ..
-      p(_[[We need to find a nice place for the lumberjack’s hut. To make this easier, we can activate ‘Show Building Spaces’. There are two ways you can do this, either by clicking on the ‘Show Building Spaces’ button at the bottom of the screen, which is the fourth one from the left. Or you can use the Space key to toggle it.]]) ..
+      p(_[[We need to find a nice place for the lumberjack’s hut. To make this easier, we can activate ‘Show building spaces’. There are two ways you can do this, either by clicking on the ‘Show building spaces’ button at the bottom of the screen, which is the fourth one from the left. Or you can use the Space key to toggle it.]]) ..
       paragraphdivider() ..
       listitem_bullet(_[[Left-click the ‘OK’ button to close this box and then try it.]])
    ),

=== modified file 'data/campaigns/tutorial04_economy.wmf/scripting/texts.lua'
--- data/campaigns/tutorial04_economy.wmf/scripting/texts.lua	2016-09-20 17:01:35 +0000
+++ data/campaigns/tutorial04_economy.wmf/scripting/texts.lua	2017-12-19 08:24:19 +0000
@@ -89,12 +89,12 @@
    ) ..
    rt(
       h2(_[[Now it’s your turn]]) ..
-      p(_[[This is enough explanation for now. Now try it out yourself. We want to know whether we still have taverns, so you have to choose the ‘Medium Buildings’ tab. Close the building statistics menu afterwards.]])
+      p(_[[This is enough explanation for now. Now try it out yourself. We want to know whether we still have taverns, so you have to choose the ‘Medium buildings’ tab. Close the building statistics menu afterwards.]])
    ),
    obj_name = "check_taverns",
    obj_title = _"Look up how many taverns you have.",
    obj_body = rt(
-      listitem_bullet(_[[Choose the ‘Medium Buildings’ tab in the building statistics window.]]) ..
+      listitem_bullet(_[[Choose the ‘Medium buildings’ tab in the building statistics window.]]) ..
       listitem_bullet(_[[Look up how many taverns you have.]]) ..
       listitem_arrow(_[[Below every building, there are two lines. The first one shows the number of buildings you own and how many are under construction. The second line shows the average productivity if it is a production site or training site, or the stationed and desired soldiers in military buildings.]]) ..
       listitem_bullet(_[[Close the building statistics window when you are done.]])
@@ -272,7 +272,7 @@
       p(_[[In this menu window, you can select wares to see how their production or consumption has changed over time. Try it out with some wares.]]) ..
       paragraphdivider() ..
       listitem_bullet(_[[I’ll continue as soon as you click on the]])) ..
-   rt("image=images/wui/stats/menu_tab_wares_econ_health.png",p(_[[third tab (‘Economy Health’).]])
+   rt("image=images/wui/stats/menu_tab_wares_econ_health.png",p(_[[third tab (‘Economy health’).]])
    ),
    h = 250,
    show_instantly = true,

=== modified file 'src/editor/editorinteractive.cc'
--- src/editor/editorinteractive.cc	2017-12-03 08:23:27 +0000
+++ src/editor/editorinteractive.cc	2017-12-19 08:24:19 +0000
@@ -75,7 +75,7 @@
      tools_(new Tools()),
      history_(nullptr)  // history needs the undo/redo buttons
 {
-	add_toolbar_button("wui/menus/menu_toggle_menu", "menu", _("Main Menu"), &mainmenu_, true);
+	add_toolbar_button("wui/menus/menu_toggle_menu", "menu", _("Main menu"), &mainmenu_, true);
 	mainmenu_.open_window = [this] { new EditorMainMenu(*this, mainmenu_); };
 
 	add_toolbar_button(
@@ -83,7 +83,7 @@
 	toolmenu_.open_window = [this] { new EditorToolMenu(*this, toolmenu_); };
 
 	add_toolbar_button(
-	   "wui/editor/editor_menu_set_toolsize_menu", "toolsize", _("Tool Size"), &toolsizemenu_, true);
+	   "wui/editor/editor_menu_set_toolsize_menu", "toolsize", _("Tool size"), &toolsizemenu_, true);
 	toolsizemenu_.open_window = [this] { new EditorToolsizeMenu(*this, toolsizemenu_); };
 
 	add_toolbar_button(
@@ -96,18 +96,18 @@
 	toolbar()->add_space(15);
 
 	toggle_buildhelp_ = add_toolbar_button(
-	   "wui/menus/menu_toggle_buildhelp", "buildhelp", _("Show Building Spaces (on/off)"));
+	   "wui/menus/menu_toggle_buildhelp", "buildhelp", _("Show building spaces (on/off)"));
 	toggle_buildhelp_->sigclicked.connect(boost::bind(&EditorInteractive::toggle_buildhelp, this));
 	toggle_immovables_ = add_toolbar_button(
-	   "wui/menus/menu_toggle_immovables", "immovables", _("Show Immovables (on/off)"));
+	   "wui/menus/menu_toggle_immovables", "immovables", _("Show immovables (on/off)"));
 	toggle_immovables_->set_perm_pressed(true);
 	toggle_immovables_->sigclicked.connect([this]() { toggle_immovables(); });
 	toggle_bobs_ =
-	   add_toolbar_button("wui/menus/menu_toggle_bobs", "animals", _("Show Animals (on/off)"));
+	   add_toolbar_button("wui/menus/menu_toggle_bobs", "animals", _("Show animals (on/off)"));
 	toggle_bobs_->set_perm_pressed(true);
 	toggle_bobs_->sigclicked.connect([this]() { toggle_bobs(); });
 	toggle_resources_ = add_toolbar_button(
-	   "wui/menus/menu_toggle_resources", "resources", _("Show Resources (on/off)"));
+	   "wui/menus/menu_toggle_resources", "resources", _("Show resources (on/off)"));
 	toggle_resources_->set_perm_pressed(true);
 	toggle_resources_->sigclicked.connect([this]() { toggle_resources(); });
 
@@ -163,7 +163,7 @@
 	std::unique_ptr<Widelands::MapLoader> ml(map->get_correct_loader(filename));
 	if (!ml.get())
 		throw WLWarning(
-		   _("Unsupported format"),
+		   _("Unsupported Format"),
 		   _("Widelands could not load the file \"%s\". The file format seems to be incompatible."),
 		   filename.c_str());
 	ml->preload_map(true);

=== modified file 'src/editor/ui_menus/main_menu_load_map.cc'
--- src/editor/ui_menus/main_menu_load_map.cc	2017-01-25 18:55:59 +0000
+++ src/editor/ui_menus/main_menu_load_map.cc	2017-12-19 08:24:19 +0000
@@ -71,7 +71,7 @@
 		boost::replace_first(display_dir, "MP_Scenarios", _("Multiplayer Scenarios"));
 	}
 	/** TRANSLATORS: The folder that a file will be saved to. */
-	directory_info_.set_text((boost::format(_("Current Directory: %s")) % display_dir).str());
+	directory_info_.set_text((boost::format(_("Current directory: %s")) % display_dir).str());
 }
 
 /**

=== modified file 'src/editor/ui_menus/main_menu_map_options.cc'
--- src/editor/ui_menus/main_menu_map_options.cc	2017-08-19 22:22:20 +0000
+++ src/editor/ui_menus/main_menu_map_options.cc	2017-12-19 08:24:19 +0000
@@ -106,7 +106,7 @@
 	                                  g_gr->images().get("images/ui_basic/but1.png"),
 	                                  g_gr->images().get("images/ui_basic/but1.png"));
 
-	main_box_.add(new UI::Textarea(&main_box_, 0, 0, max_w_, labelh_, _("Map Name:")));
+	main_box_.add(new UI::Textarea(&main_box_, 0, 0, max_w_, labelh_, _("Map name:")));
 	main_box_.add(&name_);
 	main_box_.add_space(indent_);
 

=== modified file 'src/editor/ui_menus/main_menu_random_map.cc'
--- src/editor/ui_menus/main_menu_random_map.cc	2017-08-20 17:45:42 +0000
+++ src/editor/ui_menus/main_menu_random_map.cc	2017-12-19 08:24:19 +0000
@@ -189,7 +189,7 @@
      island_mode_(&box_, Vector2i::zero(), _("Island mode")),
      // Geeky stuff
      map_number_box_(&box_, 0, 0, UI::Box::Horizontal, 0, 0, margin_),
-     map_number_label_(&map_number_box_, 0, 0, _("Random Number:")),
+     map_number_label_(&map_number_box_, 0, 0, _("Random number:")),
      map_number_edit_(&map_number_box_,
                       0,
                       0,

=== modified file 'src/editor/ui_menus/main_menu_save_map.cc'
--- src/editor/ui_menus/main_menu_save_map.cc	2017-12-02 11:41:19 +0000
+++ src/editor/ui_menus/main_menu_save_map.cc	2017-12-19 08:24:19 +0000
@@ -221,7 +221,7 @@
 	curdir_ = filename;
 	directory_info_.set_text(
 	   /** TRANSLATORS: The folder that a file will be saved to. */
-	   (boost::format(_("Current Directory: %s")) % (_("My Maps") + curdir_.substr(basedir_.size())))
+	   (boost::format(_("Current directory: %s")) % (_("My Maps") + curdir_.substr(basedir_.size())))
 	      .str());
 }
 

=== modified file 'src/editor/ui_menus/tool_change_height_options_menu.cc'
--- src/editor/ui_menus/tool_change_height_options_menu.cc	2017-02-25 11:17:28 +0000
+++ src/editor/ui_menus/tool_change_height_options_menu.cc	2017-12-19 08:24:19 +0000
@@ -44,7 +44,7 @@
                 increase_tool_.get_change_by(),
                 1,
                 MAX_FIELD_HEIGHT_DIFF,
-                _("Increase/Decrease Value:"),
+                _("Increase/Decrease height by:"),
                 UI::SpinBox::Units::kNone,
                 g_gr->images().get("images/ui_basic/but1.png"),
                 UI::SpinBox::Type::kSmall),
@@ -56,7 +56,7 @@
              increase_tool_.set_tool().get_interval().min,
              0,
              MAX_FIELD_HEIGHT,
-             _("Set Value:"),
+             _("Set height to:"),
              UI::SpinBox::Units::kNone,
              g_gr->images().get("images/ui_basic/but1.png"),
              UI::SpinBox::Type::kSmall) {

=== modified file 'src/editor/ui_menus/tool_change_resources_options_menu.cc'
--- src/editor/ui_menus/tool_change_resources_options_menu.cc	2017-09-01 15:45:59 +0000
+++ src/editor/ui_menus/tool_change_resources_options_menu.cc	2017-12-19 08:24:19 +0000
@@ -46,7 +46,7 @@
    EditorInteractive& parent,
    EditorIncreaseResourcesTool& increase_tool,
    UI::UniqueWindow::Registry& registry)
-   : EditorToolOptionsMenu(parent, registry, 350, 120, _("Resources")),
+   : EditorToolOptionsMenu(parent, registry, 370, 120, _("Resources")),
      increase_tool_(increase_tool),
      box_(this, hmargin(), vmargin(), UI::Box::Vertical, 0, 0, vspacing()),
      change_by_(&box_,
@@ -57,7 +57,7 @@
                 increase_tool_.get_change_by(),
                 1,
                 kMaxValue,
-                _("Increase/Decrease Value:"),
+                _("Increase/Decrease amount by:"),
                 UI::SpinBox::Units::kNone,
                 g_gr->images().get("images/ui_basic/but1.png"),
                 UI::SpinBox::Type::kSmall),
@@ -69,7 +69,7 @@
              increase_tool_.set_tool().get_set_to(),
              0,
              kMaxValue,
-             _("Set Value:"),
+             _("Set amount to:"),
              UI::SpinBox::Units::kNone,
              g_gr->images().get("images/ui_basic/but1.png"),
              UI::SpinBox::Type::kSmall),
@@ -82,7 +82,7 @@
 	     "Shift + Click on the map to decrease the amount of the selected resource"));
 	set_to_.set_tooltip(
 	   /** TRANSLATORS: Editor set rseources access key. **/
-	   _("Ctrl + Click on the map to set the amount of the selected resource"));
+	   _("Ctrl + Click on the map to set the amount of the selected resource. This will replace already set resources."));
 
 	change_by_.changed.connect(
 	   boost::bind(&EditorToolChangeResourcesOptionsMenu::update_change_by, boost::ref(*this)));
@@ -94,16 +94,16 @@
 	box_.set_size(get_inner_w() - 2 * hmargin(), change_by_.get_h() + set_to_.get_h() + vspacing());
 
 	// Add resource buttons
+	resources_box_.add_inf_space();
 	const Widelands::World& world = parent.egbase().world();
-	const Widelands::DescriptionIndex nr_resources = world.get_nr_resources();
-
-	for (Widelands::DescriptionIndex i = 0; i < nr_resources; ++i) {
+	for (Widelands::DescriptionIndex i = 0; i < world.get_nr_resources(); ++i) {
 		const Widelands::ResourceDescription& resource = *world.get_resource(i);
 		radiogroup_.add_button(&resources_box_, Vector2i::zero(),
 		                       g_gr->images().get(resource.representative_image()),
 		                       resource.descname());
 		resources_box_.add(radiogroup_.get_first_button(), UI::Box::Resizing::kFillSpace);
 	}
+	resources_box_.add_inf_space();
 
 	box_.add_space(vspacing());
 	box_.add(&resources_box_, UI::Box::Resizing::kFullSize);

=== modified file 'src/editor/ui_menus/tool_noise_height_options_menu.cc'
--- src/editor/ui_menus/tool_noise_height_options_menu.cc	2017-02-25 11:17:28 +0000
+++ src/editor/ui_menus/tool_noise_height_options_menu.cc	2017-12-19 08:24:19 +0000
@@ -47,7 +47,7 @@
             noise_tool_.get_interval().min,
             1,
             MAX_FIELD_HEIGHT,
-            _("Minimum Height:"),
+            _("Minimum height:"),
             UI::SpinBox::Units::kNone,
             g_gr->images().get("images/ui_basic/but1.png"),
             UI::SpinBox::Type::kSmall),
@@ -59,7 +59,7 @@
             noise_tool_.get_interval().max,
             0,
             MAX_FIELD_HEIGHT,
-            _("Maximum Height:"),
+            _("Maximum height:"),
             UI::SpinBox::Units::kNone,
             g_gr->images().get("images/ui_basic/but1.png"),
             UI::SpinBox::Type::kSmall),
@@ -71,7 +71,7 @@
              noise_tool_.set_tool().get_interval().min,
              0,
              MAX_FIELD_HEIGHT,
-             _("Set Value:"),
+             _("Set height to:"),
              UI::SpinBox::Units::kNone,
              g_gr->images().get("images/ui_basic/but1.png"),
              UI::SpinBox::Type::kSmall) {
@@ -93,14 +93,14 @@
 	   boost::bind(&EditorToolNoiseHeightOptionsMenu::update_set_to, boost::ref(*this)));
 
 	UI::Textarea* label =
-	   new UI::Textarea(&box_, 0, 0, 0, 0, _("Random Height"), UI::Align::kCenter);
+	   new UI::Textarea(&box_, 0, 0, 0, 0, _("Random height"), UI::Align::kCenter);
 	label->set_fixed_width(get_inner_w() - 2 * hmargin());
 	box_.add(label);
 	box_.add(&upper_);
 	box_.add(&lower_);
 
 	box_.add_space(2 * vspacing());
-	label = new UI::Textarea(&box_, 0, 0, 0, 0, _("Fixed Height"), UI::Align::kCenter);
+	label = new UI::Textarea(&box_, 0, 0, 0, 0, _("Fixed height"), UI::Align::kCenter);
 	label->set_fixed_width(get_inner_w() - 2 * hmargin());
 	box_.add(label);
 	box_.add(&set_to_);

=== modified file 'src/logic/replay_game_controller.cc'
--- src/logic/replay_game_controller.cc	2017-08-19 22:22:20 +0000
+++ src/logic/replay_game_controller.cc	2017-12-19 08:24:19 +0000
@@ -94,7 +94,7 @@
 
 void ReplayGameController::CmdReplayEnd::execute(Widelands::Game& game) {
 	game.game_controller()->set_desired_speed(0);
-	UI::WLMessageBox mmb(game.get_ibase(), _("End of replay"),
+	UI::WLMessageBox mmb(game.get_ibase(), _("End of Replay"),
 	                     _("The end of the replay has been reached and the game has "
 	                       "been paused. You may unpause the game and continue watching "
 	                       "if you want to."),

=== modified file 'src/ui_basic/button.h'
--- src/ui_basic/button.h	2017-11-27 08:21:32 +0000
+++ src/ui_basic/button.h	2017-12-19 08:24:19 +0000
@@ -59,6 +59,9 @@
 		kUnscaled  // Show the foreground image without any scaling
 	};
 
+	/**
+	 * Text conventions: Title Case for the 'title_text', Sentence case for the 'tooltip_text'
+	 */
 	Button  /// for textual buttons
 	   (Panel* const parent,
 	    const std::string& name,
@@ -71,6 +74,9 @@
 	    const std::string& tooltip_text = std::string(),
 	    UI::Button::Style init_style = UI::Button::Style::kRaised);
 
+	/**
+	 * Text conventions: Sentence case for the 'tooltip_text'
+	 */
 	Button  /// for pictorial buttons
 	   (Panel* const parent,
 	    const std::string& name,

=== modified file 'src/ui_basic/checkbox.h'
--- src/ui_basic/checkbox.h	2017-05-21 18:15:17 +0000
+++ src/ui_basic/checkbox.h	2017-12-19 08:24:19 +0000
@@ -104,6 +104,8 @@
 
 	/**
 	 * Pictorial Checkbox
+	 *
+	 * Text conventions: Sentence case for the 'tooltip_text'
 	 */
 	Checkbox(Panel* const parent,
 	         Vector2i const p,
@@ -116,6 +118,9 @@
 	 * Textual Checkbox
 	 * If width is set to 0, the checkbox will set its width automatically.
 	 * Otherwise, it will take up multiple lines if necessary (automatic height).
+	 *
+	 *
+	 * Text conventions: Sentence case both for the 'label_text' and the 'tooltip_text'
 	 */
 	Checkbox(Panel* const parent,
 	         Vector2i const p,

=== modified file 'src/ui_basic/dropdown.h'
--- src/ui_basic/dropdown.h	2017-11-27 08:21:32 +0000
+++ src/ui_basic/dropdown.h	2017-12-19 08:24:19 +0000
@@ -132,6 +132,8 @@
 	/// \param pic          an image to illustrate the entry. Can be nullptr for textual dropdowns.
 	/// \param select_this  whether this element should be selected
 	/// \param tooltip_text a tooltip for this entry
+	///
+	/// Text conventions: Title Case for the 'name', Sentence case for the 'tooltip_text'
 	void add(const std::string& name,
 	         uint32_t value,
 	         const Image* pic = nullptr,
@@ -206,6 +208,8 @@
 	/// \param type               whether this is a textual or pictorial dropdown
 	/// \param background         the background image for this dropdown
 	/// \param button_background  the background image all buttons in this dropdown
+	///
+	/// Text conventions: Title Case for all elements
 	Dropdown(Panel* parent,
 	         int32_t x,
 	         int32_t y,

=== modified file 'src/ui_basic/editbox.h'
--- src/ui_basic/editbox.h	2017-11-26 14:44:23 +0000
+++ src/ui_basic/editbox.h	2017-12-19 08:24:19 +0000
@@ -41,6 +41,8 @@
  * released and a callback function is called.
  * If h == 0, height will be dynamic according to font set.
  * If h > 0, margin_y has no effect.
+ *
+ * Text conventions: Sentence case for labels associated with the editbox
  */
 struct EditBox : public Panel {
 	EditBox(Panel*,

=== modified file 'src/ui_basic/listselect.h'
--- src/ui_basic/listselect.h	2017-11-27 08:21:32 +0000
+++ src/ui_basic/listselect.h	2017-12-19 08:24:19 +0000
@@ -61,11 +61,17 @@
 
 	void clear();
 	void sort(const uint32_t Begin = 0, uint32_t End = std::numeric_limits<uint32_t>::max());
+	/**
+	 * Text conventions: Title Case for the 'name', Sentence case for the 'tooltip_text'
+	 */
 	void add(const std::string& name,
 	         uint32_t value,
 	         const Image* pic = nullptr,
 	         const bool select_this = false,
 	         const std::string& tooltip_text = std::string());
+	/**
+	 * Text conventions: Title Case for the 'name', Sentence case for the 'tooltip_text'
+	 */
 	void add_front(const std::string& name,
 	               const Image* pic = nullptr,
 	               const bool select_this = false,

=== modified file 'src/ui_basic/messagebox.h'
--- src/ui_basic/messagebox.h	2017-02-23 19:38:51 +0000
+++ src/ui_basic/messagebox.h	2017-12-19 08:24:19 +0000
@@ -50,6 +50,8 @@
  * \note this function is named "WLMessageBox" instead of simply "MessageBox"
  *       because else linking on Windows (even with #undef MessageBox) will
  *       not work.
+ *
+ * Text conventions: Title Case for the 'caption', Sentence case for the 'text'
 */
 struct WLMessageBox : public Window {
 	enum class MBoxType { kOk, kOkCancel };

=== modified file 'src/ui_basic/multilineeditbox.h'
--- src/ui_basic/multilineeditbox.h	2017-08-18 14:27:26 +0000
+++ src/ui_basic/multilineeditbox.h	2017-12-19 08:24:19 +0000
@@ -32,6 +32,8 @@
 /**
  * A panel that allows entering multi-line string, i.e. like a hybrid between
  * @ref Editbox and @ref MultilineTextarea
+ *
+ * Text conventions: Sentence case for labels associated with thie editbox
  */
 struct MultilineEditbox : public Panel {
 	MultilineEditbox(

=== modified file 'src/ui_basic/radiobutton.h'
--- src/ui_basic/radiobutton.h	2017-11-26 14:44:23 +0000
+++ src/ui_basic/radiobutton.h	2017-12-19 08:24:19 +0000
@@ -63,6 +63,9 @@
 	boost::signals2::signal<void(int32_t)> changedto;
 	boost::signals2::signal<void()> clicked;  //  clicked without things changed
 
+	/**
+	 * Text conventions: Sentence case for the 'tooltip'
+	 */
 	int32_t add_button(Panel* parent,
 	                   Vector2i,
 	                   const Image* pic,

=== modified file 'src/ui_basic/slider.h'
--- src/ui_basic/slider.h	2017-01-25 18:55:59 +0000
+++ src/ui_basic/slider.h	2017-12-19 08:24:19 +0000
@@ -37,6 +37,9 @@
 	friend struct DiscreteSlider;
 
 protected:
+	/**
+	 * Text conventions: Sentence case for the 'tooltip_text'
+	 */
 	Slider(Panel* parent,
 	       int32_t x,
 	       int32_t y,

=== modified file 'src/ui_basic/spinbox.h'
--- src/ui_basic/spinbox.h	2017-11-27 21:21:06 +0000
+++ src/ui_basic/spinbox.h	2017-12-19 08:24:19 +0000
@@ -48,6 +48,9 @@
 
 	enum class Units { kNone, kPixels, kMinutes, kPercent };
 
+	/**
+	 * Text conventions: Sentence case for the 'label_text' and for all values
+	 */
 	SpinBox(Panel*,
 	        int32_t x,
 	        int32_t y,

=== modified file 'src/ui_basic/table.h'
--- src/ui_basic/table.h	2017-11-27 08:21:32 +0000
+++ src/ui_basic/table.h	2017-12-19 08:24:19 +0000
@@ -66,12 +66,15 @@
 	boost::signals2::signal<void(uint32_t)> double_clicked;
 
 	/// A column that has a title is sortable (by clicking on the title).
+	///
+	/// Text conventions: Title Case for the 'title', Sentence case for the 'tooltip'
 	void add_column(uint32_t width,
 	                const std::string& title = std::string(),
 	                const std::string& tooltip = std::string(),
 	                Align = UI::Align::kLeft,
 	                TableColumnType column_type = TableColumnType::kFixed);
 
+	/// Text conventions: Title Case for the 'title'
 	void set_column_title(uint8_t col, const std::string& title);
 
 	void clear();
@@ -126,8 +129,10 @@
 	struct EntryRecord {
 		explicit EntryRecord(void* entry);
 
-		void set_picture(uint8_t col, const Image* pic, const std::string& = std::string());
-		void set_string(uint8_t col, const std::string&);
+		/// Text conventions: Title Case for the 'str'
+		void set_picture(uint8_t col, const Image* pic, const std::string& str = std::string());
+		/// Text conventions: Title Case for the 'str'
+		void set_string(uint8_t col, const std::string& str);
 		const Image* get_picture(uint8_t col) const;
 		const std::string& get_string(uint8_t col) const;
 		void* entry() const {

=== modified file 'src/ui_basic/tabpanel.h'
--- src/ui_basic/tabpanel.h	2017-06-11 20:09:05 +0000
+++ src/ui_basic/tabpanel.h	2017-12-19 08:24:19 +0000
@@ -42,7 +42,10 @@
 	friend struct TabPanel;
 
 	/** If title is not empty, this will be a textual tab.
-	 *  In that case, pic will need to be the rendered title */
+	 *  In that case, pic will need to be the rendered title
+	 *
+	 * Text conventions: Title Case for the 'title', Sentence case for the 'gtooltip'
+ */
 	Tab(TabPanel* parent,
 	    size_t id,
 	    int32_t x,
@@ -91,13 +94,18 @@
 	         const Image* background,
 	         TabPanel::Type border_type = TabPanel::Type::kNoBorder);
 
-	/** Add textual tab */
+	/** Add textual tab
+	 *
+	 * Text conventions: Title Case for the 'title', Sentence case for the 'tooltip'
+*/
 	uint32_t add(const std::string& name,
 	             const std::string& title,
 	             Panel* panel,
 	             const std::string& tooltip = std::string());
 
-	/** Add pictorial tab */
+	/** Add pictorial tab
+	 * Text conventions: Sentence case for the 'tooltip'
+ */
 	uint32_t add(const std::string& name,
 	             const Image* pic,
 	             Panel* panel,

=== modified file 'src/ui_basic/window.h'
--- src/ui_basic/window.h	2017-09-04 15:02:05 +0000
+++ src/ui_basic/window.h	2017-12-19 08:24:19 +0000
@@ -53,6 +53,7 @@
 class Window : public NamedPanel {
 public:
 	/// Do not use richtext for 'title'.
+	/// Text conventions: Title Case for the 'title'
 	Window(Panel* parent,
 	       const std::string& name,
 	       int32_t x,

=== modified file 'src/ui_fsmenu/internet_lobby.cc'
--- src/ui_fsmenu/internet_lobby.cc	2017-12-17 14:45:23 +0000
+++ src/ui_fsmenu/internet_lobby.cc	2017-12-19 08:24:19 +0000
@@ -364,7 +364,7 @@
 			   _("Widelands was unable to get the IP address of the server in time. "
 			     "There seems to be a network problem, either on your side or on the side "
 			     "of the server.\n"));
-			UI::WLMessageBox mmb(this, _("Connection timed out"), warning,
+			UI::WLMessageBox mmb(this, _("Connection Timed Out"), warning,
 			                     UI::WLMessageBox::MBoxType::kOk, UI::Align::kLeft);
 			mmb.run<UI::Panel::Returncodes>();
 			InternetGaming::ref().set_error();

=== modified file 'src/ui_fsmenu/launch_mpg.cc'
--- src/ui_fsmenu/launch_mpg.cc	2017-12-02 12:43:38 +0000
+++ src/ui_fsmenu/launch_mpg.cc	2017-12-19 08:24:19 +0000
@@ -316,7 +316,7 @@
 		if (g_fs->is_directory(filename)) {
 			// Send a warning
 			UI::WLMessageBox warning(
-			   this, _("Saved game is directory"),
+			   this, _("Saved Game is Directory"),
 			   _("WARNING:\n"
 			     "The saved game you selected is a directory."
 			     " This happens if you set the option ‘nozip’ to "

=== modified file 'src/ui_fsmenu/options.cc'
--- src/ui_fsmenu/options.cc	2017-11-25 03:57:13 +0000
+++ src/ui_fsmenu/options.cc	2017-12-19 08:24:19 +0000
@@ -125,10 +125,10 @@
                           100,  // 100 is arbitrary, will be resized in layout().
                           100,  // 100 is arbitrary, will be resized in layout().
                           24,
-                          _("In-game resolution")),
+                          _("Window Size")),
 
      fullscreen_(&box_interface_left_, Vector2i::zero(), _("Fullscreen"), "", 0),
-     inputgrab_(&box_interface_left_, Vector2i::zero(), _("Grab Input"), "", 0),
+     inputgrab_(&box_interface_left_, Vector2i::zero(), _("Grab input"), "", 0),
      sb_maxfps_(&box_interface_left_, 0, 0, 0, 0, opt.maxfps, 0, 99, _("Maximum FPS:")),
      translation_info_(&box_interface_, 0, 0, 100, 100),
 
@@ -162,8 +162,8 @@
                     UI::SpinBox::Units::kPixels),
 
      // Sound options
-     music_(&box_sound_, Vector2i::zero(), _("Enable Music"), "", 0),
-     fx_(&box_sound_, Vector2i::zero(), _("Enable Sound Effects"), "", 0),
+     music_(&box_sound_, Vector2i::zero(), _("Enable music"), "", 0),
+     fx_(&box_sound_, Vector2i::zero(), _("Enable sound effects"), "", 0),
      message_sound_(&box_sound_, Vector2i::zero(), _("Play a sound at message arrival"), "", 0),
 
      // Saving options

=== modified file 'src/wlapplication.cc'
--- src/wlapplication.cc	2017-11-25 20:29:26 +0000
+++ src/wlapplication.cc	2017-12-19 08:24:19 +0000
@@ -1204,7 +1204,7 @@
 				NetAddress addr;
 				if (!ns.get_host_address(&addr)) {
 					UI::WLMessageBox mmb(
-					   &ns, _("Invalid address"),
+					   &ns, _("Invalid Address"),
 					   _("The entered hostname or address is invalid and can’t be connected to."),
 					   UI::WLMessageBox::MBoxType::kOk);
 					mmb.run<UI::Panel::Returncodes>();

=== modified file 'src/wui/building_statistics_menu.cc'
--- src/wui/building_statistics_menu.cc	2017-12-02 11:41:19 +0000
+++ src/wui/building_statistics_menu.cc	2017-12-19 08:24:19 +0000
@@ -127,13 +127,13 @@
 
 	tab_panel_.add("building_stats_small",
 	               g_gr->images().get("images/wui/fieldaction/menu_tab_buildsmall.png"),
-	               tabs_[BuildingTab::Small], _("Small Buildings"));
+	               tabs_[BuildingTab::Small], _("Small buildings"));
 	tab_panel_.add("building_stats_medium",
 	               g_gr->images().get("images/wui/fieldaction/menu_tab_buildmedium.png"),
-	               tabs_[BuildingTab::Medium], _("Medium Buildings"));
+	               tabs_[BuildingTab::Medium], _("Medium buildings"));
 	tab_panel_.add("building_stats_big",
 	               g_gr->images().get("images/wui/fieldaction/menu_tab_buildbig.png"),
-	               tabs_[BuildingTab::Big], _("Big Buildings"));
+	               tabs_[BuildingTab::Big], _("Big buildings"));
 	tab_panel_.add("building_stats_mines",
 	               g_gr->images().get("images/wui/fieldaction/menu_tab_buildmine.png"),
 	               tabs_[BuildingTab::Mines], _("Mines"));

=== modified file 'src/wui/game_options_sound_menu.cc'
--- src/wui/game_options_sound_menu.cc	2017-01-25 18:55:59 +0000
+++ src/wui/game_options_sound_menu.cc	2017-12-19 08:24:19 +0000
@@ -25,14 +25,14 @@
 GameOptionsSoundMenu::GameOptionsSoundMenu(InteractiveGameBase& gb,
                                            UI::UniqueWindow::Registry& registry)
    : UI::UniqueWindow(&gb, "sound_options_menu", &registry, 160, 160, _("Sound Options")),
-     ingame_music(this, Vector2i(hmargin(), vmargin()), _("Enable Music")),
+     ingame_music(this, Vector2i(hmargin(), vmargin()), _("Enable music")),
      ingame_sound(this,
                   Vector2i(hmargin(), vmargin() + kStateboxSize + vspacing()),
-                  _("Enable Sound Effects")),
+                  _("Enable sound effects")),
      ingame_music_volume_label(this,
                                hmargin(),
                                vmargin() + 2 * (kStateboxSize + vspacing()) + vbigspacing(),
-                               _("Music Volume")),
+                               _("Music volume")),
      ingame_music_volume(this,
                          hmargin(),
                          vmargin() + 2 * (kStateboxSize + vspacing()) + vbigspacing() +
@@ -47,7 +47,7 @@
                                hmargin(),
                                vmargin() + 2 * (kStateboxSize + vspacing()) + vbigspacing() +
                                   2 * vspacing() + slideh() + ingame_music_volume_label.get_h(),
-                               _("Sound Effects Volume")),
+                               _("Sound effects volume")),
      ingame_sound_volume(this,
                          hmargin(),
                          vmargin() + 2 * (kStateboxSize + vspacing()) + vbigspacing() +

=== modified file 'src/wui/game_statistics_menu.cc'
--- src/wui/game_statistics_menu.cc	2017-11-30 07:41:06 +0000
+++ src/wui/game_statistics_menu.cc	2017-12-19 08:24:19 +0000
@@ -37,11 +37,11 @@
      player_(plr),
      windows_(windows),
      box_(this, 0, 0, UI::Box::Horizontal, 0, 0, 5) {
-	add_button("wui/menus/menu_general_stats", "general_stats", _("General Statistics"),
+	add_button("wui/menus/menu_general_stats", "general_stats", _("General statistics"),
 	           &windows_.general_stats);
 	add_button(
-	   "wui/menus/menu_ware_stats", "ware_stats", _("Ware Statistics"), &windows_.ware_stats);
-	add_button("wui/menus/menu_building_stats", "building_stats", _("Building Statistics"),
+	   "wui/menus/menu_ware_stats", "ware_stats", _("Ware statistics"), &windows_.ware_stats);
+	add_button("wui/menus/menu_building_stats", "building_stats", _("Building statistics"),
 	           &windows_.building_stats);
 	add_button("wui/menus/menu_stock", "stock", _("Stock"), &windows_.stock);
 	box_.set_pos(Vector2i(10, 10));

=== modified file 'src/wui/interactive_player.cc'
--- src/wui/interactive_player.cc	2017-10-24 05:38:53 +0000
+++ src/wui/interactive_player.cc	2017-12-19 08:24:19 +0000
@@ -205,7 +205,7 @@
      auto_roadbuild_mode_(global_s.get_bool("auto_roadbuild_mode", true)),
      flag_to_connect_(Widelands::Coords::null()) {
 	add_toolbar_button(
-	   "wui/menus/menu_options_menu", "options_menu", _("Main Menu"), &options_, true);
+	   "wui/menus/menu_options_menu", "options_menu", _("Main menu"), &options_, true);
 	options_.open_window = [this] { new GameOptionsMenu(*this, options_, main_windows_); };
 
 	add_toolbar_button(
@@ -221,7 +221,7 @@
 	minimap_registry().open_window = [this] { toggle_minimap(); };
 
 	toggle_buildhelp_ = add_toolbar_button(
-	   "wui/menus/menu_toggle_buildhelp", "buildhelp", _("Show Building Spaces (on/off)"));
+	   "wui/menus/menu_toggle_buildhelp", "buildhelp", _("Show building spaces (on/off)"));
 	toggle_buildhelp_->sigclicked.connect(boost::bind(&InteractiveBase::toggle_buildhelp, this));
 	reset_zoom_ = add_toolbar_button("wui/menus/menu_reset_zoom", "reset_zoom", _("Reset zoom"));
 	reset_zoom_->sigclicked.connect([this] {
@@ -247,7 +247,7 @@
 	   "wui/menus/menu_toggle_oldmessage_menu", "messages", _("Messages"), &message_menu_, true);
 	message_menu_.open_window = [this] { new GameMessageMenu(*this, message_menu_); };
 
-	add_toolbar_button("ui_basic/menu_help", "help", _("Tribal Encyclopedia"), &encyclopedia_, true);
+	add_toolbar_button("ui_basic/menu_help", "help", _("Help"), &encyclopedia_, true);
 	encyclopedia_.open_window = [this] {
 		new TribalEncyclopedia(*this, encyclopedia_, &game().lua());
 	};

=== modified file 'src/wui/interactive_spectator.cc'
--- src/wui/interactive_spectator.cc	2017-09-01 14:12:58 +0000
+++ src/wui/interactive_spectator.cc	2017-12-19 08:24:19 +0000
@@ -45,16 +45,16 @@
    : InteractiveGameBase(g, global_s, OBSERVER, multiplayer) {
 	if (is_multiplayer()) {
 		add_toolbar_button(
-		   "wui/menus/menu_options_menu", "options_menu", _("Main Menu"), &options_, true);
+		   "wui/menus/menu_options_menu", "options_menu", _("Main menu"), &options_, true);
 		options_.open_window = [this] { new GameOptionsMenu(*this, options_, main_windows_); };
 
 	} else {
 		UI::Button* button =
-		   add_toolbar_button("wui/menus/menu_exit_game", "exit_replay", _("Exit Replay"));
+		   add_toolbar_button("wui/menus/menu_exit_game", "exit_replay", _("Exit replay"));
 		button->sigclicked.connect(boost::bind(&InteractiveSpectator::exit_btn, this));
 
 		add_toolbar_button(
-		   "wui/menus/menu_save_game", "save_game", _("Save Game"), &main_windows_.savegame, true);
+		   "wui/menus/menu_save_game", "save_game", _("Save game"), &main_windows_.savegame, true);
 		main_windows_.savegame.open_window = [this] {
 			new GameMainMenuSaveGame(*this, main_windows_.savegame);
 		};
@@ -72,7 +72,7 @@
 	minimap_registry().open_window = [this] { toggle_minimap(); };
 
 	toggle_buildhelp_ = add_toolbar_button(
-	   "wui/menus/menu_toggle_buildhelp", "buildhelp", _("Show Building Spaces (on/off)"));
+	   "wui/menus/menu_toggle_buildhelp", "buildhelp", _("Show building spaces (on/off)"));
 	toggle_buildhelp_->sigclicked.connect(boost::bind(&InteractiveBase::toggle_buildhelp, this));
 
 	reset_zoom_ = add_toolbar_button("wui/menus/menu_reset_zoom", "reset_zoom", _("Reset zoom"));

=== modified file 'src/wui/load_or_save_game.cc'
--- src/wui/load_or_save_game.cc	2017-12-03 10:28:16 +0000
+++ src/wui/load_or_save_game.cc	2017-12-19 08:24:19 +0000
@@ -269,7 +269,7 @@
 
 		UI::WLMessageBox confirmationBox(
 		   parent_->get_parent()->get_parent(),
-		   ngettext("Confirm deleting file", "Confirm deleting files", no_selections), message,
+		   ngettext("Confirm Deleting File", "Confirm Deleting Files", no_selections), message,
 		   UI::WLMessageBox::MBoxType::kOkCancel);
 		do_delete = confirmationBox.run<UI::Panel::Returncodes>() == UI::Panel::Returncodes::kOk;
 	}

=== modified file 'src/wui/shipwindow.cc'
--- src/wui/shipwindow.cc	2017-08-17 15:34:45 +0000
+++ src/wui/shipwindow.cc	2017-12-19 08:24:19 +0000
@@ -169,7 +169,7 @@
 						UI::WLMessageBox messagebox(
 						   get_parent(),
 						   /** TRANSLATORS: Window label when an expedition can't be canceled */
-						   _("Cancel expedition"), _("This expedition can’t be canceled, because the "
+						   _("Cancel Expedition"), _("This expedition can’t be canceled, because the "
 						                             "ship has no port to return to."),
 						   UI::WLMessageBox::MBoxType::kOk);
 						messagebox.run<UI::Panel::Returncodes>();

=== modified file 'src/wui/soldierlist.cc'
--- src/wui/soldierlist.cc	2017-11-24 21:34:17 +0000
+++ src/wui/soldierlist.cc	2017-12-19 08:24:19 +0000
@@ -398,10 +398,10 @@
 	if (upcast(Widelands::MilitarySite, ms, &building)) {
 		soldier_preference_.add_button(buttons, Vector2i::zero(),
 		                               g_gr->images().get("images/wui/buildings/prefer_rookies.png"),
-		                               _("Prefer Rookies"));
+		                               _("Prefer rookies"));
 		soldier_preference_.add_button(buttons, Vector2i(32, 0),
 		                               g_gr->images().get("images/wui/buildings/prefer_heroes.png"),
-		                               _("Prefer Heroes"));
+		                               _("Prefer heroes"));
 		UI::Radiobutton* button = soldier_preference_.get_first_button();
 		while (button) {
 			buttons->add(button);

=== modified file 'src/wui/ware_statistics_menu.cc'
--- src/wui/ware_statistics_menu.cc	2017-11-29 12:41:18 +0000
+++ src/wui/ware_statistics_menu.cc	2017-12-19 08:24:19 +0000
@@ -138,7 +138,7 @@
 	                            Widelands::kStatisticsSampleTime, WuiPlotArea::Plotmode::kRelative);
 
 	tabs->add(
-	   "economy_health", g_gr->images().get(pic_tab_economy), plot_economy_, _("Economy Health"));
+	   "economy_health", g_gr->images().get(pic_tab_economy), plot_economy_, _("Economy health"));
 
 	plot_stock_ =
 	   new WuiPlotArea(tabs, 0, 0, kPlotWidth, kPlotHeight + kSpacing,