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

[Hans Joachim Desserud]

Fixes and improvements for various strings. See individual commit messages for details.

[SirVer (sirver)]

Very reasonable fixes, imho. Merged.

review: Approve

=== modified file 'maps/Four Mountains.wmf/elemental'
--- maps/Four Mountains.wmf/elemental	2012-03-09 10:37:34 +0000
+++ maps/Four Mountains.wmf/elemental	2013-07-18 14:41:44 +0000
@@ -6,6 +6,6 @@
 world="winterland"
 name=_ "Four Mountains"
 author="Quappo"
-descr=_ "Each tribe is surrounded by four mighty mountains. Who will first conquer them and claim the resources for his own tribe? Hint I: Water can be found along the river. Hint II: Snowmen mark additional water sources. Hint 3: Each mountain contains only one resource."
+descr=_ "Each tribe is surrounded by four mighty mountains. Who will first conquer them and claim the resources for his own tribe? Hint I: Water can be found along the river. Hint II: Snowmen mark additional water sources. Hint III: Each mountain contains only one resource."
 hint=_ "Suggested Teams: (blue, red) vs (yellow, green) or (blue, green) vs (red, yellow)"
 tags="official,ffa,2teams"

=== modified file 'scripting/win_condition_texts.lua'
--- scripting/win_condition_texts.lua	2013-07-10 05:09:06 +0000
+++ scripting/win_condition_texts.lua	2013-07-18 14:41:44 +0000
@@ -50,6 +50,7 @@
 }
 
 game_status_territoral_lord_time = {
-  end_in = _ "game will end in %i minutes.",
+  end_in = _ "The game will end in %i minutes.",
+  end_in_or = _ "Otherwise the game will end in %i minutes.",
   land = _ "%s %s %i%% of the land (%i of %i)."
 }

=== modified file 'scripting/win_conditions/03_territorial_time.lua'
--- scripting/win_conditions/03_territorial_time.lua	2012-02-26 19:26:06 +0000
+++ scripting/win_conditions/03_territorial_time.lua	2013-07-18 14:41:44 +0000
@@ -200,11 +200,10 @@
 					else
 						msg = msg .. msg1 .. "\n\n"
 					end
-					msg = msg .. "Otherwise the "
+					msg = msg .. game_status_territoral_lord_time.end_in_or:format(remaining_max_time/60)
 				else
-					msg = msg .. "The "
+					msg = msg .. game_status_territoral_lord_time.end_in:format(remaining_max_time/60)
 				end
-				msg = msg .. game_status_territoral_lord_time.end_in:format(remaining_max_time/60)
 				msg = msg .. "\n\n"
 				msg = msg .. game_status.body
 				msg = msg .. _status(points, "has")

=== modified file 'src/network/nethost.cc'
--- src/network/nethost.cc	2013-07-16 13:26:14 +0000
+++ src/network/nethost.cc	2013-07-18 14:41:44 +0000
@@ -737,7 +737,7 @@
 			s.get_string
 				("dedicated_motd",
 				 (format
-					(_("This is a dedicated server send \"@%s help\" to get a full list of available commands."))
+					(_("This is a dedicated server. Send \"@%s help\" to get a full list of available commands."))
 					% d->localplayername)
 				.str().c_str());
 

=== modified file 'txts/tips/editor.tip'
--- txts/tips/editor.tip	2010-04-28 21:13:58 +0000
+++ txts/tips/editor.tip	2013-07-18 14:41:44 +0000
@@ -19,7 +19,7 @@
 sec=6
 
 [Tip 6]
-text=_"The number keys (1 - 0) allow you to directly set the size of the selected area around your mouse."
+text=_"The number keys (1 - 0) allow you to directly set the size of the selected area around your mouse cursor."
 sec=6
 
 [Tip 7]

=== modified file 'txts/tips/general_game.tip'
--- txts/tips/general_game.tip	2013-03-09 08:26:39 +0000
+++ txts/tips/general_game.tip	2013-07-18 14:41:44 +0000
@@ -27,8 +27,8 @@
 sec=5
 
 [Tip 8]
-text=_Use the 'configure economy' menu to adjust the target quantity of a specific ware.
-sec=5
+text=_Use the 'configure economy' menu to adjust the target quantity of wares. It can be accessed via the flag menu.
+sec=7
 
 [Tip 9]
 text=_Manage your messages more efficiently: press 'N' for News to access the messages window, then use 'G' for Go To and the Delete key to archive messages.
@@ -63,9 +63,5 @@
 sec=4
 
 [Tip 17]
-text=_The 'configure economy' menu for setting up target quantities can be accessed via the flag menu.
-sec=5
-
-[Tip 18]
 text=_An economy consists of all buildings and flags connected by roads. The supplies and demands of buildings are handled in its economy.
 sec=8