Merge lp:~hjd/widelands/typos-n-stuff into lp:widelands

Proposed by Hans Joachim Desserud
Status: Merged
Merged at revision: 5557
Proposed branch: lp:~hjd/widelands/typos-n-stuff
Merge into: lp:widelands
Diff against target: 38 lines (+3/-3)
3 files modified
campaigns/t02.wmf/scripting/mission_thread_texts.lua (+1/-1)
scripting/win_conditions/04_wood_gnome.lua (+1/-1)
src/ui_fsmenu/launchgame.cc (+1/-1)
To merge this branch: bzr merge lp:~hjd/widelands/typos-n-stuff
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+37342@code.launchpad.net

Description of the change

Fixed some small typos.

To post a comment you must log in.
Revision history for this message
Chuck Wilder (chuckw20) wrote :

Looks good to me. :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'campaigns/t02.wmf/scripting/mission_thread_texts.lua'
2--- campaigns/t02.wmf/scripting/mission_thread_texts.lua 2010-05-04 13:12:04 +0000
3+++ campaigns/t02.wmf/scripting/mission_thread_texts.lua 2010-10-02 10:46:45 +0000
4@@ -290,7 +290,7 @@
5 order_msg_8_mines_up = {
6 title=_"The advisor",
7 body =khantrukh(_"Khantrukh interrupts...", _
8-[[ "While this is true, we should consider it later, for now other obstacles are at hand. The miners will definately demand greater rations for working high up on the mountain in this bitter cold, and providing these supplies may not be easy." ]]
9+[[ "While this is true, we should consider it later, for now other obstacles are at hand. The miners will definitely demand greater rations for working high up on the mountain in this bitter cold, and providing these supplies may not be easy." ]]
10 )
11 }
12
13
14=== modified file 'scripting/win_conditions/04_wood_gnome.lua'
15--- scripting/win_conditions/04_wood_gnome.lua 2010-09-30 16:10:58 +0000
16+++ scripting/win_conditions/04_wood_gnome.lua 2010-10-02 10:46:45 +0000
17@@ -82,7 +82,7 @@
18 for idx,plr in ipairs(plrs) do
19 msg = msg .. "\n"
20 msg = msg .. _ ("%s has "):format(plr.name)
21- msg = msg .. _ ("%i trees at the moment ."):format(playerpoints[plr.number])
22+ msg = msg .. _ ("%i trees at the moment."):format(playerpoints[plr.number])
23 end
24
25 broadcast(plrs, _ "Status", msg)
26
27=== modified file 'src/ui_fsmenu/launchgame.cc'
28--- src/ui_fsmenu/launchgame.cc 2010-09-25 08:11:16 +0000
29+++ src/ui_fsmenu/launchgame.cc 2010-10-02 10:46:45 +0000
30@@ -313,7 +313,7 @@
31 "If this happens in a network game, the host might have selected "
32 "a file that you do not own. Normally such a file should be send "
33 "from the host to you, but perhaps the transfer was not yet "
34- "finnished!?!"),
35+ "finished!?!"),
36 m_filename.c_str());
37 if (m_settings->canLaunch()) {
38 if (!m_is_savegame)

Subscribers

People subscribed via source and target branches

to status/vote changes: