Merge lp:~widelands-dev/widelands/string-fixes into lp:widelands

[GunChleoc]

Fixed editor tooltips and renamed "Noise height" to "Random height".

The tooltips were creating issues with Slavic languages.

I also renamed "Noise height" to "Random height" - I think the name was too technical.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 974. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/121219787.
Appveyor build 807. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-807.

[Miroslav Remák (miroslavr256)]

LGTM.

review: Approve

[GunChleoc (gunchleoc)]

@bunnybot merge

=== modified file 'src/editor/ui_menus/tool_change_height_options_menu.cc'
--- src/editor/ui_menus/tool_change_height_options_menu.cc	2016-04-06 17:27:10 +0000
+++ src/editor/ui_menus/tool_change_height_options_menu.cc	2016-04-08 07:36:16 +0000
@@ -22,8 +22,6 @@
 #include <cstdio>
 #include <string>
 
-#include <boost/format.hpp>
-
 #include "base/i18n.h"
 #include "editor/editorinteractive.h"
 #include "editor/tools/increase_height_tool.h"
@@ -52,16 +50,10 @@
 {
 	change_by_.set_tooltip(
 				/** TRANSLATORS: Editor change height access keys. **/
-				(boost::format(_("Use %s to increase, %s to decrease"))
-				 /** TRANSLATORS: This is an access key combination. Localize, but do not change the key. **/
-				 % _("Click")
-				 /** TRANSLATORS: This is an access key combination. Localize, but do not change the key. **/
-				 % _("Shift + Click")).str());
+				_("Click on the map to increase, Shift + Click on the map to decrease terrain height"));
 	set_to_.set_tooltip(
 				/** TRANSLATORS: Editor set height access key. **/
-				(boost::format(_("Use %s to set to this value"))
-				 /** TRANSLATORS: This is an access key combination. Localize, but do not change the key. **/
-				 % _("Ctrl + Click")).str());
+				_("Ctrl + Click on the map to set terrain height"));
 
 	change_by_.changed.connect
 		(boost::bind

=== modified file 'src/editor/ui_menus/tool_change_resources_options_menu.cc'
--- src/editor/ui_menus/tool_change_resources_options_menu.cc	2016-04-06 17:27:10 +0000
+++ src/editor/ui_menus/tool_change_resources_options_menu.cc	2016-04-08 07:36:16 +0000
@@ -68,17 +68,12 @@
 {
 	// Configure spin boxes
 	change_by_.set_tooltip(
-				/** TRANSLATORS: Editor change resources access keys. **/
-				(boost::format(_("Use %s to increase, %s to decrease"))
-				 /** TRANSLATORS: This is an access key combination. Localize, but do not change the key. **/
-				 % _("Click")
-				 /** TRANSLATORS: This is an access key combination. Localize, but do not change the key. **/
-				 % _("Shift + Click")).str());
+				/** TRANSLATORS: Editor change rseources access keys. **/
+				_("Click on the map to increase, "
+				  "Shift + Click on the map to decrease the amount of the selected resource"));
 	set_to_.set_tooltip(
-				/** TRANSLATORS: Editor set resources access key. **/
-				(boost::format(_("Use %s to set to this value"))
-				 /** TRANSLATORS: This is an access key combination. Localize, but do not change the key. **/
-				 % _("Ctrl + Click")).str());
+				/** TRANSLATORS: Editor set rseources access key. **/
+				_("Ctrl + Click on the map to set the amount of the selected resource"));
 
 	change_by_.changed.connect
 		(boost::bind

=== modified file 'src/editor/ui_menus/tool_menu.cc'
--- src/editor/ui_menus/tool_menu.cc	2016-04-06 09:23:04 +0000
+++ src/editor/ui_menus/tool_menu.cc	2016-04-08 07:36:16 +0000
@@ -64,7 +64,7 @@
    pos.x += width + spacing;                                                  \
 
 	ADD_BUTTON("change_height",    _("Change height"));
-	ADD_BUTTON("noise_height",     _("Noise height"));
+	ADD_BUTTON("noise_height",     _("Random height"));
 	ADD_BUTTON("set_terrain",      _("Terrain"));
 	ADD_BUTTON("place_immovable",  _("Immovables"));
 	ADD_BUTTON("place_bob",        _("Animals"));

=== modified file 'src/editor/ui_menus/tool_noise_height_options_menu.cc'
--- src/editor/ui_menus/tool_noise_height_options_menu.cc	2016-04-07 06:06:42 +0000
+++ src/editor/ui_menus/tool_noise_height_options_menu.cc	2016-04-08 07:36:16 +0000
@@ -21,8 +21,6 @@
 
 #include <cstdio>
 
-#include <boost/format.hpp>
-
 #include "base/i18n.h"
 #include "editor/editorinteractive.h"
 #include "editor/tools/decrease_height_tool.h"
@@ -40,7 +38,7 @@
 	 EditorNoiseHeightTool   & noise_tool,
 	 UI::UniqueWindow::Registry & registry)
 	:
-	EditorToolOptionsMenu(parent, registry, 300, 120, _("Noise Height Options")),
+	EditorToolOptionsMenu(parent, registry, 300, 120, _("Random Height Options")),
 	noise_tool_(noise_tool),
 	box_(this, hmargin(), vmargin(), UI::Box::Vertical, 0, 0, vspacing()),
 	lower_(&box_, 0, 0, get_inner_w() - 2 * hmargin(), 80,
@@ -60,16 +58,14 @@
 			  UI::SpinBox::Type::kSmall)
 {
 	lower_.set_tooltip(
-				/** TRANSLATORS: Editor noise height access keys. **/
-				_("Click to set the height to a random value within the specified range"));
+				/** TRANSLATORS: Editor random height access key. **/
+				_("Click on the map to set terrain height to a random value within the specified range"));
 	upper_.set_tooltip(
-				/** TRANSLATORS: Editor noise height access keys. **/
-				_("Click to set the height to a random value within the specified range"));
+				/** TRANSLATORS: Editor random height access key. **/
+				_("Click on the map to set terrain height to a random value within the specified range"));
 	set_to_.set_tooltip(
-				/** TRANSLATORS: Editor set hoise height access keys. **/
-				(boost::format(_("Use %s to set to this value"))
-				 /** TRANSLATORS: This is an access key combination. Localize, but do not change the key. **/
-				 % _("Ctrl + Click")).str());
+				/** TRANSLATORS: Editor set height access key. **/
+				_("Ctrl + Click on the map to set terrain height"));
 
 	lower_.changed.connect
 		(boost::bind