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

[GunChleoc]

Various string fixes for issues reported on Transifex.

Eliminated preceding and trailing whitespaces.

[SirVer (sirver)]

I reviewed offline and merged right after.

review: Approve

=== modified file 'campaigns/atl01.wmf/scripting/texts.lua'
--- campaigns/atl01.wmf/scripting/texts.lua	2015-07-26 10:45:53 +0000
+++ campaigns/atl01.wmf/scripting/texts.lua	2015-08-03 07:41:58 +0000
@@ -263,7 +263,7 @@
    {
       title = _"Sidolus Seeks Out Jundlina",
       body = sidolus(
-			_([[May Satul warm you, Jundlina. Have you considered mining for resources in the mountains around us? We are running short of quartz, crystal and diamonds for our buildings. Also we could use more iron, gold and especially coal. If we find an ample supply of those commodities, we could start producing weapons and tools; this would help enormously. Of course, we would need smelters, a weapon smithy, an armor smithy and a toolsmithy. And maybe even more.]]))
+			_([[May Satul warm you, Jundlina. Have you considered mining for resources in the mountains around us? We are running short of quartz and diamonds for our buildings. Also, we could use more iron, gold and especially coal. If we find an ample supply of those commodities, we could start producing weapons and tools; this would help enormously. Of course, we would need smelters, a weapon smithy, an armor smithy and a toolsmithy. And maybe even more.]]))
    },
    {
       title = _"Jundlina Replies",

=== modified file 'campaigns/bar01.wmf/scripting/texts.lua'
--- campaigns/bar01.wmf/scripting/texts.lua	2015-07-26 11:05:38 +0000
+++ campaigns/bar01.wmf/scripting/texts.lua	2015-08-03 07:41:58 +0000
@@ -43,7 +43,7 @@
    number = 2,
    body = objective_text(_"Build coal and iron ore mines",
       listitem_bullet(_"Build a coal mine and an iron ore mine.") ..
-      listitem_arrow(_"To do so, place a flag up on the mountain’s flank to the east (on mountain terrain though, not mountain meadow). When you click on the new flag, you can send geologists there. Because the flag is on a mountain, the geologists will search for ores; otherwise, they would search for water. Then build a mine for both kinds of resources that he will find, choosing the appropriate mine to be built:") ..
+      listitem_arrow(_"To do so, place a flag up on the mountain’s flank to the east (on mountain terrain though, not mountain meadow). When you click on the new flag, you can send geologists there. Because the flag is on a mountain, the geologists will search for ores; otherwise, they would search for water. Then build a mine for both kinds of resources that they will find, choosing the appropriate mine to be built:") ..
 		"</rt>" ..
 		rt("image=tribes/barbarians/resi_coal1/resi_00.png", p(_"a bit of coal")) ..
 		rt("image=tribes/barbarians/resi_coal2/resi_00.png", p(_"a lot of coal")) ..

=== modified file 'campaigns/emp01.wmf/scripting/texts.lua'
--- campaigns/emp01.wmf/scripting/texts.lua	2015-07-25 08:07:44 +0000
+++ campaigns/emp01.wmf/scripting/texts.lua	2015-08-03 07:41:58 +0000
@@ -85,7 +85,8 @@
 		.. paragraphdivider() ..
 		_([[Three weeks later, I returned to Fremil to speak with our king. He was furious at the Barbarians, yet forbade any attack on these tribes. He believed that our army was too weak to survive in a war against the Barbarians.]])
 		.. paragraphdivider() ..
-		_([[Still, I saw no way that I could erase my shame without fighting against these Barbarians. So, I left Fremil by boat to find a new world and a new life for myself, somewhere in the south. Now I am sailing on the perl-gulf with my family, some of my friends and a few of my best warriors.]])),
+		-- TRANSLATORS: Gulf of Perl is a place name.
+		_([[Still, I saw no way that I could erase my shame without fighting against these Barbarians. So, I left Fremil by boat to find a new world and a new life for myself, somewhere in the south. Now I am sailing on the Gulf of Perl with my family, some of my friends and a few of my best warriors.]])),
    w=500,
    posy=1,
 }
