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
=== modified file 'campaigns/t02.wmf/scripting/mission_thread_texts.lua'
--- campaigns/t02.wmf/scripting/mission_thread_texts.lua 2010-05-04 13:12:04 +0000
+++ campaigns/t02.wmf/scripting/mission_thread_texts.lua 2010-10-02 10:46:45 +0000
@@ -290,7 +290,7 @@
290order_msg_8_mines_up = {290order_msg_8_mines_up = {
291 title=_"The advisor",291 title=_"The advisor",
292 body =khantrukh(_"Khantrukh interrupts...", _292 body =khantrukh(_"Khantrukh interrupts...", _
293[[ "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." ]]293[[ "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." ]]
294 )294 )
295}295}
296296
297297
=== modified file 'scripting/win_conditions/04_wood_gnome.lua'
--- scripting/win_conditions/04_wood_gnome.lua 2010-09-30 16:10:58 +0000
+++ scripting/win_conditions/04_wood_gnome.lua 2010-10-02 10:46:45 +0000
@@ -82,7 +82,7 @@
82 for idx,plr in ipairs(plrs) do82 for idx,plr in ipairs(plrs) do
83 msg = msg .. "\n"83 msg = msg .. "\n"
84 msg = msg .. _ ("%s has "):format(plr.name)84 msg = msg .. _ ("%s has "):format(plr.name)
85 msg = msg .. _ ("%i trees at the moment ."):format(playerpoints[plr.number])85 msg = msg .. _ ("%i trees at the moment."):format(playerpoints[plr.number])
86 end86 end
8787
88 broadcast(plrs, _ "Status", msg)88 broadcast(plrs, _ "Status", msg)
8989
=== modified file 'src/ui_fsmenu/launchgame.cc'
--- src/ui_fsmenu/launchgame.cc 2010-09-25 08:11:16 +0000
+++ src/ui_fsmenu/launchgame.cc 2010-10-02 10:46:45 +0000
@@ -313,7 +313,7 @@
313 "If this happens in a network game, the host might have selected "313 "If this happens in a network game, the host might have selected "
314 "a file that you do not own. Normally such a file should be send "314 "a file that you do not own. Normally such a file should be send "
315 "from the host to you, but perhaps the transfer was not yet "315 "from the host to you, but perhaps the transfer was not yet "
316 "finnished!?!"),316 "finished!?!"),
317 m_filename.c_str());317 m_filename.c_str());
318 if (m_settings->canLaunch()) {318 if (m_settings->canLaunch()) {
319 if (!m_is_savegame)319 if (!m_is_savegame)

Subscribers

People subscribed via source and target branches

to status/vote changes: