← Back to team overview

widelands-dev team mailing list archive

[Merge] lp:~hjd/widelands/sentence into lp:widelands

 

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

Requested reviews:
  Widelands Developers (widelands-dev)

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

Fix minor typos and use of capital letters.

Waited until build 17 was released before requesting, since it wouldn't have been merged then either way.
-- 
https://code.launchpad.net/~hjd/widelands/sentence/+merge/103341
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/sentence into lp:widelands.
=== modified file 'maps/MP Scenarios/Island Hopping.wmf/scripting/texts.lua'
--- maps/MP Scenarios/Island Hopping.wmf/scripting/texts.lua	2012-02-15 21:25:34 +0000
+++ maps/MP Scenarios/Island Hopping.wmf/scripting/texts.lua	2012-04-24 18:12:26 +0000
@@ -6,13 +6,13 @@
    h2(_"Rules") ..
    p(_
 [[Island Hopping is a traditional tournament in the Atlantean culture. The
-rules of the game are simple: You start with a headquarters one one island.
+rules of the game are simple: You start with a headquarters on one island.
 When you finish a castle at the end of the first island, you are granted a
 second headquarters on a second island which will contain all wares from your
 first headquarters.]]) .. p(_
 [[If you finish a castle at the target area on the second island, you will get
 a third headquarters on the third island. You must build and hold a castle at
-the center of the third island for 20 minutes to win the game]]) .. p(_
+the center of the third island for 20 minutes to win the game.]]) .. p(_
 [[Whenever you finish an island, you get bonus wares depending how many players
 have finished the island before you. The earlier you finish, the less wares you
 get. See below for the details.]]) .. p(_

=== modified file 'maps/MP Scenarios/Smugglers.wmf/scripting/texts.lua'
--- maps/MP Scenarios/Smugglers.wmf/scripting/texts.lua	2011-10-03 11:41:42 +0000
+++ maps/MP Scenarios/Smugglers.wmf/scripting/texts.lua	2012-04-24 18:12:26 +0000
@@ -5,7 +5,7 @@
    h1(_"Smugglers") ..
    h2(_"Rules") ..
    p(_
-[[Smugglers is a Fun map for 4 players. You and your partner start diagonally
+[[Smugglers is a fun map for 4 players. You and your partner start diagonally
 to each other on a X-shaped island. Each player has a point in the
 center of the map where he should place a warehouse. If both players in a
 team succeed to build their warehouse in the right spot a smuggling route

=== modified file 'src/wlapplication.cc'
--- src/wlapplication.cc	2012-03-09 18:30:18 +0000
+++ src/wlapplication.cc	2012-04-24 18:12:26 +0000
@@ -1034,8 +1034,8 @@
 
 void terminate (int) {
 	 log
-		  (_("Waited 5 seconds to close audio. problems here so killing widelands."
-			  " update your sound driver and/or SDL to fix this problem\n"));
+		  (_("Waited 5 seconds to close audio. Problems here so killing Widelands."
+			  " Update your sound driver and/or SDL to fix this problem\n"));
 #ifndef WIN32
 	raise(SIGKILL);
 #endif