widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #00120
[Merge] lp:~hjd/widelands/typos-n-stuff into lp:widelands
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/typos-n-stuff into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Fixed some small typos.
--
https://code.launchpad.net/~hjd/widelands/typos-n-stuff/+merge/37342
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/typos-n-stuff into lp:widelands.
=== 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 @@
order_msg_8_mines_up = {
title=_"The advisor",
body =khantrukh(_"Khantrukh interrupts...", _
-[[ "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." ]]
+[[ "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." ]]
)
}
=== 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 @@
for idx,plr in ipairs(plrs) do
msg = msg .. "\n"
msg = msg .. _ ("%s has "):format(plr.name)
- msg = msg .. _ ("%i trees at the moment ."):format(playerpoints[plr.number])
+ msg = msg .. _ ("%i trees at the moment."):format(playerpoints[plr.number])
end
broadcast(plrs, _ "Status", msg)
=== 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 @@
"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 send "
"from the host to you, but perhaps the transfer was not yet "
- "finnished!?!"),
+ "finished!?!"),
m_filename.c_str());
if (m_settings->canLaunch()) {
if (!m_is_savegame)
Follow ups