@@ -93,7 +94,7 @@
 diary_page_2 = {
    title=_"The Rough Sea",
    body= lutius(_"Diary of Lutius",
-		_([[It seems as if sailing on the perl-gulf was one of our biggest mistakes. Nature was against us and drove us into a dark, wild storm. I really don’t know how many hours have passed since the waves rose higher than our boat, but still it would be suicide to go outside.]])
+		_([[It seems as if sailing on the Gulf of Perl was one of our biggest mistakes. Nature was against us and drove us into a dark, wild storm. I really don’t know how many hours have passed since the waves rose higher than our boat, but still it would be suicide to go outside.]])
 		.. paragraphdivider() ..
 		_([[Our ship is badly damaged and is taking in more and more water. We can thank the Gods if we survive this black night with our lives.]])),
    w=400,

=== modified file 'campaigns/emp02.wmf/scripting/texts.lua'
--- campaigns/emp02.wmf/scripting/texts.lua	2015-07-25 18:16:31 +0000
+++ campaigns/emp02.wmf/scripting/texts.lua	2015-08-03 07:41:58 +0000
@@ -61,10 +61,10 @@
 
 obj_build_mining_infrastructure = {
    name = "build_mining_infrastructure ",
-   title =_"Build a stonemason and mining infrastructure",
+   title =_"Build a stonemason’s house and mining infrastructure",
    number = 7,
-   body = objective_text(_"Stonemason and Mining Infrastructure",
-      listitem_bullet(_[[Build a stonemason and then a complete mining and production infrastructure (coal mine and / or charcoal kiln, iron ore mine, toolsmithy, weapon smithy, armor smithy and smelting works).]])
+   body = objective_text(_"Stonemason’s house and Mining Infrastructure",
+      listitem_bullet(_[[Build a stonemason’s house and then a complete mining and production infrastructure (coal mine and / or charcoal kiln, iron ore mine, toolsmithy, weapon smithy, armor smithy and smelting works).]])
    ),
 }
 
@@ -176,7 +176,7 @@
    body= saledus(_"Saledus is excited",
 		_([[By the Gods, this is an unbelievable stroke of fortune! There are two more mountains, and it seems that one has a large quantity of coal and the other of iron ore. I advise you to immediately build iron ore and coal mines (or at least charcoal kilns), smelting works, toolsmithies, armor and weapon smithies.]])
 		.. paragraphdivider() ..
-		_([[However: for all these bigger buildings, we need better and more elegant building materials. So you have to build a stonemason, who will cut columns from marble.]])
+		_([[However: for all these bigger buildings, we need better and more elegant building materials. So you have to build a house for the stonemason, who will cut columns from marble.]])
 		.. paragraphdivider() ..
 		_([[After everything, we can now begin to live like we did in Fremil.]]))
 		.. new_objectives(obj_build_mining_infrastructure)

=== modified file 'campaigns/tutorial01_basic_control.wmf/scripting/texts.lua'
--- campaigns/tutorial01_basic_control.wmf/scripting/texts.lua	2015-07-26 10:48:55 +0000
+++ campaigns/tutorial01_basic_control.wmf/scripting/texts.lua	2015-08-03 07:41:58 +0000
@@ -410,7 +410,7 @@
    obj_title = _"Archive all messages in your inbox",
    obj_body = rt(
       h1(_"Archive Your Inbox Messages") ..
-      p(_[[The message window is central to fully controlling your tribe’s fortune. However, you will get a lot of messages in a real game. To keep your head straight, you should try to keep the inbox empty. ]]) ..
+      p(_[[The message window is central to fully controlling your tribe’s fortune. However, you will get a lot of messages in a real game. To keep your head straight, you should try to keep the inbox empty.]]) ..
       paragraphdivider() ..
       listitem_bullet(_[[Archive all your messages in your inbox now.]]) ..
       listitem_arrow(_[[To do so, open the message window by pressing ‘n’ or clicking the rightmost button at the very bottom of the screen. Then mark all messages by checking the check box in front of them. Then, click the ‘Archive All’ button.]])

=== modified file 'maps/MP Scenarios/Smugglers.wmf/scripting/texts.lua'
--- maps/MP Scenarios/Smugglers.wmf/scripting/texts.lua	2014-10-03 20:16:29 +0000
+++ maps/MP Scenarios/Smugglers.wmf/scripting/texts.lua	2015-08-03 07:41:58 +0000
@@ -4,10 +4,10 @@
 welcome_msg = rt(
    h1(_"Smugglers") ..
    h2(_"Rules") ..
-   p(_([[Smugglers is a fun map for 4 players. You and your partner start diagonally from each other on a point symmetric island. There are plenty of smuggling tunnels on this island, each consisting of a receiving and a sending end. ]]) ..
-   _([[To establish a smuggling route, you need to build a warehouse on a sending/receiving spot while your team mate has to build one on the corresponding receiving/sending spot. A ware is then transported every 10 seconds. ]]) ..
+   p(_([[Smugglers is a fun map for 4 players. You and your partner start diagonally from each other on a point symmetric island. There are plenty of smuggling tunnels on this island, each consisting of a receiving and a sending end.]])) ..
+   p(_([[To establish a smuggling route, you need to build a warehouse on a sending/receiving spot while your team mate has to build one on the corresponding receiving/sending spot. A ware is then transported every 10 seconds.]])) ..
 -- TRANSLATORS: %s = '<number> points'
-	_([[For harder to defend smuggling routes, you get 2 or 3 points per ware smuggled. The first team to collect %s wins.]])) ..
+	p(_([[For harder to defend smuggling routes, you get 2 or 3 points per ware smuggled. The first team to collect %s wins.]])) ..
 	rt(h2(_"A sending spot")) .. rt("image=map:send_spot.png", p(" ")) ..
 	rt(h2(_"A receiving spot")) .. rt("image=map:recv_spot.png", p(" ")) ..
 	rt(h2(_"Notes") ..

=== modified file 'maps/Trident of Fire.wmf/elemental'
--- maps/Trident of Fire.wmf/elemental	2014-10-08 19:52:48 +0000
+++ maps/Trident of Fire.wmf/elemental	2015-08-03 07:41:58 +0000
@@ -9,7 +9,6 @@
 name=_"Trident of Fire"
 author="Robnick"
 descr=_"In the vicinity of three major volcanoes, six lovely islands are inviting settlers to start a new life. Deserts and a quickly growing forest wait to be discovered. But only by becoming a naval power will your tribe be able to explore enough resources to compete with its opponents."
-hint=_"Suggested teams: red vs. green | (blue, yellow) vs. (green, orange) | (blue, black) vs. (green, red) | (blue, black, yellow) vs. (green, red, orange)"
 tags="official,seafaring,1v1,2teams,3teams"
 
 [teams00]

=== modified file 'scripting/win_conditions/collectors.lua'
--- scripting/win_conditions/collectors.lua	2015-05-06 07:15:40 +0000
+++ scripting/win_conditions/collectors.lua	2015-08-03 07:41:58 +0000
@@ -5,6 +5,7 @@
 include "scripting/coroutine.lua" -- for sleep
 include "scripting/messages.lua"
 include "scripting/formatting.lua"
+include "scripting/format_scenario.lua"
 include "scripting/table.lua"
 include "scripting/win_condition_functions.lua"
 
@@ -108,9 +109,9 @@
          points = points + lpoints
          local warename = wl.Game():get_ware_description(plr.tribe_name, ware).descname
          -- TRANSLATORS: For example: 'gold (3 P) x 4 = 12 P", P meaning "Points'
-         descr[#descr+1] = [[• ]] .. (_"  %1$s (%2$i P) x %3$i = %4$i P"):bformat(
+         descr[#descr+1] = listitem_bullet(_"%1$s (%2$i P) x %3$i = %4$i P"):bformat(
             warename, value, count, lpoints
-         ) .. "<br>"
+         )
       end
       descr[#descr+1] =  "</p>" .. h3(ngettext("Total: %i point", "Total: %i points", points)):format(points)
               .. "<p line-spacing=3 font-size=12>"
@@ -123,13 +124,21 @@
       set_textdomain("win_conditions")
       local h = math.floor(remaining_time / 60)
       local m = remaining_time % 60
+      -- TRANSLATORS: Context: 'The game will end in (2 hours and) 30 minutes.'
       local time = ""
+      if m > 0 then
+			time = (ngettext("%i minute", "%i minutes", m)):format(m)
+		end
       if h > 0 then
-         -- TRANSLATORS: Context: 'The game will end in %s.'
-         time = (_"%1$ih%2$02im"):bformat(h,m)
-      else
-         time = (ngettext("%i minute", "%i minutes", m)):format(m)
+			if m > 0 then
+				-- TRANSLATORS: Context: 'The game will end in 2 hours and 30 minutes.'
+				time = (ngettext("%1% hour and %2%", "%1% hours and %2%", h)):bformat(h, time)
+			else
+				-- TRANSLATORS: Context: 'The game will end in 2 hours.'
+				time = (ngettext("%1% hour", "%1% hours", h)):bformat(h)
+			end
       end
+      -- TRANSLATORS: Context: 'The game will end in 2 hours and 30 minutes.'
       local msg = p(_"The game will end in %s."):format(time)
       msg = msg .. "\n\n"
 

=== modified file 'src/editor/tools/editor_info_tool.cc'
--- src/editor/tools/editor_info_tool.cc	2015-02-24 13:51:38 +0000
+++ src/editor/tools/editor_info_tool.cc	2015-08-03 07:41:58 +0000
@@ -20,6 +20,7 @@
 #include "editor/tools/editor_info_tool.h"
 
 #include <cstdio>
+#include <vector>
 
 #include <boost/format.hpp>
 
@@ -54,29 +55,33 @@
 	buf += "• " + (boost::format(_("Coordinates: (%1$i, %2$i)"))
 					 % center.node.x % center.node.y).str() + "\n";
 
-	std::string temp = "";
+
+	std::vector<std::string> caps_strings;
 	Widelands::NodeCaps const caps = f.nodecaps();
 	switch (caps & Widelands::BUILDCAPS_SIZEMASK) {
-		/** TRANSLATORS: This is part of a list, e.g. Caps: medium flag walk */
-		case Widelands::BUILDCAPS_SMALL:  temp += _(" small");  break;
-		/** TRANSLATORS: This is part of a list, e.g. Caps: medium flag walk */
-		case Widelands::BUILDCAPS_MEDIUM: temp += _(" medium"); break;
-		/** TRANSLATORS: This is part of a list, e.g. Caps: medium flag walk */
-		case Widelands::BUILDCAPS_BIG:    temp += _(" big");    break;
+		/** TRANSLATORS: Editor terrain property: small building plot */
+		case Widelands::BUILDCAPS_SMALL:  caps_strings.push_back(_("small"));  break;
+		/** TRANSLATORS: Editor terrain property: medium building plot */
+		case Widelands::BUILDCAPS_MEDIUM: caps_strings.push_back(_("medium")); break;
+		/** TRANSLATORS: Editor terrain property: big building plot */
+		case Widelands::BUILDCAPS_BIG:    caps_strings.push_back(_("big"));    break;
 		default: break;
 	};
-	/** TRANSLATORS: This is part of a list, e.g. Caps: medium flag walk */
-	if (caps & Widelands::BUILDCAPS_FLAG) temp += _(" flag");
-	/** TRANSLATORS: This is part of a list, e.g. Caps: flag mine walk */
-	if (caps & Widelands::BUILDCAPS_MINE) temp += _(" mine");
-	/** TRANSLATORS: This is part of a list, e.g. Caps: big flag port walk */
-	if (caps & Widelands::BUILDCAPS_PORT) temp += _(" port");
-	/** TRANSLATORS: This is part of a list, e.g. Caps: medium flag walk */
-	if (caps & Widelands::MOVECAPS_WALK)  temp += _(" walk");
-	/** TRANSLATORS: This is part of a list, e.g. Caps: swim */
-	if (caps & Widelands::MOVECAPS_SWIM)  temp += _(" swim");
+	/** TRANSLATORS: Editor terrain property: space for a flag */
+	if (caps & Widelands::BUILDCAPS_FLAG) caps_strings.push_back(_("flag"));
+	/** TRANSLATORS: Editor terrain property: mine building plot */
+	if (caps & Widelands::BUILDCAPS_MINE) caps_strings.push_back(_("mine"));
+	/** TRANSLATORS: Editor terrain property: port space */
+	if (caps & Widelands::BUILDCAPS_PORT) caps_strings.push_back(_("port"));
+	/** TRANSLATORS: Editor terrain property: units can walk on this terrain */
+	if (caps & Widelands::MOVECAPS_WALK)  caps_strings.push_back(_("walkable"));
+	/** TRANSLATORS: Editor terrain property: units can swim on this terrain (fish, ships) */
+	if (caps & Widelands::MOVECAPS_SWIM)  caps_strings.push_back(_("swimmable"));
 
-	buf += std::string("• ") + (boost::format(_("Caps:%s")) % temp).str() + "\n";
+	buf += std::string("• ")
+			 + (boost::format(_("Caps: %s"))
+				 % i18n::localize_list(caps_strings, i18n::ConcatenateWith::COMMA)).str()
+			 + "\n";
 
 	if (f.get_owned_by() > 0) {
 		buf += std::string("• ") +
@@ -86,6 +91,7 @@
 		buf += std::string("• ") + _("Owned by: —") + "\n";
 	}
 
+	std::string temp = "";
 	temp = f.get_immovable() ? _("Has base immovable") : _("No base immovable");
 	buf += "• " + temp + "\n";
 
@@ -150,7 +156,7 @@
 
 	if (map.get_nrplayers() > 0) {
 		buf += "• " +
-		       (boost::format(_("Players: %d")) % static_cast<int>(map.get_nrplayers())).str() + "\n";
+				 (boost::format(_("Players: %u")) % static_cast<unsigned int>(map.get_nrplayers())).str() + "\n";
 	}
 	else {
 		buf += "• " + std::string(_("Players: -")) + "\n";

=== modified file 'src/editor/ui_menus/editor_main_menu_random_map.cc'
--- src/editor/ui_menus/editor_main_menu_random_map.cc	2014-11-30 18:49:38 +0000
+++ src/editor/ui_menus/editor_main_menu_random_map.cc	2015-08-03 07:41:58 +0000
@@ -57,7 +57,7 @@
 		{"greenland", _("Summer")},
 		{"winterland", _("Winter")},
 		{"desert", _("Desert")},
-		{"blackland", _("Black")},
+		{"blackland", _("Wasteland")},
 	}),
 	m_current_world(0) {
 	int32_t const offsx   =  5;

=== modified file 'src/editor/ui_menus/editor_main_menu_save_map.cc'
--- src/editor/ui_menus/editor_main_menu_save_map.cc	2015-07-25 21:12:32 +0000
+++ src/editor/ui_menus/editor_main_menu_save_map.cc	2015-08-03 07:41:58 +0000
@@ -108,7 +108,7 @@
 	posy += 20 + spacing;
 
 	new UI::Textarea
-		(this, posx, posy, descr_label_w, 20, _("Descr: "), UI::Align_CenterLeft);
+		(this, posx, posy, descr_label_w, 20, _("Descr:"), UI::Align_CenterLeft);
 	m_descr =
 		new UI::MultilineTextarea
 			(this,

=== modified file 'src/editor/ui_menus/editor_main_menu_save_map_make_directory.cc'
--- src/editor/ui_menus/editor_main_menu_save_map_make_directory.cc	2014-09-19 09:07:14 +0000
+++ src/editor/ui_menus/editor_main_menu_save_map_make_directory.cc	2015-08-03 07:41:58 +0000
@@ -35,7 +35,7 @@
 	int32_t const offsy   = 30;
 	int32_t       posy    = offsy;
 
-	new UI::Textarea(this, spacing, posy, _("Enter Directory Name: "));
+	new UI::Textarea(this, spacing, posy, _("Enter Directory Name:"));
 	posy += 20 + spacing;
 
 	m_edit =

=== modified file 'src/editor/ui_menus/editor_player_menu.cc'
--- src/editor/ui_menus/editor_player_menu.cc	2015-06-05 19:13:06 +0000
+++ src/editor/ui_menus/editor_player_menu.cc	2015-08-03 07:41:58 +0000
@@ -202,12 +202,8 @@
 	map.set_nrplayers(nr_players);
 	{ //  register new default name for this players
 		assert(nr_players <= 99); //  2 decimal digits
-		std::string number = "";
-		if (char const nr_players_10 = nr_players / 10)
-			number += '0' + nr_players_10;
-		number += '0' + nr_players % 10;
 		/** TRANSLATORS: Default player name, e.g. Player 1 */
-		const std::string name = (boost::format(_("Player %s")) % number).str();
+		const std::string name = (boost::format(_("Player %u")) % static_cast<unsigned int>(nr_players)).str();
 		map.set_scenario_player_name(nr_players, name);
 	}
 	map.set_scenario_player_tribe(nr_players, m_tribes[0]);

=== modified file 'src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc'
--- src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc	2014-12-03 20:16:51 +0000
+++ src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc	2015-08-03 07:41:58 +0000
@@ -55,7 +55,7 @@
    EditorInteractive& parent,
    EditorPlaceImmovableTool& tool,
    UI::UniqueWindow::Registry& registry)
-   : EditorToolOptionsMenu(parent, registry, 0, 0, _("Immovable Select")) {
+	: EditorToolOptionsMenu(parent, registry, 0, 0, _("Immovables")) {
 	const Widelands::World& world = parent.egbase().world();
 	multi_select_menu_.reset(
 	   new CategorizedItemSelectionMenu<Widelands::ImmovableDescr, EditorPlaceImmovableTool>(

=== modified file 'src/logic/game.cc'
--- src/logic/game.cc	2015-04-07 06:49:51 +0000
+++ src/logic/game.cc	2015-08-03 07:41:58 +0000
@@ -487,7 +487,7 @@
 					 	 "no starting position.\n"
 					 	 "You can manually add a starting position with the Widelands "
 					 	 "Editor to fix this problem."),
-					 p);
+					 static_cast<unsigned int>(p));
 			}
 		}
 

=== modified file 'src/logic/map.cc'
--- src/logic/map.cc	2015-07-25 21:12:32 +0000
+++ src/logic/map.cc	2015-08-03 07:41:58 +0000
@@ -24,6 +24,7 @@
 
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
+#include <boost/format.hpp>
 
 #include "base/log.h"
 #include "base/macros.h"
@@ -330,7 +331,7 @@
 	// <undefined> (as set before) is useless and will lead to a
 	// crash -> Widelands will search for tribe "<undefined>"
 	set_scenario_player_tribe(1, TribeDescr::get_all_tribenames()[0]);
-	set_scenario_player_name(1, _("Player 1"));
+	set_scenario_player_name(1, (boost::format(_("Player %u")) % 1).str());
 	set_scenario_player_ai(1, "");
 	set_scenario_player_closeable(1, false);
 

=== modified file 'src/logic/objective.h'
--- src/logic/objective.h	2014-07-05 16:41:51 +0000
+++ src/logic/objective.h	2015-08-03 07:41:58 +0000
@@ -33,7 +33,7 @@
 class Objective  {
 public:
 	Objective(const std::string& init_name)
-	   : m_name(init_name), m_descname(init_name), m_descr(_("no descr")), m_visible(true), m_done(false) {
+		: m_name(init_name), m_descname(init_name), m_descr(_("This objective has no description.")), m_visible(true), m_done(false) {
 	}
 
 	// Unique internal name of the objective.

=== modified file 'src/logic/player.cc'
--- src/logic/player.cc	2015-02-09 05:57:08 +0000
+++ src/logic/player.cc	2015-08-03 07:41:58 +0000
@@ -226,11 +226,11 @@
 		throw WLWarning
 			(_("Missing starting position"),
 			 _
-			 	("Widelands could not start the game, because player %u has no "
-			 	 "starting position.\n"
-			 	 "You can manually add a starting position with Widelands Editor, "
-			 	 "to fix this problem."),
-			 m_plnum);
+				("Widelands could not start the game, because player %u has "
+				 "no starting position.\n"
+				 "You can manually add a starting position with the Widelands "
+				 "Editor to fix this problem."),
+			 static_cast<unsigned int>(m_plnum));
 }
 
 

=== modified file 'src/logic/production_program.cc'
--- src/logic/production_program.cc	2015-04-21 20:32:22 +0000
+++ src/logic/production_program.cc	2015-08-03 07:41:58 +0000
@@ -1226,8 +1226,7 @@
 					 "percentage", parameters);
 		}
 		std::string description =
-			/** TRANSLATORS: %1$s = production site name, %2$s = production program name, %3$s = resource */
-			(boost::format(_("%1$s %2$s mine %3$s")) % descr->descname() % production_program_name
+			(boost::format("%1$s %2$s mine %3$s") % descr->descname() % production_program_name
 				% world.get_resource(m_resource)->descname())
 				.str();
 

=== modified file 'src/network/internet_gaming.cc'
--- src/network/internet_gaming.cc	2015-01-21 20:57:11 +0000
+++ src/network/internet_gaming.cc	2015-08-03 07:41:58 +0000
@@ -582,12 +582,14 @@
 
 			if (subcmd == IGPCMD_CHAT) {
 				// Something went wrong with the chat message the user sent.
-				message += _("Chat message could not be sent. ");
+				message += _("Chat message could not be sent.");
 				if (reason == "NO_SUCH_USER")
-					message +=
-						(boost::format
-							(InternetGamingMessages::get_message(reason)) % packet.string().c_str())
-						.str();
+					message =
+							(boost::format ("%s %s")
+							 % message
+							 % (boost::format
+								 (InternetGamingMessages::get_message(reason)) % packet.string().c_str()))
+							.str();
 			}
 
 			else if (subcmd == IGPCMD_GAME_OPEN) {

=== modified file 'src/network/netclient.cc'
--- src/network/netclient.cc	2015-02-06 16:37:25 +0000
+++ src/network/netclient.cc	2015-08-03 07:41:58 +0000
@@ -1091,8 +1091,10 @@
 		else
 			msg = NetworkGamingMessages::get_message(reason, arg);
 
-		if (trysave)
-			msg += _(" An automatic savegame will be created.");
+		if (trysave) {
+			/** TRANSLATORS: %s contains an error message. */
+			msg = (boost::format(_("%s An automatic savegame will be created.")) % msg).str();
+		}
 
 		UI::WLMessageBox mmb
 			(d->modal,

=== modified file 'src/ui_basic/spinbox.cc'
--- src/ui_basic/spinbox.cc	2014-12-06 12:22:35 +0000
+++ src/ui_basic/spinbox.cc	2015-08-03 07:41:58 +0000
@@ -124,7 +124,7 @@
 	std::string unit_text = std::to_string(sbi->value);
 	if (! sbi->unit.empty()) {
 		/** TRANSLATORS: %i = number, %s = unit, e.g. "5 pixels" in the advanced options */
-		unit_text = (boost::format(_("%i %s")) % sbi->value % sbi->unit.c_str()).str();
+		unit_text = (boost::format(_("%1$i %2$s")) % sbi->value % sbi->unit.c_str()).str();
 	}
 
 	sbi->text = new UI::Textarea
@@ -197,7 +197,7 @@
 		}
 	}
 	if (!was_in_list) {
-		sbi->text->set_text((boost::format("%i %s") % sbi->value % sbi->unit.c_str()).str());
+		sbi->text->set_text((boost::format(_("%1$i %2$s")) % sbi->value % sbi->unit.c_str()).str());
 	}
 
 	sbi->butMinus->set_enabled(sbi->min < sbi->value);
@@ -358,7 +358,7 @@
 void SpinBox::remove_replacement(int32_t value)
 {
 	if (int32_t i = find_replacement(value) >= 0) {
-		sbi->valrep[i].text = (boost::format("%i %s") % value % sbi->unit.c_str()).str();
+		sbi->valrep[i].text = (boost::format(_("%1$i %2$s")) % value % sbi->unit.c_str()).str();
 	}
 }
 

=== modified file 'src/ui_fsmenu/launch_mpg.cc'
--- src/ui_fsmenu/launch_mpg.cc	2015-01-31 16:03:59 +0000
+++ src/ui_fsmenu/launch_mpg.cc	2015-08-03 07:41:58 +0000
@@ -73,7 +73,8 @@
 			(this, "saved_game",
 			 space, y + buth + space, butw, buth,
 			 g_gr->images().get("pics/but0.png"),
-			 _("Saved game"), _("Select a saved game"), true, false);
+			 /** Translators: This is a button to select a savegame */
+			 _("Saved Game"), _("Select a saved game"), true, false);
 		btn->sigclicked.connect
 			(boost::bind
 				 (&MapOrSaveSelectionWindow::pressedButton, boost::ref(*this), 2));
@@ -294,7 +295,8 @@
 		m_wincondition.set_tooltip
 			(_("Win condition is set through the scenario"));
 	} else if (m_settings->settings().savegame) {
-		m_wincondition.set_title(_("Savegame"));
+		/** Translators: This is a game type */
+		m_wincondition.set_title(_("Saved Game"));
 		m_wincondition.set_tooltip
 			(_("The game is a saved game – the win condition was set before."));
 	} else {
@@ -429,12 +431,13 @@
 		throw WLWarning
 			(_("File not found"),
 			 _
-			 	("Widelands tried to start a game with a file that could not be "
-			 	 "found at the given path.\n"
-			 	 "The file was: %s\n"
-			 	 "If this happens, the host might have selected a file that you do "
-			 	 "not own. Normally, such a file should be sent from the host to "
-			 	 "you, but perhaps the transfer was not yet finished!?!"),
+			 ("Widelands tried to start a game with a file that could not be "
+			  "found at the given path.\n"
+			  "The file was: %s\n"
+			  "If this happens in a network game, the host might have selected "
+			  "a file that you do not own. Normally, such a file should be sent "
+			  "from the host to you, but perhaps the transfer was not yet "
+			  "finished!?!"),
 			 m_settings->settings().mapfilename.c_str());
 	if (m_settings->can_launch())
 		end_modal(1);

=== modified file 'src/ui_fsmenu/options.cc'
--- src/ui_fsmenu/options.cc	2015-05-09 09:32:07 +0000
+++ src/ui_fsmenu/options.cc	2015-08-03 07:41:58 +0000
@@ -206,7 +206,7 @@
 		 m_label_language.get_x() + m_fx.get_w() + m_padding,
 		 m_label_music.get_y() + m_label_music.get_h() + m_padding,
 		 m_language_list.get_w(), m_fx.get_h(),
-		 _("Enable Sound"), UI::Align_VCenter),
+		 _("Enable Sound Effects"), UI::Align_VCenter),
 
 	// Second options block 'In-game options'
 	// Title 2
@@ -221,6 +221,8 @@
 		 m_single_watchwin.get_x() + m_single_watchwin.get_w() + m_padding,
 		 m_offset_second_group,
 		 get_w() - 2 * m_hmargin - m_single_watchwin.get_w(), m_single_watchwin.get_h(),
+		 /** TRANSLATORS: A watchwindow is a window where you keep watching an object or a map region,*/
+		 /** TRANSLATORS: and it also lets you jump to it on the map. */
 		 _("Use single watchwindow mode"), UI::Align_VCenter),
 
 	m_auto_roadbuild_mode (this, Point(m_single_watchwin.get_x(),

=== modified file 'src/wui/game_options_sound_menu.cc'
--- src/wui/game_options_sound_menu.cc	2014-09-10 08:55:04 +0000
+++ src/wui/game_options_sound_menu.cc	2015-08-03 07:41:58 +0000
@@ -31,17 +31,17 @@
 ingame_music_label
 	(this,
 	 hmargin() + STATEBOX_WIDTH + hspacing(), vmargin(),
-	 _("Ingame Music")),
+	 _("Enable Music")),
 ingame_sound(this, Point(hmargin(), vmargin() + STATEBOX_HEIGHT + vspacing())),
 ingame_sound_label
 	(this,
 	 hmargin() + STATEBOX_WIDTH  + hspacing(),
 	 vmargin() + STATEBOX_HEIGHT + vspacing(),
-	 _("Sound FX")),
+	 _("Enable Sound Effects")),
 ingame_music_volume_label
 	(this,
 	 hmargin(), vmargin() + 2 * (STATEBOX_HEIGHT + vspacing()) + vbigspacing(),
-	 _("Ingame Music Volume")),
+	 _("Music Volume")),
 ingame_music_volume
 	(this,
 	 hmargin(),
@@ -55,7 +55,7 @@
 	 hmargin(),
 	 vmargin() + 2 * (STATEBOX_HEIGHT + vspacing()) + vbigspacing()
 	 + 2 * vspacing() + slideh() + ingame_music_volume_label.get_h(),
-	 _("Sound FX Volume")),
+	 _("Sound Effects Volume")),
 ingame_sound_volume
 	(this,
 	 hmargin(),

=== modified file 'src/wui/game_summary.cc'
--- src/wui/game_summary.cc	2015-05-11 19:49:47 +0000
+++ src/wui/game_summary.cc	2015-08-03 07:41:58 +0000
@@ -163,9 +163,11 @@
 		std::string stat_str;
 		switch (pes.result) {
 			case Widelands::PlayerEndResult::PLAYER_LOST:
+				/** TRANSLATORS: This is shown in the game summary for the players who have lost. */
 				stat_str = _("Lost");
 				break;
 			case Widelands::PlayerEndResult::PLAYER_WON:
+				/** TRANSLATORS: This is shown in the game summary for the players who have won. */
 				stat_str = _("Won");
 				if (!single_won) {
 					single_won = p;
@@ -174,9 +176,11 @@
 				}
 				break;
 			case Widelands::PlayerEndResult::PLAYER_RESIGNED:
+				/** TRANSLATORS: This is shown in the game summary for the players who have resigned. */
 				 stat_str = _("Resigned");
 				 break;
 			default:
+				/** TRANSLATORS: This is shown in the game summary when we don't know if the player has lost or won. */
 				stat_str = _("Unknown");
 		}
 		te.set_string(2, stat_str);

=== modified file 'src/wui/multiplayersetupgroup.cc'
--- src/wui/multiplayersetupgroup.cc	2015-01-21 21:21:46 +0000
+++ src/wui/multiplayersetupgroup.cc	2015-08-03 07:41:58 +0000
@@ -358,7 +358,8 @@
 		if (settings.scenario)
 			init->set_title(_("Scenario"));
 		else if (settings.savegame)
-			init->set_title(_("Savegame"));
+			/** Translators: This is a game type */
+			init->set_title(_("Saved Game"));
 		else {
 			std::string tribepath("tribes/" + player_setting.tribe);
 			i18n::Textdomain td(tribepath); // for translated initialisation

=== modified file 'src/wui/plot_area.cc'
--- src/wui/plot_area.cc	2015-04-23 23:34:49 +0000
+++ src/wui/plot_area.cc	2015-08-03 07:41:58 +0000
@@ -103,10 +103,13 @@
 
 std::string get_unit_name(UNIT unit) {
 	switch (unit) {
-	case UNIT_DAY:  return _("d");
-	case UNIT_HOUR: return _("h");
-	case UNIT_MIN:  return _("min");
-	default: return "invalid";
+	/** TRANSLATOR: day(s). Used in statistics. */
+	case UNIT_DAY:  return _("%1% d");
+	/** TRANSLATOR: hour(s). Used in statistics. */
+	case UNIT_HOUR: return _("%1% h");
+	/** TRANSLATOR: minute(s). Used in statistics. */
+	case UNIT_MIN:  return _("%1% min");
+	default: return "%1% invalid";
 	}
 }
 
@@ -234,7 +237,7 @@
 		 LINE_COLOR, 2);
 
 	//  print the used unit
-	const Image* xtick = UI::g_fh1->render(xtick_text_style(get_unit_name(unit)));
+	const Image* xtick = UI::g_fh1->render(xtick_text_style((boost::format(get_unit_name(unit)) % "").str()));
 	dst.blit(Point(2, spacing + 2), xtick, BlendMode::UseAlpha, UI::Align_CenterLeft);
 }
 
