widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #00556
[Merge] lp:~alocritani/widelands/translations_typos into lp:widelands
Angelo Locritani has proposed merging lp:~alocritani/widelands/translations_typos into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~alocritani/widelands/translations_typos/+merge/86407
fixed a bit of misspelled words.
--
https://code.launchpad.net/~alocritani/widelands/translations_typos/+merge/86407
Your team Widelands Developers is requested to review the proposed merge of lp:~alocritani/widelands/translations_typos into lp:widelands.
=== modified file 'campaigns/t01.wmf/scripting/texts.lua'
--- campaigns/t01.wmf/scripting/texts.lua 2010-11-15 21:23:02 +0000
+++ campaigns/t01.wmf/scripting/texts.lua 2011-12-20 14:35:43 +0000
@@ -58,7 +58,7 @@
_"The elder remarks..." ..
"</p></rt><rt image=map:khantrukh.png><p line-spacing=3 font-size=12>" ..
_[[ "Obviously, it would be too exhausting for our people to walk all the way to the lumberjack's hut through the wilderness. We will have to build a road between our hall and the lumberjack's hut. It's not a hard guess that the men would appreciate a way as short and plain as possible - the wood will surely be heavy enough, nevertheless."<br><br>-- NEW OBJECTIVE --<br> ]] ..
-_"* Build a road between your headquarters and the construction site of the lumberjack's hut.<br> When you place the lumberjack's hut, a flag is created for it. You need to connect it to another flag by building a road between them.<br> If you click on a flag and select to build a road, little symbols will appear around it to show you in which directions you can build it.<br> The colour of these symbols indicates how steep this part of the road will be. Green is for flat, yellow means steep and red stands for very steep. The steeper the road is, the harder it will be for your people to walk on it (and your wares will be transported more slowly).<br> You can click on any of the symbols to build the first part of the road there. New symbols will appear to show you where the next part of the road can go, and so on. However, you can also click farer away from the flag to build several steps at once. Click on the flag at the headquarters to finish the road." ..
+_"* Build a road between your headquarters and the construction site of the lumberjack's hut.<br> When you place the lumberjack's hut, a flag is created for it. You need to connect it to another flag by building a road between them.<br> If you click on a flag and select to build a road, little symbols will appear around it to show you in which directions you can build it.<br> The colour of these symbols indicates how steep this part of the road will be. Green is for flat, yellow means steep and red stands for very steep. The steeper the road is, the harder it will be for your people to walk on it (and your wares will be transported more slowly).<br> You can click on any of the symbols to build the first part of the road there. New symbols will appear to show you where the next part of the road can go, and so on. However, you can also click farther away from the flag to build several steps at once. Click on the flag at the headquarters to finish the road." ..
"</p></rt>"
khantrukh_4 = "<rt><p font-size=24 font-face=FreeSerif font-weight=bold font-color=8080FF>" ..
=== modified file 'campaigns/t02.wmf/scripting/mission_thread_texts.lua'
--- campaigns/t02.wmf/scripting/mission_thread_texts.lua 2011-08-06 16:45:37 +0000
+++ campaigns/t02.wmf/scripting/mission_thread_texts.lua 2011-12-20 14:35:43 +0000
@@ -309,14 +309,14 @@
body=khantrukh(_"The elder jumps into the air...", _
[["Wisdom commands to seek variety.<br> North of the great mountain is a large
plain - why don't we use the space Mother Nature gave us and build a farm? I
-sure would enjoy a freshly baken pitta bread for a change..."]]) ..
+sure would enjoy a freshly baked pitta bread for a change..."]]) ..
new_objectives(obj_begin_farming)
}
order_msg_11_basic_food_began = {
title=_"Your loyal companion",
body=boldreth(_"Boldreth cheers up...", _
-[[ "Our hunters are out in the forests, Thron.<br> I promise you, before the sun sets today you will have a magnificient meal fit for the chieftain of all clans!" ]]
+[[ "Our hunters are out in the forests, Thron.<br> I promise you, before the sun sets today you will have a magnificent meal fit for the chieftain of all clans!" ]]
)
}
=== modified file 'campaigns/t03.wmf/scripting/texts.lua'
--- campaigns/t03.wmf/scripting/texts.lua 2011-07-08 11:25:40 +0000
+++ campaigns/t03.wmf/scripting/texts.lua 2011-12-20 14:35:43 +0000
@@ -90,7 +90,7 @@
body= "<rt><p line-spacing=3 font-size=12>" ..
_"* Build a warehouse to the west of the mountains." ..
"<br>" ..
-_"-> Warehouses are similiar to your headquarters, with the only difference that it is not defended by soldiers. It is often wise to build a warehouse when your territory is growing and the paths to your headquarters get longer and longer." ..
+_"-> Warehouses are similar to your headquarters, with the only difference that it is not defended by soldiers. It is often wise to build a warehouse when your territory is growing and the paths to your headquarters get longer and longer." ..
"</p></rt>",
}
=== modified file 'src/map_io/widelands_map_players_messages_data_packet.cc'
--- src/map_io/widelands_map_players_messages_data_packet.cc 2011-11-30 21:38:37 +0000
+++ src/map_io/widelands_map_players_messages_data_packet.cc 2011-12-20 14:35:43 +0000
@@ -101,7 +101,7 @@
throw game_data_error
(_
("the value %u is not allowed as duration; it is "
- "a specal value meaning forever, which is the "
+ "a special value meaning forever, which is the "
"default; omit the duration key to make the "
"message exist forever"),
Forever());
=== modified file 'src/network/netclient.cc'
--- src/network/netclient.cc 2011-12-18 22:16:48 +0000
+++ src/network/netclient.cc 2011-12-20 14:35:43 +0000
@@ -850,7 +850,7 @@
s.Unsigned8(NETCMD_CHAT);
s.String
(_
- ("/me checked the recieved file. Although md5 check summing succeded, "
+ ("/me checked the received file. Although md5 check summing succeeded, "
"I can not handle the file."));
s.send(d->sock);
}
=== modified file 'src/network/nethost.cc'
--- src/network/nethost.cc 2011-12-18 22:16:48 +0000
+++ src/network/nethost.cc 2011-12-20 14:35:43 +0000
@@ -2613,7 +2613,7 @@
case NETCMD_NEW_FILE_AVAILABLE: {
if (!file) // Do we have a file for sending
- throw DisconnectException(_("Client requests file altough none is available to send."));
+ throw DisconnectException(_("Client requests file although none is available to send."));
sendSystemChat
(_("Started to send file %s to %s!"),
file->filename.c_str(),
@@ -2624,7 +2624,7 @@
case NETCMD_FILE_PART: {
if (!file) // Do we have a file for sending
- throw DisconnectException(_("Client requests file altough none is available to send."));
+ throw DisconnectException(_("Client requests file although none is available to send."));
uint32_t part = r.Unsigned32();
std::string x = r.String();
if (x != file->md5sum) {
=== modified file 'src/ui_fsmenu/launchMPG.cc'
--- src/ui_fsmenu/launchMPG.cc 2011-11-30 21:38:37 +0000
+++ src/ui_fsmenu/launchMPG.cc 2011-12-20 14:35:43 +0000
@@ -408,7 +408,7 @@
"The file was: %s\n"
"If this happens, 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!?!"),
+ "you, but perhaps the transfer was not yet finished!?!"),
m_settings->settings().mapfilename.c_str());
if (m_settings->canLaunch())
end_modal(1);
@@ -428,7 +428,7 @@
m_client_info.set_font(m_fn, m_fs, UI_FONT_CLR_WARNING);
m_client_info.set_text
(_("The selected file can not be found. If it is not automatically "
- "transfered to you, please write the host about this problem."));
+ "transferred to you, please write the host about this problem."));
} else {
// Reset font color
m_client_info.set_font(m_fn, m_fs, UI_FONT_CLR_FG);
@@ -635,7 +635,7 @@
if (m_help)
delete m_help;
m_help = new UI::HelpWindow(this, _("Multiplayer Game Setup"), m_fs);
- m_help->add_paragraph(_("You are in the multi player launch game menu."));
+ m_help->add_paragraph(_("You are in the multiplayer launch game menu."));
m_help->add_heading(_("Client settings"));
m_help->add_paragraph
(_
@@ -665,7 +665,7 @@
m_help->add_picture_li(_("Closed."), "pics/stop.png");
m_help->add_block
(_
- ("The later three are only setable by the hosting client by left clicking the \"type\" button of a "
+ ("The later three are only settable by the hosting client by left clicking the \"type\" button of a "
"player. Hosting players can further set the initializations of each player (the set of buildings, "
"wares and workers the player starts with) and the tribe an team for computer players"));
m_help->add_block
=== modified file 'src/ui_fsmenu/launchSPG.cc'
--- src/ui_fsmenu/launchSPG.cc 2011-11-30 21:38:37 +0000
+++ src/ui_fsmenu/launchSPG.cc 2011-12-20 14:35:43 +0000
@@ -259,7 +259,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()) {
end_modal(1 + m_is_scenario);
=== modified file 'src/wlapplication.cc'
--- src/wlapplication.cc 2011-11-30 21:38:37 +0000
+++ src/wlapplication.cc 2011-12-20 14:35:43 +0000
@@ -1,4 +1,4 @@
-/*
+t/*
* Copyright (C) 2006-2011 by the Widelands Development Team
*
* This program is free software; you can redistribute it and/or
@@ -1673,7 +1673,7 @@
NetGGZ::ref().data();
if (10 < time(0) - secs)
throw warning
- (_("Connection timeouted"), "%s",
+ (_("Connection timed out"), "%s",
_
("Widelands has not been able to get the IP "
"address of the server in time.\n"
=== modified file 'tribes/atlanteans/smoked_meat/conf'
--- tribes/atlanteans/smoked_meat/conf 2010-11-02 12:13:56 +0000
+++ tribes/atlanteans/smoked_meat/conf 2011-12-20 14:35:43 +0000
@@ -1,4 +1,4 @@
-help=_Smoked meat is made out of meat in a smokery. It is delivered to the mines and training sites (labyrinth and dungeon) where the miners and soldiers prepare a nutricious lunch for themselves.
+help=_Smoked meat is made out of meat in a smokery. It is delivered to the mines and training sites (labyrinth and dungeon) where the miners and soldiers prepare a nutritious lunch for themselves.
preciousness=2
=== modified file 'tribes/barbarians/lime-burner/conf'
--- tribes/barbarians/lime-burner/conf 2010-08-01 14:35:38 +0000
+++ tribes/barbarians/lime-burner/conf 2011-12-20 14:35:43 +0000
@@ -1,4 +1,4 @@
-help=_Burns lime in the lime kilm.
+help=_Burns lime in the lime kiln.
[buildcost]
carrier=1
=== modified file 'tribes/empire/shepherd/conf'
--- tribes/empire/shepherd/conf 2011-10-03 15:51:56 +0000
+++ tribes/empire/shepherd/conf 2011-12-20 14:35:43 +0000
@@ -1,4 +1,4 @@
-help=_Keeping sheeps.
+help=_Keeping sheep.
[buildcost]
carrier=1
=== modified file 'tribes/empire/wool/conf'
--- tribes/empire/wool/conf 2009-04-27 16:01:08 +0000
+++ tribes/empire/wool/conf 2011-12-20 14:35:43 +0000
@@ -1,4 +1,4 @@
-help=_Wool is the hair of sheeps. Weaving mills use it to make cloth.
+help=_Wool is the hair of sheep. Weaving mills use it to make cloth.
default_target_quantity=4
preciousness=2
=== modified file 'worlds/greenland/conf'
--- worlds/greenland/conf 2009-01-25 19:40:02 +0000
+++ worlds/greenland/conf 2011-12-20 14:35:43 +0000
@@ -1,7 +1,7 @@
[world]
author=_The Widelands Development Team
name=_Greenland
-descr=_"These are the beauty and bountifull countries of the barbarians"
+descr=_"These are the beauty and bountiful countries of the barbarians"
[immovable types]
bush1=_Bush
Follow ups