@@ -267,7 +270,7 @@
 	for (int32_t i = 0; i < m_game_time_id; i++) {
 		UNIT unit = get_suggested_unit(time_in_ms[i]);
 		uint32_t val = ms_to_unit(unit, time_in_ms[i]);
-		labels.push_back(boost::lexical_cast<std::string>(val) + get_unit_name(unit));
+		labels.push_back((boost::format(get_unit_name(unit)) % boost::lexical_cast<std::string>(val)).str());
 	}
 	labels.push_back(_("game"));
 	return labels;

=== modified file 'src/wui/soldierlist.cc'
--- src/wui/soldierlist.cc	2014-12-06 12:22:35 +0000
+++ src/wui/soldierlist.cc	2015-08-03 07:41:58 +0000
@@ -400,11 +400,18 @@
 	m_soldierpanel.set_click(boost::bind(&SoldierList::eject, this, _1));
 
 	const UI::TextStyle & style = UI::TextStyle::ui_small();
-	// Note the extra character in the HP: string below to fix bug 724169
+	// We don't want translators to translate this twice, so it's a bit involved.
 	uint32_t maxtextwidth = std::max
 		(style.calc_bare_width(_("Click soldier to send away")),
-		 /** TRANSLATORS: Health, Attack, Defense, Evade */
-		 style.calc_bare_width(_("HP: 8/8  AT: 8/8  DE: 8/8  EV: 8/8_")));
+		 style.calc_bare_width(
+			 (boost::format("%s ") // We need some extra space to fix bug 724169
+			  /** TRANSLATORS: Health, Attack, Defense, Evade */
+			  % (boost::format(_("HP: %1$u/%2$u  AT: %3$u/%4$u  DE: %5$u/%6$u  EV: %7$u/%8$u"))
+				  % 8 % 8
+				  % 8 % 8
+				  % 8 % 8
+				  % 8 % 8
+				  )).str()));
 	set_min_desired_breadth(maxtextwidth + 4);
 
 	UI::Box * buttons = new UI::Box(this, 0, 0, UI::Box::Horizontal);

=== modified file 'tribes/atlanteans/blackroot_farm/conf'
--- tribes/atlanteans/blackroot_farm/conf	2015-06-10 07:00:10 +0000
+++ tribes/atlanteans/blackroot_farm/conf	2015-08-03 07:41:58 +0000
@@ -41,7 +41,7 @@
 
 [out_of_resource_notification]
 title=_Out of Fields
-message=_The farmer working at this blackroot farm has no cleared soil to plant his seeds.
+message=_The blackroot farmer working at this blackroot farm has no cleared soil to plant his seeds.
 productivity_threshold=30
 
 [idle]

=== modified file 'tribes/atlanteans/dungeon/conf'
--- tribes/atlanteans/dungeon/conf	2015-03-26 06:59:37 +0000
+++ tribes/atlanteans/dungeon/conf	2015-08-03 07:41:58 +0000
@@ -36,11 +36,11 @@
 max_level=3
 
 [programs]
-sleep=_Sleep
-upgrade_soldier_attack_0=_Upgrade soldier attack from level 0 to level 1
-upgrade_soldier_attack_1=_Upgrade soldier attack from level 1 to level 2
-upgrade_soldier_attack_2=_Upgrade soldier attack from level 2 to level 3
-upgrade_soldier_attack_3=_Upgrade soldier attack from level 3 to level 4
+sleep=_sleeping
+upgrade_soldier_attack_0=_upgrading soldier attack from level 0 to level 1
+upgrade_soldier_attack_1=_upgrading soldier attack from level 1 to level 2
+upgrade_soldier_attack_2=_upgrading soldier attack from level 2 to level 3
+upgrade_soldier_attack_3=_upgrading soldier attack from level 3 to level 4
 
 [sleep]
 sleep=5000

=== modified file 'tribes/atlanteans/foresters_house/help.lua'
--- tribes/atlanteans/foresters_house/help.lua	2015-07-26 10:59:28 +0000
+++ tribes/atlanteans/foresters_house/help.lua	2015-08-03 07:41:58 +0000
@@ -15,7 +15,7 @@
 	--General Section
 	building_help_general_string("atlanteans", building_description,
 		_"Plants trees in the surrounding area.",
-		_"The foresters’s house needs free space within the work area to plant the trees.") ..
+		_"The forester’s house needs free space within the work area to plant the trees.") ..
 
 	--Dependencies
 	building_help_dependencies_production("atlanteans", building_description) ..

=== modified file 'tribes/atlanteans/horsebreeder/conf'
--- tribes/atlanteans/horsebreeder/conf	2013-07-23 20:21:03 +0000
+++ tribes/atlanteans/horsebreeder/conf	2015-08-03 07:41:58 +0000
@@ -1,4 +1,4 @@
-help=_"Breeds the strong atlantean horses"
+help=_"Breeds the strong Atlantean horses"
 
 [buildcost]
 carrier=1

=== modified file 'tribes/barbarians/warriorsax/conf'
--- tribes/barbarians/warriorsax/conf	2014-07-28 14:04:36 +0000
+++ tribes/barbarians/warriorsax/conf	2015-08-03 07:41:58 +0000
@@ -1,4 +1,4 @@
-help=_The warrior’s axe is the most dangerous of all Barbarian weapons. Only a few warriors ever were able to handle those huge and powerful axes. It is produced in a war mill and used – together with food – in a training camp to train soldiers from attack level 4 to level 5.
+help=_The warrior’s ax is the most dangerous of all Barbarian weapons. Only a few warriors ever were able to handle those huge and powerful axes. It is produced in a war mill and used – together with food – in a training camp to train soldiers from attack level 4 to level 5.
 
 default_target_quantity=1
 preciousness=1

=== modified file 'tribes/empire/foresters_house/help.lua'
--- tribes/empire/foresters_house/help.lua	2015-07-26 10:59:28 +0000
+++ tribes/empire/foresters_house/help.lua	2015-08-03 07:41:58 +0000
@@ -15,7 +15,7 @@
 	--General Section
 	building_help_general_string("empire", building_description,
 		_"Plants trees in the surrounding area.",
-		_"The foresters’s house needs free space within the work area to plant the trees.") ..
+		_"The forester’s house needs free space within the work area to plant the trees.") ..
 
 	--Dependencies
 	building_help_dependencies_production("empire", building_description) ..

=== modified file 'tribes/empire/vineyard/conf'
--- tribes/empire/vineyard/conf	2015-06-10 07:00:10 +0000
+++ tribes/empire/vineyard/conf	2015-08-03 07:41:58 +0000
@@ -41,7 +41,7 @@
 
 [out_of_resource_notification]
 title=_Out of Fields
-message=_The farmer working at this vineyard has no cleared soil to plant his seeds.
+message=_The vine farmer working at this vineyard has no cleared soil to plant his grapevines.
 productivity_threshold=30
 
 [idle]

=== modified file 'tribes/scripting/format_help.lua'
--- tribes/scripting/format_help.lua	2015-07-26 11:34:47 +0000
+++ tribes/scripting/format_help.lua	2015-08-03 07:41:58 +0000
@@ -278,17 +278,17 @@
 
 	if(building_description.type_name == "productionsite") then
 		if(building_description.workarea_radius and building_description.workarea_radius > 0) then
-			result = result .. text_line(_"Work area:", building_description.workarea_radius)
+			result = result .. text_line(_"Work area radius:", building_description.workarea_radius)
 		end
 
 	elseif(building_description.type_name == "warehouse") then
 		result = result .. rt(h3(_"Healing:")
-			.. p(_"Garrisoned soldiers heal %s per second":bformat(building_description.heal_per_second)))
+			.. p(ngettext("Garrisoned soldiers heal %d health point per second", "Garrisoned soldiers heal %s health points per second", building_description.heal_per_second):bformat(building_description.heal_per_second)))
 		result = result .. text_line(_"Conquer range:", building_description.conquers)
 
 	elseif(building_description.type_name == "militarysite") then
 		result = result .. rt(h3(_"Healing:")
-			.. p(_"Garrisoned soldiers heal %s per second":bformat(building_description.heal_per_second)))
+			.. p(ngettext("Garrisoned soldiers heal %d health point per second", "Garrisoned soldiers heal %s health points per second", building_description.heal_per_second):bformat(building_description.heal_per_second)))
 		result = result .. text_line(_"Capacity:", building_description.max_number_of_soldiers)
 		result = result .. text_line(_"Conquer range:", building_description.conquers)