--- a/changelog.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/changelog.txt Wed Jun 13 11:00:24 2007 +0000
@@ -1,3 +1,18 @@
+0.5.1-RC3 (2007-04-17)
+------------------------------------------------------------------------
+- Feature: Add list_patches to console commands; shows all patches and values (r9565)
+- Fix: Select "Custom" in the difficulty settings gui when changing a setting [FS#733] (r9647)
+- Fix: Building rail on steep slopes ignored build_on_slopes patch setting (r9602)
+- Fix: Wrong characters in Finnish town names (r9641)
+- Fix: When checking for no vehicle on ground-tiles, do not take into account vehicles that are in the air (r9542)
+- Fix: Bankrupt AIs no longer buy over themselves (also added safeguards to prevent in future) (r9540 / r9541)
+- Fix: When company is removed, sell all shares of the and in the company (r9533)
+- Fix: Crash when 2 or more clients joined at roughly the same time (r9529)
+- Fix: Custom currency was overwritten and fix euro introduction (r9467, r9469)
+- Fix: Values of diff_custom and snow_line in .cfg were not checked properly (r9455)
+- Fix: When deleting a vehicle which has shared orders with one more vehicle and no orders, segfaulted (r9429)
+
+
0.5.1-RC2 (2007-03-23)
------------------------------------------------------------------------
- Fix: crashes when the chatbox would be drawn outside of the main window [FS#701] (r9420)
--- a/docs/openttd.6 Tue Jun 12 11:56:35 2007 +0000
+++ b/docs/openttd.6 Wed Jun 13 11:00:24 2007 +0000
@@ -1,6 +1,6 @@
.\" Hey, EMACS: -*- nroff -*-
.\" Please adjust this date whenever revising the manpage.
-.Dd March 23, 2007
+.Dd April 17, 2007
.Dt OPENTTD 6
.Sh NAME
.Nm openttd
--- a/known-bugs.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/known-bugs.txt Wed Jun 13 11:00:24 2007 +0000
@@ -19,20 +19,21 @@
------------------------------------------------------------------------
URL: http://bugs.openttd.org
--677 Badspacing in news summaries
--674 Map signs allow less nonenglish characters than english ones
--672 Non-transparent station names' backgrounds do not resize properly upon language change
+-735 Plural rule not expanded correctly when non-numeric placeholder uses
+-732 Trains are lost after autorenewal/autoreplace
+-716 Train Crash in Depot
+-677 Badspacing in news summaries
+-674 Map signs allow less nonenglish characters than english ones
+-672 Non-transparent station names' backgrounds do not resize properly upon language change
-669 Docks/Airports/RV Stations can be built without available vehicles
-646 AI builds useless stations
--601 airports can't get flooded when they have planes in them
--599 reloaded game lost company passwords
--594 terraforming wipes out canals
+-601 Airports can't get flooded when they have planes in them
+-599 Reloaded game lost company passwords
+-594 Terraforming wipes out canals
-591 Autorenew fails under certain conditions
--583 Fatal fault or crash during startup
--571 Problems with vehicle purchase lists with NewGRFs
-559 Front-/Rear-facing engines don't line up with each other
-553 Autorenew doesn't warn when replacement isn't available
--546 [0.5.0 RC3] Inflation overflow
+-546 Overflows due to inflation
-540 Planes vanished when offered exclusive
-539 Trains can cash the same cargo multiple times
-522 overflow on vehicle costs
--- a/os/debian/changelog Tue Jun 12 11:56:35 2007 +0000
+++ b/os/debian/changelog Wed Jun 13 11:00:24 2007 +0000
@@ -4,6 +4,12 @@
-- Matthijs Kooijman <m.kooijman@student.utwente.nl> Mon, 26 Feb 2007 21:07:05 +0100
+openttd (0.5.1~rc3-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl> Tue, 17 Aprr 2007 22:00:46 +0100
+
openttd (0.5.1~rc2-1) unstable; urgency=low
* New upstream release.
--- a/os/win32/installer/install.nsi Tue Jun 12 11:56:35 2007 +0000
+++ b/os/win32/installer/install.nsi Wed Jun 13 11:00:24 2007 +0000
@@ -1,6 +1,6 @@
!define APPNAME "OpenTTD" ; Define application name
!define APPVERSION "0.5.1" ; Define application version
-!define INSTALLERVERSION 30 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
+!define INSTALLERVERSION 31 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
!define APPURLLINK "http://www.openttd.org"
!define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}"
--- a/readme.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/readme.txt Wed Jun 13 11:00:24 2007 +0000
@@ -1,6 +1,6 @@
OpenTTD README
-Last updated: 2007-03-23
-Release version: 0.5.1-RC2
+Last updated: 2007-04-17
+Release version: 0.5.1-RC3
------------------------------------------------------------------------
--- a/src/economy.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/economy.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -1671,8 +1671,9 @@
/** Cargo payment rates */
static void SaveLoad_CAPR()
{
- SlArray(&_cargo_payment_rates, NUM_CARGO, SLE_INT32);
- SlArray(&_cargo_payment_rates_frac, NUM_CARGO, SLE_UINT16);
+ uint num_cargo = CheckSavegameVersion(55) ? 12 : NUM_CARGO;
+ SlArray(&_cargo_payment_rates, num_cargo, SLE_INT32);
+ SlArray(&_cargo_payment_rates_frac, num_cargo, SLE_UINT16);
}
static const SaveLoad _economy_desc[] = {
--- a/src/engine.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/engine.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -249,6 +249,7 @@
/** Accept an engine prototype. XXX - it is possible that the top-player
* changes while you are waiting to accept the offer? Then it becomes invalid
* @param tile unused
+ * @param flags operation to perfom
* @param p1 engine-prototype offered
* @param p2 unused
*/
@@ -350,6 +351,7 @@
/** Rename an engine.
* @param tile unused
+ * @param flags operation to perfom
* @param p1 engine ID to rename
* @param p2 unused
*/
--- a/src/engine.h Tue Jun 12 11:56:35 2007 +0000
+++ b/src/engine.h Wed Jun 13 11:00:24 2007 +0000
@@ -90,7 +90,7 @@
Date base_intro;
Year lifelength;
Year base_life;
- byte unk2; ///< Carriages have the highest bit set in this one
+ byte unk2; ///< flag for carriage(bit 7) and decay speed(bits0..6)
byte load_amount;
byte climates;
uint32 refit_mask;
@@ -295,7 +295,7 @@
/**
* Remove all engine replacement settings for the player.
- * @param er The renewlist for a given player.
+ * @param erl The renewlist for a given player.
* @return The new renewlist for the player.
*/
void RemoveAllEngineReplacement(EngineRenewList* erl);
--- a/src/fios.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/fios.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -57,7 +57,7 @@
/**
* Compare two FiosItem's. Used with qsort when sorting the file list.
* @param a A pointer to the first FiosItem to compare.
- * @param a A pointer to the second FiosItem to compare.
+ * @param b A pointer to the second FiosItem to compare.
* @return -1, 0 or 1, depending on how the two items should be sorted.
*/
int CDECL compare_FiosItems(const void *a, const void *b)
@@ -200,9 +200,8 @@
typedef byte fios_getlist_callback_proc(int mode, const char *filename, const char *ext, char *title);
/** Create a list of the files in a directory, according to some arbitrary rule.
- * @param num Will be filled with the amount of items.
* @param mode The mode we are in. Some modes don't allow 'parent'.
- * @param callback The function that is called where you need to do the filtering.
+ * @param callback_proc The function that is called where you need to do the filtering.
* @return Return the list of files. */
static FiosItem *FiosGetFileList(int mode, fios_getlist_callback_proc *callback_proc)
{
--- a/src/genworld_gui.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/genworld_gui.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -899,7 +899,7 @@
/**
* Set the total of a stage of the world generation.
- * @param class the current class we are in.
+ * @param cls the current class we are in.
* @param total Set the total expected items for this class.
*
* Warning: this function isn't clever. Don't go from class 4 to 3. Go upwards, always.
@@ -914,7 +914,7 @@
/**
* Increases the current stage of the world generation with one.
- * @param class the current class we are in.
+ * @param cls the current class we are in.
*
* Warning: this function isn't clever. Don't go from class 4 to 3. Go upwards, always.
* Also, progress works if total is zero, total works if progress is zero.
--- a/src/gfx.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/gfx.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -275,7 +275,7 @@
/** Truncate a given string to a maximum width if neccessary.
* If the string is truncated, add three dots ('...') to show this.
- * @param *dest string that is checked and possibly truncated
+ * @param *str string that is checked and possibly truncated
* @param maxw maximum width in pixels of the string
* @return new width of (truncated) string */
static int TruncateString(char *str, int maxw)
@@ -413,11 +413,11 @@
/** 'Correct' a string to a maximum length. Longer strings will be cut into
* additional lines at whitespace characters if possible. The string parameter
* is modified with terminating characters mid-string which are the
- * placeholders for the newlines.<br/>
+ * placeholders for the newlines.
* The string WILL be truncated if there was no whitespace for the current
* line's maximum width.
*
- * @note To know if the the terminating '\0' is the string end or just a
+ * @note To know if the terminating '\0' is the string end or just a
* newline, the returned 'num' value should be consulted. The num'th '\0',
* starting with index 0 is the real string end.
*
@@ -487,7 +487,7 @@
* @param x Centre the string around this pixel width
* @param y Draw the string at this pixel height (first line's bottom)
* @param str String to draw
- * @param max Maximum width the string can have before it is wrapped */
+ * @param maxw Maximum width the string can have before it is wrapped */
void DrawStringMultiCenter(int x, int y, StringID str, int maxw)
{
char buffer[512];
@@ -626,7 +626,7 @@
/** Draw a string at the given coordinates with the given colour
* @param string the string to draw
* @param x offset from left side of the screen, if negative offset from the right side
- * @param x offset from top side of the screen, if negative offset from the bottom
+ * @param y offset from top side of the screen, if negative offset from the bottom
* @param real_color colour of the string, see _string_colormap in
* table/palettes.h or docs/ottd-colourtext-palette.png
* @return the x-coordinates where the drawing has finished. If nothing is drawn
@@ -652,10 +652,11 @@
switch_color:;
if (real_color & IS_PALETTE_COLOR) {
_string_colorremap[1] = color;
- _string_colorremap[2] = 215;
+ _string_colorremap[2] = _use_dos_palette ? 1 : 215;
} else {
- _string_colorremap[1] = _string_colormap[color].text;
- _string_colorremap[2] = _string_colormap[color].shadow;
+ uint palette = _use_dos_palette ? 1 : 0;
+ _string_colorremap[1] = _string_colormap[palette][color].text;
+ _string_colorremap[2] = _string_colormap[palette][color].shadow;
}
_color_remap_ptr = _string_colorremap;
}
--- a/src/graph_gui.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/graph_gui.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -26,7 +26,7 @@
/************************/
enum {
- GRAPH_MAX_DATASETS = 16,
+ GRAPH_MAX_DATASETS = 32,
GRAPH_AXIS_LABEL_COLOUR = 16,
GRAPH_AXIS_LINE_COLOUR = 215,
--- a/src/helpers.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/helpers.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -44,7 +44,7 @@
/** Add new item at the end of Engine List
* @param el list o which to add an engine
- * @param eif engine to add to the list
+ * @param eid engine to add to the list
*/
void EngList_Add(EngineList *el, EngineID eid)
{
@@ -81,7 +81,7 @@
* @param el list to be sorted
* @param compare function for evaluation of the quicksort
* @param begin start of sorting
- * @param count of items to be sorted
+ * @param num_items count of items to be sorted
*/
void EngList_SortPartial(EngineList *el, EngList_SortTypeFunction compare, uint begin, uint num_items)
{
--- a/src/industry_cmd.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/industry_cmd.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -458,23 +458,22 @@
if ((_tick_counter & 1) == 0) {
m = GetIndustryAnimationState(tile) + 1;
- if (m == 1) {
- SndPlayTileFx(SND_2C_MACHINERY, tile);
- } else if (m == 23) {
- SndPlayTileFx(SND_2B_COMEDY_HIT, tile);
- } else if (m == 28) {
- SndPlayTileFx(SND_2A_EXTRACT_AND_POP, tile);
+ switch (m) {
+ case 1: SndPlayTileFx(SND_2C_MACHINERY, tile); break;
+ case 23: SndPlayTileFx(SND_2B_COMEDY_HIT, tile); break;
+ case 28: SndPlayTileFx(SND_2A_EXTRACT_AND_POP, tile); break;
+ default:
+ if (m >= 50) {
+ int n = GetIndustryAnimationLoop(tile) + 1;
+ m = 0;
+ if (n >= 8) {
+ n = 0;
+ DeleteAnimatedTile(tile);
+ }
+ SetIndustryAnimationLoop(tile, n);
+ }
}
- if (m >= 50) {
- int n = GetIndustryAnimationLoop(tile) + 1;
- m = 0;
- if (n >= 8) {
- n = 0;
- DeleteAnimatedTile(tile);
- }
- SetIndustryAnimationLoop(tile, n);
- }
SetIndustryAnimationState(tile, m);
MarkTileDirtyByTile(tile);
}
@@ -1693,6 +1692,7 @@
static void UpdateIndustryStatistics(Industry *i)
{
byte pct;
+ bool refresh = false;
if (i->produced_cargo[0] != CT_INVALID) {
pct = 0;
@@ -1707,6 +1707,7 @@
i->total_transported[0] = i->last_mo_transported[0];
i->last_mo_transported[0] = 0;
+ refresh = true;
}
if (i->produced_cargo[1] != CT_INVALID) {
@@ -1722,10 +1723,11 @@
i->total_transported[1] = i->last_mo_transported[1];
i->last_mo_transported[1] = 0;
+ refresh = true;
}
- if (i->produced_cargo[0] != CT_INVALID || i->produced_cargo[1] != CT_INVALID)
+ if (refresh)
InvalidateWindow(WC_INDUSTRY_VIEW, i->index);
if (i->prod_level == 0) {
--- a/src/lang/american.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/american.txt Wed Jun 13 11:00:24 2007 +0000
@@ -1135,6 +1135,14 @@
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :Right
STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Window snap radius: {ORANGE}{STRING} px
STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}Window snap radius: {ORANGE}disabled
+STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}Town growth speed: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :None
+STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :Slow
+STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :Normal
+STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :Fast
+STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :Very fast
+STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}Proportion of towns that will grow twice as fast: {ORANGE}1 in {STRING}
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}Proportion of towns that will grow twice as fast: {ORANGE}None
STR_CONFIG_PATCHES_GUI :{BLACK}Interface
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}Construction
--- a/src/lang/brazilian_portuguese.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/brazilian_portuguese.txt Wed Jun 13 11:00:24 2007 +0000
@@ -1137,6 +1137,14 @@
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :Direita
STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Raio de atração de janelas: {ORANGE}{STRING} px
STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}Raio de atração de janelas: {ORANGE}desativado
+STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}Velocidade de crescimento de cidade: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :Nenhum
+STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :Devagar
+STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :Normal
+STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :Rápido
+STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :Muito rápido
+STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}Proporção de cidades que irão crescer duas vezes mais rápido: {ORANGE}1 em {STRING}
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}Proporção de cidades que irão crescer duas vezes mais rápido: {ORANGE}Nenhum
STR_CONFIG_PATCHES_GUI :{BLACK}Interface
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}Construção
--- a/src/lang/bulgarian.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/bulgarian.txt Wed Jun 13 11:00:24 2007 +0000
@@ -1137,6 +1137,14 @@
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :ДÑÑно
STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Прилепване на прозорците: {ORANGE}{STRING} px
STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}Прилепване на прозорците: {ORANGE}изключено
+STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}СкороÑÑ‚ на разтеж на града: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :Ðикаква
+STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :Бавна
+STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :Ðормална
+STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :Бърза
+STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :Много бърза
+STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}СъразмерноÑÑ‚ на градове който ще пораÑнат двойно по-бързо: {ORANGE}1 в {STRING}
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}СъразмерноÑÑ‚ на градове който ще пораÑнат двойно по-бързо: {ORANGE}Ðито един
STR_CONFIG_PATCHES_GUI :{BLACK}ИнтерфейÑ
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}Строене
--- a/src/lang/catalan.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/catalan.txt Wed Jun 13 11:00:24 2007 +0000
@@ -751,6 +751,7 @@
STR_02A1_SMALL :{BLACK}Petit
STR_02A2_MEDIUM :{BLACK}MitjÃ
STR_02A3_LARGE :{BLACK}Gran
+STR_SCENARIO_EDITOR_CITY :{BLACK}Ciutat
STR_02A4_SELECT_TOWN_SIZE :{BLACK}Selecciona mida de població
STR_02A5_TOWN_SIZE :{YELLOW}Mida de població:
@@ -1135,6 +1136,15 @@
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :Dreta
STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Radi de snap de finestra: {ORANGE}{STRING} px
STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}Radi de snap de finestra: {ORANGE}desactivat
+STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}Velocitat de creixement de les ciutats: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :Cap
+STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :Lenta
+STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :Normal
+STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :RÃ pida
+STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :Molt rà pida
+STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}Proporció de ciutats que creixeran el doble de rà pid: {ORANGE}1 de cada {STRING}
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}Proporció de ciutats que creixeran el doble de rà pid: {ORANGE}Cap
+STR_CONFIG_PATCHES_CITY_SIZE_MULTIPLIER :{LTBLUE}Multiplicador de mida de ciutat inicial: {ORANGE}{STRING}
STR_CONFIG_PATCHES_GUI :{BLACK}Interficie
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}Construcció
--- a/src/lang/czech.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/czech.txt Wed Jun 13 11:00:24 2007 +0000
@@ -1193,6 +1193,14 @@
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :vpravo
STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Okno se pÅ™ichytà k druhému, když je blÞ než: {ORANGE}{STRING} px
STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}Okno se pÅ™ichytà k druhému, když je blÞ než: {ORANGE}vypnuto
+STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}Rychlost růstu měst: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :nulová
+STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :pomalá
+STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :normálnÃ
+STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :rychlá
+STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :velmi rychlá
+STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}PodÃl mÄ›st, které budou růst dvakrát tak rychle: {ORANGE}1 z {STRING}
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}PodÃl mÄ›st, které budou růst dvakrát tak rychle: {ORANGE}žádné
STR_CONFIG_PATCHES_GUI :{BLACK}OvládanÃ
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}Výstavba
--- a/src/lang/danish.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/danish.txt Wed Jun 13 11:00:24 2007 +0000
@@ -1135,6 +1135,14 @@
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :Højre
STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Vinduernes sammenkoblings afstand: {ORANGE}{STRING} px
STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}Vinduernes sammenkoblings afstand: {ORANGE}slået fra
+STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}Byvækst tempo: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :Ingen
+STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :Langsom
+STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :Normal
+STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :Hurtig
+STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :Meget hurtig
+STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}Andel af byer der vil vokse dobbelt så hurtigt: {ORANGE}1 af {STRING}
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}Andel af byer der vil vokse dobbelt så hurtigt: {ORANGE}Ingen
STR_CONFIG_PATCHES_GUI :{BLACK}Brugerflade
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}Konstruktion
--- a/src/lang/dutch.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/dutch.txt Wed Jun 13 11:00:24 2007 +0000
@@ -1135,6 +1135,14 @@
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :Rechts
STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Vaste plaats venster radius: {ORANGE}{STRING} px
STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}Vaste plaats venster radius: {ORANGE}uit
+STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}Groeisnelheid steden: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :Niet
+STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :Langzaam
+STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :Normaal
+STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :Snel
+STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :Heel snel
+STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}Verhouding van steden die twee keer zo snel groeien: {ORANGE}1 in {STRING}
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}Verhouding van steden die twee keer zo snel groeien: {ORANGE}Niet
STR_CONFIG_PATCHES_GUI :{BLACK}Interface
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}Constructie
--- a/src/lang/english.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/english.txt Wed Jun 13 11:00:24 2007 +0000
@@ -753,6 +753,7 @@
STR_02A1_SMALL :{BLACK}Small
STR_02A2_MEDIUM :{BLACK}Medium
STR_02A3_LARGE :{BLACK}Large
+STR_SCENARIO_EDITOR_CITY :{BLACK}City
STR_02A4_SELECT_TOWN_SIZE :{BLACK}Select town size
STR_02A5_TOWN_SIZE :{YELLOW}Town size:
@@ -1143,8 +1144,9 @@
STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :Normal
STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :Fast
STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :Very fast
-STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}Proportion of towns that will grow twice as fast: {ORANGE}1 in {STRING1}
-STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}Proportion of towns that will grow twice as fast: {ORANGE}None
+STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}Proportion of towns that will become cities: {ORANGE}1 in {STRING1}
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}Proportion of towns that will become cities: {ORANGE}None
+STR_CONFIG_PATCHES_CITY_SIZE_MULTIPLIER :{LTBLUE}Initial city size multiplier: {ORANGE}{STRING1}
STR_CONFIG_PATCHES_GUI :{BLACK}Interface
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}Construction
--- a/src/lang/esperanto.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/esperanto.txt Wed Jun 13 11:00:24 2007 +0000
@@ -1136,6 +1136,14 @@
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :Dekstre
STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Fenestroliga distanco: {ORANGE}{STRING} px
STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}Fenestroliga distanco: {ORANGE}malaktiva
+STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}Urba kreskorapideco: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :Ne
+STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :Malrapide
+STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :Normale
+STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :Rapide
+STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :Tre rapide
+STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}Grandeco de urboj kiuj duoble rapide kreskas: {ORANGE}1 en {STRING}
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}Grandeco de urboj kiuj duoble rapide kreskas: {ORANGE}Ne
STR_CONFIG_PATCHES_GUI :{BLACK}Interfaco
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}Konstruado
@@ -1391,7 +1399,7 @@
STR_NETWORK_COMPANY_INFO :{SILVER}KOMPANIAJ INFORMOJ
STR_NETWORK_COMPANY_NAME :{SILVER}Kompaninomo: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR :{SILVER}EnaÅguro: {WHITE}{NUM}
+STR_NETWORK_INAUGURATION_YEAR :{SILVER}InaÅguro: {WHITE}{NUM}
STR_NETWORK_VALUE :{SILVER}Kompanivaloro: {WHITE}{CURRENCY64}
STR_NETWORK_CURRENT_BALANCE :{SILVER}Nuna monstato: {WHITE}{CURRENCY64}
STR_NETWORK_LAST_YEARS_INCOME :{SILVER}Lastjara enspezo: {WHITE}{CURRENCY64}
@@ -2125,7 +2133,7 @@
STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Grandigu prunton
STR_7036_REPAY_PART_OF_LOAN :{BLACK}Repagu pruntparton
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(ManaÄanto)
-STR_7038_INAUGURATED :{GOLD}EnaÅguris: {WHITE}{NUM}
+STR_7038_INAUGURATED :{GOLD}InaÅgurita: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Veturiloj:
STR_TRAINS :{WHITE}{COMMA} trajno{P "" j}
STR_ROAD_VEHICLES :{WHITE}{COMMA} vojveturilo{P "" j}
--- a/src/lang/estonian.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/estonian.txt Wed Jun 13 11:00:24 2007 +0000
@@ -902,6 +902,7 @@
STR_02DE_MAP_OF_WORLD :Maailmakaart
STR_EXTRA_VIEW_PORT :Lisa vaateaken
STR_SIGN_LIST :Siltide nimekiri
+STR_TRANSPARENCY_OPTIONS :Läbipaistvuse valikud
STR_02DF_TOWN_DIRECTORY :Linnade nimistu
STR_TOWN_POPULATION :{BLACK}Maailma rahvastik: {COMMA}
STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Vaateaken {COMMA}
@@ -1234,6 +1235,14 @@
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :Paremal
STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Akna haaramise raadius: {ORANGE}{STRING} px
STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}Akna haaramise raadius: {ORANGE}välja lülitatud
+STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}Linna suurenemise kiirus: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :Pole
+STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :Aeglane
+STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :Normaalne
+STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :Kiire
+STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :Väga Kiire
+STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}Topeltkiirusel suurenevaid linnu: {ORANGE}1 iga {STRING} linna kohta
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}Topeltkiirusel suurenevaid linnu: {ORANGE}puudub
STR_CONFIG_PATCHES_GUI :{BLACK}Välimus
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}Ehitamine
@@ -3251,3 +3260,14 @@
########
STR_FEEDER_CARGO_VALUE :{BLACK}Kanna Raha: {LTBLUE}{CURRENCY}
+STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...see tee on omatud linna poolt
+STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...tee on vales suunas
+
+STR_TRANSPARENCY_TOOLB :{WHITE}Läbipaistvusvalikud
+STR_TRANSPARENT_SIGNS_DESC :{BLACK}Vaheta jaamamärkide läbipaistvust
+STR_TRANSPARENT_TREES_DESC :{BLACK}Vaheta puude läbipaistvust
+STR_TRANSPARENT_HOUSES_DESC :{BLACK}Vaheta majade läbipaistvust
+STR_TRANSPARENT_INDUSTRIES_DESC :{BLACK}Vaheta tööstusehitiste läbipaistvust
+STR_TRANSPARENT_BUILDINGS_DESC :{BLACK}Vaheta läbipaistvust ehitistel nagu: jaamad, depood, vahepunktid ja elektriliinid
+STR_TRANSPARENT_BRIDGES_DESC :{BLACK}Vaheta sildade läbipaistvust
+STR_TRANSPARENT_STRUCTURES_DESC :{BLACK}Vaheta läbipaistvust objektidel, nagu: majakad, antennid ja võimalik, et tulevikus ka silmailu
--- a/src/lang/finnish.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/finnish.txt Wed Jun 13 11:00:24 2007 +0000
@@ -1135,6 +1135,14 @@
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :oikea
STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Ikkunan kiinniottosäde: {ORANGE}{STRING} piks.
STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}Ikkunan kiinniottosäde: {ORANGE}pois päältä
+STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}Kaupunkien kasvunopeus: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :Ei kasvua
+STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :Hidas
+STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :Tavallinen
+STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :Nopea
+STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :Erittäin nopea
+STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}Kaksinkertaisella nopeudella kasvavien kaupunkien osuus: {ORANGE}1/{STRING}
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}Kaksinkertaisella nopeudella kasvavien kaupunkien osuus: {ORANGE}0
STR_CONFIG_PATCHES_GUI :{BLACK}Käyttöliittymä
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}Rakentaminen
--- a/src/lang/french.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/french.txt Wed Jun 13 11:00:24 2007 +0000
@@ -752,6 +752,7 @@
STR_02A1_SMALL :{BLACK}Petite
STR_02A2_MEDIUM :{BLACK}Moyenne
STR_02A3_LARGE :{BLACK}Grande
+STR_SCENARIO_EDITOR_CITY :{BLACK}Métropole
STR_02A4_SELECT_TOWN_SIZE :{BLACK}Sélectionner la taille de la ville
STR_02A5_TOWN_SIZE :{YELLOW}Taille:
@@ -1136,6 +1137,15 @@
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :À droite
STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Rayon d'attraction des fenêtres : {ORANGE}{STRING} px
STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}Rayon d'attraction des fenêtres : {ORANGE}inactif
+STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}Vitesse de croissance des villes: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :Aucune
+STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :Lente
+STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :Normale
+STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :Rapide
+STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :Très rapide
+STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}Proportion des villes qui deviendront des métropoles: {ORANGE}1 sur {STRING}
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}Proportion des villes qui deviendront des métropoles: {ORANGE}Aucune
+STR_CONFIG_PATCHES_CITY_SIZE_MULTIPLIER :{LTBLUE}Multiplicateur de taille de ville initial: {ORANGE}{STRING}
STR_CONFIG_PATCHES_GUI :{BLACK}Interface
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}Construction
--- a/src/lang/german.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/german.txt Wed Jun 13 11:00:24 2007 +0000
@@ -1092,6 +1092,7 @@
STR_CONFIG_PATCHES_LIVERIES_OWN :Eigene Firma
STR_CONFIG_PATCHES_LIVERIES_ALL :Alle Firmen
STR_CONFIG_PATCHES_PREFER_TEAMCHAT :{LTBLUE}Bevorzuge Teamchat mit <ENTER>: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SCROLLWHEEL_SCROLLING :{LTBLUE}Funktion des Scrollrads: {ORANGE}{STRING}
STR_CONFIG_PATCHES_SCROLLWHEEL_ZOOM :Karte vergrößern
STR_CONFIG_PATCHES_SCROLLWHEEL_SCROLL :Kartenansicht verschieben
STR_CONFIG_PATCHES_SCROLLWHEEL_OFF :Aus
@@ -1134,6 +1135,14 @@
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :Rechts
STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Fenster schnappen aneinander, wenn näher als: {ORANGE}{STRING} px
STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}Fenster schnappen aneinander, wenn näher als: {ORANGE}ausgeschaltet
+STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}Stadtwachstumgeschwindigkeit: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :Keins
+STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :Langsam
+STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :Normal
+STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :Schnell
+STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :Sehr schnell
+STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}Anteil der Städte die doppelt so schnell wachsen: {ORANGE}1 in {STRING}
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}Anteil der Städte die doppelt so schnell wachsen: {ORANGE}Keine
STR_CONFIG_PATCHES_GUI :{BLACK}Oberfläche
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}Konstruktion
@@ -2913,6 +2922,7 @@
STR_NEWGRF_ERROR_INVALID_PARAMETER :Falscher Parameter für {STRING}: Parameter {STRING} ({NUM})
STR_NEWGRF_ERROR_LOAD_BEFORE :{STRING} Muß vor {STRING} geladen werden.
STR_NEWGRF_ERROR_LOAD_AFTER :{STRING} Muß nach {STRING} geladen werden.
+STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE :Die GRF Datei, die zur Ãœbersetzung erstellt wurde
STR_NEWGRF_ADD :{BLACK}Hinzufügen
STR_NEWGRF_ADD_TIP :{BLACK}Füge eine neue NewGRF Datei zu Liste hinzu
@@ -3152,3 +3162,11 @@
STR_FEEDER_CARGO_VALUE :{BLACK}Ãœberweise Geld: {LTBLUE}{CURRENCY}
STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...diese Straße ist in kommunaler Trägerschaft
+STR_TRANSPARENCY_TOOLB :{WHITE}Transparenzoptionen
+STR_TRANSPARENT_SIGNS_DESC :{BLACK}Verändere die Transparenz für Stationsschilder
+STR_TRANSPARENT_TREES_DESC :{BLACK}Verändere die Transparenz für Bäume
+STR_TRANSPARENT_HOUSES_DESC :{BLACK}Verändere die Transparenz für Häuser
+STR_TRANSPARENT_INDUSTRIES_DESC :{BLACK}Verändere die Transparenz für Industrien
+STR_TRANSPARENT_BUILDINGS_DESC :{BLACK}Verändere die Transparenz für Gebäude wie Bahnhöfe, Depots, Wegpunkte und Oberleitung
+STR_TRANSPARENT_BRIDGES_DESC :{BLACK}Verändere die Transparenz für Brücken
+STR_TRANSPARENT_STRUCTURES_DESC :{BLACK}Verändere die Transparenz für Bauten wie Leuchttürme und Antennen, evtl. in der Zukunft auch für Sehenswürdigkeiten
--- a/src/lang/hungarian.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/hungarian.txt Wed Jun 13 11:00:24 2007 +0000
@@ -817,6 +817,7 @@
STR_02A1_SMALL :{BLACK}Kicsi
STR_02A2_MEDIUM :{BLACK}Közepes
STR_02A3_LARGE :{BLACK}Nagy
+STR_SCENARIO_EDITOR_CITY :{BLACK}Város
STR_02A4_SELECT_TOWN_SIZE :{BLACK}A város méretének kiválasztása
STR_02A5_TOWN_SIZE :{YELLOW}A város mérete:
@@ -1209,6 +1210,7 @@
STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :Nagyon gyors
STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}Dupla gyorsan növekvő városok aránya: {ORANGE}{STRING} városból 1
STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}Dupla gyorsan növekvő városok aránya: {ORANGE}Nincsennek
+STR_CONFIG_PATCHES_CITY_SIZE_MULTIPLIER :{LTBLUE}Kezdeti városméret-szorzó: {ORANGE}{STRING}
STR_CONFIG_PATCHES_GUI :{BLACK}MegjelenÃtés
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}ÉpÃtkezés
--- a/src/lang/italian.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/italian.txt Wed Jun 13 11:00:24 2007 +0000
@@ -93,63 +93,63 @@
STR_QUANTITY_GOODS :{COMMA} cass{P a e} di beni
STR_QUANTITY_GRAIN :{WEIGHT} di grano
STR_QUANTITY_WOOD :{WEIGHT} di legname
-STR_QUANTITY_IRON_ORE :{WEIGHT} di mineral{P e i} ferros{P o i}
+STR_QUANTITY_IRON_ORE :{WEIGHT} di ferro
STR_QUANTITY_STEEL :{WEIGHT} di acciaio
STR_QUANTITY_VALUABLES :{COMMA} bors{P a e} di valori
-STR_QUANTITY_COPPER_ORE :{WEIGHT} di mineral{P e i} di rame
+STR_QUANTITY_COPPER_ORE :{WEIGHT} di rame
STR_QUANTITY_MAIZE :{WEIGHT} di mais
STR_QUANTITY_FRUIT :{WEIGHT} di frutta
-STR_QUANTITY_DIAMONDS :{COMMA} bors{P a e} di diamanti
+STR_QUANTITY_DIAMONDS :{COMMA} sacc{P o hi} di diamanti
STR_QUANTITY_FOOD :{WEIGHT} di cibo
STR_QUANTITY_PAPER :{WEIGHT} di carta
-STR_QUANTITY_GOLD :{COMMA} bors{P a e} d'oro
+STR_QUANTITY_GOLD :{COMMA} sacc{P o hi} di oro
STR_QUANTITY_WATER :{VOLUME} di acqua
STR_QUANTITY_WHEAT :{WEIGHT} di frumento
STR_QUANTITY_RUBBER :{VOLUME} di gomma
STR_QUANTITY_SUGAR :{WEIGHT} di zucchero
STR_QUANTITY_TOYS :{COMMA} giocattol{P o i}
-STR_QUANTITY_SWEETS :{COMMA} bust{P a e} di caramelle
-STR_QUANTITY_COLA :{VOLUME} di cola
-STR_QUANTITY_CANDYFLOSS :{WEIGHT} di cotone candito
-STR_QUANTITY_BUBBLES :{COMMA} boll{P a e}
+STR_QUANTITY_SWEETS :{COMMA} sacc{P o hi} di caramelle
+STR_QUANTITY_COLA :{VOLUME} di Cola
+STR_QUANTITY_CANDYFLOSS :{WEIGHT} di zucchero filato
+STR_QUANTITY_BUBBLES :{COMMA} bollicin{P a e}
STR_QUANTITY_TOFFEE :{WEIGHT} di toffee
STR_QUANTITY_BATTERIES :{COMMA} batteri{P a e}
STR_QUANTITY_PLASTIC :{VOLUME} di plastica
-STR_QUANTITY_FIZZY_DRINKS :{COMMA} bibite frizzanti
+STR_QUANTITY_FIZZY_DRINKS :{COMMA} bibit{P a e} frizzant{P e i}
STR_ABBREV_NOTHING :
-STR_ABBREV_PASSENGERS :{TINYFONT}PS
-STR_ABBREV_COAL :{TINYFONT}CL
-STR_ABBREV_MAIL :{TINYFONT}ML
-STR_ABBREV_OIL :{TINYFONT}OL
-STR_ABBREV_LIVESTOCK :{TINYFONT}LV
-STR_ABBREV_GOODS :{TINYFONT}GD
+STR_ABBREV_PASSENGERS :{TINYFONT}PA
+STR_ABBREV_COAL :{TINYFONT}CA
+STR_ABBREV_MAIL :{TINYFONT}PT
+STR_ABBREV_OIL :{TINYFONT}PE
+STR_ABBREV_LIVESTOCK :{TINYFONT}BE
+STR_ABBREV_GOODS :{TINYFONT}BN
STR_ABBREV_GRAIN :{TINYFONT}GR
-STR_ABBREV_WOOD :{TINYFONT}WD
-STR_ABBREV_IRON_ORE :{TINYFONT}OR
-STR_ABBREV_STEEL :{TINYFONT}ST
-STR_ABBREV_VALUABLES :{TINYFONT}VL
-STR_ABBREV_COPPER_ORE :{TINYFONT}CO
-STR_ABBREV_MAIZE :{TINYFONT}MZ
+STR_ABBREV_WOOD :{TINYFONT}LE
+STR_ABBREV_IRON_ORE :{TINYFONT}FE
+STR_ABBREV_STEEL :{TINYFONT}AC
+STR_ABBREV_VALUABLES :{TINYFONT}VA
+STR_ABBREV_COPPER_ORE :{TINYFONT}RM
+STR_ABBREV_MAIZE :{TINYFONT}MA
STR_ABBREV_FRUIT :{TINYFONT}FT
STR_ABBREV_DIAMONDS :{TINYFONT}DM
-STR_ABBREV_FOOD :{TINYFONT}FD
-STR_ABBREV_PAPER :{TINYFONT}PR
-STR_ABBREV_GOLD :{TINYFONT}GD
-STR_ABBREV_WATER :{TINYFONT}WR
-STR_ABBREV_WHEAT :{TINYFONT}WH
-STR_ABBREV_RUBBER :{TINYFONT}RB
-STR_ABBREV_SUGAR :{TINYFONT}SG
-STR_ABBREV_TOYS :{TINYFONT}TY
-STR_ABBREV_SWEETS :{TINYFONT}SW
+STR_ABBREV_FOOD :{TINYFONT}CB
+STR_ABBREV_PAPER :{TINYFONT}CT
+STR_ABBREV_GOLD :{TINYFONT}OR
+STR_ABBREV_WATER :{TINYFONT}AQ
+STR_ABBREV_WHEAT :{TINYFONT}FR
+STR_ABBREV_RUBBER :{TINYFONT}GM
+STR_ABBREV_SUGAR :{TINYFONT}ZU
+STR_ABBREV_TOYS :{TINYFONT}GI
+STR_ABBREV_SWEETS :{TINYFONT}CM
STR_ABBREV_COLA :{TINYFONT}CL
-STR_ABBREV_CANDYFLOSS :{TINYFONT}CF
-STR_ABBREV_BUBBLES :{TINYFONT}BU
+STR_ABBREV_CANDYFLOSS :{TINYFONT}ZF
+STR_ABBREV_BUBBLES :{TINYFONT}BO
STR_ABBREV_TOFFEE :{TINYFONT}TF
STR_ABBREV_BATTERIES :{TINYFONT}BA
STR_ABBREV_PLASTIC :{TINYFONT}PL
-STR_ABBREV_FIZZY_DRINKS :{TINYFONT}FZ
+STR_ABBREV_FIZZY_DRINKS :{TINYFONT}BF
STR_ABBREV_NONE :{TINYFONT}NO
-STR_ABBREV_ALL :{TINYFONT}ALL
+STR_ABBREV_ALL :{TINYFONT}TUT
STR_00AE :{WHITE}{DATE_SHORT}
STR_00AF :{WHITE}{DATE_LONG}
STR_00B0_MAP :{WHITE}Mappa - {STRING}
@@ -162,14 +162,14 @@
STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Copyright originale {COPYRIGHT} 1995 Chris Sawyer, Tutti i diritti riservati
STR_00B7_VERSION :{BLACK}OpenTTD versione {REV}
STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2007 Il team OpenTTD
-STR_TRANSLATED_BY :{BLACK} Traduttore/i - Sidew e altri, senza nome, che mi hanno preceduto.
+STR_TRANSLATED_BY :{BLACK} Traduttori - Sidew, LorenzoDV e altri, senza nome, che ci hanno preceduti.
STR_00C5 :{BLACK}{CROSS}
STR_00C6 :{SILVER}{CROSS}
STR_00C7_QUIT :{WHITE}Esci
STR_00C8_YES :{BLACK}Sì
STR_00C9_NO :{BLACK}No
-STR_00CA_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Si è sicuri di voler uscire dal gioco e tornare a {STRING}?
+STR_00CA_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Si è sicuri di voler abbandonare la partita e tornare a {STRING}?
STR_00CB_1 :{BLACK}1
STR_00CC_2 :{BLACK}2
STR_00CD_3 :{BLACK}3
@@ -297,8 +297,8 @@
STR_0140_NEW_GAME :{BLACK}Nuova partita
STR_0141_LOAD_GAME :{BLACK}Carica partita
STR_SINGLE_PLAYER :{BLACK}Giocatore singolo
-STR_MULTIPLAYER :{BLACK}Multiplayer
-STR_SCENARIO_EDITOR :{BLACK}Editore di Scenari
+STR_MULTIPLAYER :{BLACK}Multigiocatore
+STR_SCENARIO_EDITOR :{BLACK}Editor di scenari
STR_64 :64
STR_128 :128
@@ -306,7 +306,7 @@
STR_512 :512
STR_1024 :1024
STR_2048 :2048
-STR_MAPSIZE :{BLACK}Dimensioni mappa:
+STR_MAPSIZE :{BLACK}Dimensione mappa:
STR_BY :{BLACK}*
STR_0148_GAME_OPTIONS :{BLACK}Opzioni di gioco
@@ -315,8 +315,8 @@
STR_0152_TOWN_DIRECTORY :Elenco cittÃ
STR_0153_SUBSIDIES :Sussidi
-STR_UNITS_IMPERIAL :Imperiale
-STR_UNITS_METRIC :Metrico
+STR_UNITS_IMPERIAL :Imperiali
+STR_UNITS_METRIC :Metriche
STR_UNITS_SI :SI
STR_UNITS_VELOCITY_IMPERIAL :{COMMA} mph
@@ -344,7 +344,7 @@
STR_UNITS_VOLUME_LONG_SI :{COMMA} m³
STR_UNITS_FORCE_IMPERIAL :{COMMA}x10³ lbf
-STR_UNITS_FORCE_METRIC :{COMMA} ton. forza
+STR_UNITS_FORCE_METRIC :{COMMA} tonnellat{P a e} forza
STR_UNITS_FORCE_SI :{COMMA} kN
############ range for menu starts
@@ -355,7 +355,7 @@
STR_0158_COMPANY_VALUE_GRAPH :Grafico valore compagnie
STR_0159_CARGO_PAYMENT_RATES :Grafico tariffe merci
STR_015A_COMPANY_LEAGUE_TABLE :Classifica societÃ
-STR_PERFORMANCE_DETAIL_MENU :Dettagli prestazionali
+STR_PERFORMANCE_DETAIL_MENU :Valutazione dettagliata prestazioni
############ range for menu ends
STR_015B_OPENTTD :{WHITE}Informazioni su OpenTTD
@@ -363,10 +363,10 @@
STR_015D_LOAD_GAME :Carica partita
STR_015E_QUIT_GAME :Abbandona partita
STR_015F_QUIT :Esci
-STR_ABANDON_GAME_QUERY :{YELLOW}Sei sicuro di voler abbandonare la partita in corso?
+STR_ABANDON_GAME_QUERY :{YELLOW}Si è sicuri di voler abbandonare la partita in corso?
STR_0161_QUIT_GAME :{WHITE}Abbandona partita
-STR_SORT_ORDER_TIP :{BLACK}Seleziona ordinamento (discendente/ascendente)
-STR_SORT_CRITERIA_TIP :{BLACK}Seleziona il criterio d'ordinamento
+STR_SORT_ORDER_TIP :{BLACK}Seleziona l'ordinamento (discendente/ascendente)
+STR_SORT_CRITERIA_TIP :{BLACK}Seleziona il criterio di ordinamento
STR_SORT_BY :{BLACK}Ordina per
STR_SORT_BY_POPULATION :{BLACK}Popolazione
@@ -381,36 +381,36 @@
STR_SORT_BY_PROFIT_THIS_YEAR :Profitto di quest'anno
STR_SORT_BY_AGE :EtÃ
STR_SORT_BY_RELIABILITY :AffidabilitÃ
-STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE :Tot. capacità per tipo di carico
+STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE :Capacità per tipo di carico
STR_SORT_BY_MAX_SPEED :Velocità massima
STR_SORT_BY_MODEL :Modello
STR_SORT_BY_VALUE :Valore
STR_SORT_BY_FACILITY :Tipo di stazione
-STR_SORT_BY_WAITING :Valore merce in attesa
-STR_SORT_BY_RATING_MAX :Rating di merce
+STR_SORT_BY_WAITING :Merci in attesa
+STR_SORT_BY_RATING_MAX :Valutazione servizi
STR_ENGINE_SORT_ENGINE_ID :EngineID (ord. classico)
STR_ENGINE_SORT_COST :Costo
STR_ENGINE_SORT_POWER :Potenza
-STR_ENGINE_SORT_INTRO_DATE :Data Introduzione
-STR_ENGINE_SORT_RUNNING_COST :Costi di uso
-STR_ENGINE_SORT_POWER_VS_RUNNING_COST :Potenza/Costi di uso
-STR_ENGINE_SORT_CARGO_CAPACITY :Capacità Cargo
+STR_ENGINE_SORT_INTRO_DATE :Data introduzione
+STR_ENGINE_SORT_RUNNING_COST :Costo d'esercizio
+STR_ENGINE_SORT_POWER_VS_RUNNING_COST :Potenza / Costo d'esercizio
+STR_ENGINE_SORT_CARGO_CAPACITY :Capacità di carico
STR_NO_WAITING_CARGO :{BLACK}Non c'è nessun tipo di merce in attesa
STR_SELECT_ALL_FACILITIES :{BLACK}Seleziona tuti i fabbricati
STR_SELECT_ALL_TYPES :{BLACK}Seleziona tutti i tipi di merce (comprese le merci non in attesa)
-STR_AVAILABLE_TRAINS :{BLACK}Treni Disponibili
-STR_AVAILABLE_ROAD_VEHICLES :{BLACK}Veicoli Disponibili
-STR_AVAILABLE_SHIPS :{BLACK}Navi Disponibili
-STR_AVAILABLE_AIRCRAFT :{BLACK}Aerei Disponibili
-STR_AVAILABLE_ENGINES_TIP :{BLACK}Mostra una lista di motrici disponibili per quel tipo di veicolo
-STR_MANAGE_LIST :{BLACK}Gestisci lista
-STR_MANAGE_LIST_TIP :{BLACK}Manda istruzioni a tutti i veicoli in questa lista
-STR_REPLACE_VEHICLES :Rimpiazza Veicoli
+STR_AVAILABLE_TRAINS :{BLACK}Treni disponibili
+STR_AVAILABLE_ROAD_VEHICLES :{BLACK}Automezzi disponibili
+STR_AVAILABLE_SHIPS :{BLACK}Navi disponibili
+STR_AVAILABLE_AIRCRAFT :{BLACK}Aeromobili disponibili
+STR_AVAILABLE_ENGINES_TIP :{BLACK}Mostra un elenco di veicoli disponibili in questa categoria di mezzi di trasporto
+STR_MANAGE_LIST :{BLACK}Gestione veicoli
+STR_MANAGE_LIST_TIP :{BLACK}Invia istruzioni a tutti i veicoli di questo elenco
+STR_REPLACE_VEHICLES :Rimpiazza veicoli
STR_SEND_TRAIN_TO_DEPOT :Manda al deposito
STR_SEND_ROAD_VEHICLE_TO_DEPOT :Manda al deposito
STR_SEND_SHIP_TO_DEPOT :Manda al deposito
STR_SEND_AIRCRAFT_TO_HANGAR :Manda all'hangar
-STR_SEND_FOR_SERVICING :Manda per manutenzione
+STR_SEND_FOR_SERVICING :Manutenzione
############ range for months starts
STR_0162_JAN :Gen
@@ -458,14 +458,14 @@
STR_018A_CAN_T_CHANGE_SERVICING :{WHITE}Impossibile cambiare l'intervallo di manutenzione...
STR_018B_CLOSE_WINDOW :{BLACK}Chiude la finestra
STR_018C_WINDOW_TITLE_DRAG_THIS :{BLACK}Titolo della finestra - trascinarlo per muovere la finestra
-STR_STICKY_BUTTON :{BLACK} Marca questa finestra come inchiudibile con il tasto 'Chiudi TUTTE le finestre'
-STR_RESIZE_BUTTON :{BLACK}Clicca e trascina per ridimensionare la finestra
-STR_SAVELOAD_HOME_BUTTON :{BLACK}Clicca qui per saltare alla cartella salva/carica di default
+STR_STICKY_BUTTON :{BLACK}Marca questa finestra in modo che non venga chiusa quando si preme il tasto 'Chiudi tutte le finestre'
+STR_RESIZE_BUTTON :{BLACK}Fare clic e trascinare per ridimensionare questa finestra
+STR_SAVELOAD_HOME_BUTTON :{BLACK}Fare clic qui per spostarsi nella cartella di salvataggio predefinita
STR_018D_DEMOLISH_BUILDINGS_ETC :{BLACK}Demolisce edifici etc. su un area di terra
STR_018E_LOWER_A_CORNER_OF_LAND :{BLACK}Abbassa un angolo del terreno
STR_018F_RAISE_A_CORNER_OF_LAND :{BLACK}Alza un angolo del terreno
STR_0190_SCROLL_BAR_SCROLLS_LIST :{BLACK}Barra di scorrimento - scorre l'elenco su/giù
-STR_HSCROLL_BAR_SCROLLS_LIST :{BLACK}Barra di scorrimento - scorre la lista sinistra/destra
+STR_HSCROLL_BAR_SCROLLS_LIST :{BLACK}Barra di scorrimento - scorre l'elenco a sinistra/destra
STR_0191_SHOW_LAND_CONTOURS_ON_MAP :{BLACK}Mostra la conformazione del terreno sulla mappa
STR_0192_SHOW_VEHICLES_ON_MAP :{BLACK}Mostra i veicoli sulla mappa
STR_0193_SHOW_INDUSTRIES_ON_MAP :{BLACK}Mostra le industrie sulla mappa
@@ -577,7 +577,7 @@
STR_01F8_CLEAR_CURRENT_PROGRAM_CUSTOM1 :{BLACK}Elimina il programma corrente (solo Personale1 e Personale2)
STR_01F9_SAVE_MUSIC_SETTINGS :{BLACK}Salva le impostazioni della musica
STR_01FA_CLICK_ON_MUSIC_TRACK_TO :{BLACK}Fare clic su un brano per aggiungerlo al programma corrente (solo Personale1 o Personale2)
-STR_CLICK_ON_TRACK_TO_REMOVE :{BLACK}Clicca sul brano per cancellarlo dal programma corrente (solamente personalizzato 1 o personalizzato 2)
+STR_CLICK_ON_TRACK_TO_REMOVE :{BLACK}Fare clic su un brano per rimuoverlo dal programma corrente (solo Personale1 o Personale2)
STR_01FB_TOGGLE_PROGRAM_SHUFFLE :{BLACK}Attiva/disattiva la riproduzione in ordine casuale
STR_01FC_SHOW_MUSIC_TRACK_SELECTION :{BLACK}Mostra la finestra di selezione dei brani musicali
STR_01FD_CLICK_ON_SERVICE_TO_CENTER :{BLACK}Fare clic su un servizio per centrare la visuale sull'industria o cittÃ
@@ -600,11 +600,11 @@
STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Cambiamenti della merce accettata
STR_020E_SUBSIDIES :{YELLOW}Sussidi
STR_020F_GENERAL_INFORMATION :{YELLOW}Informazioni generali
-STR_MESSAGES_ALL :{YELLOW}Impostazione per tutti i tipi di messaggio: Off / Summario / Completo
-STR_MESSAGE_SOUND :{YELLOW}Esegui un suono per i messaggi sommarizzati
+STR_MESSAGES_ALL :{YELLOW}Impostazione per tutti i tipi di messaggio
+STR_MESSAGE_SOUND :{YELLOW}Riproduci un suono per le notizie ridotte a sommario
STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO :{WHITE}...troppo lontano dalla destinazione precedente
STR_0211_TOP_COMPANIES_WHO_REACHED :{BIGFONT}{BLACK}Le migliori compagnie che hanno raggiunto il {NUM}{}(Livello {STRING})
-STR_TOP_COMPANIES_NETWORK_GAME :{BIGFONT}{BLACK}Classifica società del{NUM}
+STR_TOP_COMPANIES_NETWORK_GAME :{BIGFONT}{BLACK}Classifica compagnie nel {NUM}
STR_0212 :{BIGFONT}{COMMA}.
STR_0213_BUSINESSMAN :Uomo d'affari
STR_0214_ENTREPRENEUR :Imprenditore
@@ -619,7 +619,7 @@
STR_021C_OF_ACHIEVES_STATUS :{WHITE}{BIGFONT}{PLAYERNAME} della {COMPANY} raggiunge lo status di '{STRING}'!
STR_021F :{BLUE}{COMMA}
STR_0221_OPENTTD :{YELLOW}OpenTTD
-STR_0222_SCENARIO_EDITOR :{YELLOW}Editor scenario
+STR_0222_SCENARIO_EDITOR :{YELLOW}Editor di scenari
STR_0223_LAND_GENERATION :{WHITE}Generazione terreno
STR_0224 :{BLACK}{UPARROW}
STR_0225 :{BLACK}{DOWNARROW}
@@ -628,8 +628,8 @@
STR_022A_GENERATE_RANDOM_LAND :{BLACK}Genera terreno casuale
STR_022B_RESET_LANDSCAPE :{BLACK}Azzerra paesaggio
STR_022C_RESET_LANDSCAPE :{WHITE}Azzerra Paesaggio
-STR_RESET_LANDSCAPE_TOOLTIP :{BLACK}Togli tutte le proprietà dei giocatori dalla mappa
-STR_RESET_LANDSCAPE_CONFIRMATION_TEXT :{WHITE}Sei sicuro di togliere le proprietà dei giocatori?
+STR_RESET_LANDSCAPE_TOOLTIP :{BLACK}Rimuove tutte le strutture di proprietà dei giocatori dalla mappa
+STR_RESET_LANDSCAPE_CONFIRMATION_TEXT :{WHITE}Si è sicuri di voler rimuovere tutte le proprietà dei giocatori?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Generazione paesaggio
STR_022F_TOWN_GENERATION :{BLACK}Generazione cittÃ
STR_0230_INDUSTRY_GENERATION :{BLACK}Generazione industrie
@@ -642,8 +642,8 @@
STR_0238_TOO_CLOSE_TO_ANOTHER_TOWN :{WHITE}...troppo vicino ad un'altra cittÃ
STR_0239_SITE_UNSUITABLE :{WHITE}...sito inadatto
STR_023A_TOO_MANY_TOWNS :{WHITE}...troppe cittÃ
-STR_CANNOT_GENERATE_TOWN :{WHITE}Non puoi costruire nessuna cittÃ
-STR_NO_SPACE_FOR_TOWN :{WHITE}...nella mappa non c'è altro spazio
+STR_CANNOT_GENERATE_TOWN :{WHITE}Impossibile costruire cittÃ
+STR_NO_SPACE_FOR_TOWN :{WHITE}...non c'è altro spazio sulla mappa
STR_023B_INCREASE_SIZE_OF_TOWN :{BLACK}Aumenta la dimensione della cittÃ
STR_023C_EXPAND :{BLACK}Espandi
STR_023D_RANDOM_TOWN :{BLACK}Città casuale
@@ -729,12 +729,12 @@
STR_028D_PLACE_LIGHTHOUSE :{BLACK}Piazza faro
STR_028E_PLACE_TRANSMITTER :{BLACK}Piazza trasmettitore
STR_028F_DEFINE_DESERT_AREA :{BLACK}Definisce un'area desertica.{}Fare clic tenendo premuto CTRL per rimuoverla
-STR_CREATE_LAKE :{BLACK}Definisci la zona d'acqua.{}Crei un canale, a meno che CTRL non venga premuto a livello del mare, allagando così i dintorni
+STR_CREATE_LAKE :{BLACK}Definisce una zona d'acqua.{}Costruisce un canale, a meno che non si tenga premuto CTRL mentre si fa clic al livello del mare, provocando l'allagamento dei dintorni
STR_0290_DELETE :{BLACK}Elimina
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Elimina completamente questa cittÃ
STR_0292_SAVE_SCENARIO :Salva scenario
STR_0293_LOAD_SCENARIO :Carica scenario
-STR_LOAD_HEIGHTMAP :Carica Heightmap
+STR_LOAD_HEIGHTMAP :Carica heightmap
STR_0294_QUIT_EDITOR :Esci dall'editor
STR_0295 :
STR_0296_QUIT :Esci
@@ -742,9 +742,9 @@
STR_0298_LOAD_SCENARIO :{WHITE}Carica scenario
STR_0299_SAVE_SCENARIO :{WHITE}Salva scenario
STR_029A_PLAY_SCENARIO :{BLACK}Gioca scenario
-STR_PLAY_HEIGHTMAP :{BLACK}Gioca Heightmap
-STR_PLAY_HEIGHTMAP_HINT :{BLACK}Inizia un nuovo gioco usando la heightmap come terreno
-STR_QUIT_SCENARIO_QUERY :{YELLOW}Sei sicuro di voler abbandonare questo scenario?
+STR_PLAY_HEIGHTMAP :{BLACK}Gioca con heightmap
+STR_PLAY_HEIGHTMAP_HINT :{BLACK}Inizia una nuova partita, utilizzando una heightmap per definire il terreno
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Si è sicuri di voler abbandonare questo scenario?
STR_029C_QUIT_EDITOR :{WHITE}Esci dall'editor
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...può essere costruita solo in città con una popolazione di almeno 1200
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Sposta la data d'inizio indietro di 1 anno
@@ -776,12 +776,12 @@
STR_02C3_GAME_OPTIONS :Opzioni gioco
STR_02C5_DIFFICULTY_SETTINGS :Impostazioni difficoltÃ
STR_02C7_CONFIG_PATCHES :Configura patch
-STR_NEWGRF_SETTINGS :Impostazioni Newgrf
+STR_NEWGRF_SETTINGS :Impostazioni NewGRF
STR_GAMEOPTMENU_0A :
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Mostra nomi cittÃ
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Mostra nomi stazioni
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Mostra cartelli
-STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Waypoints mostrati
+STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Waypoint mostrati
STR_02D0_FULL_ANIMATION :{SETX 12}Animazione completa
STR_02D2_FULL_DETAIL :{SETX 12}Massimo dettaglio
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Edifici trasparenti
@@ -791,7 +791,7 @@
############ range for menu starts
STR_02D5_LAND_BLOCK_INFO :Informazioni sull'area di terreno
STR_02D6 :
-STR_CONSOLE_SETTING :Linea di comando
+STR_CONSOLE_SETTING :Apri/chiudi console
STR_02D7_SCREENSHOT_CTRL_S :Screenshot (Ctrl-S)
STR_02D8_GIANT_SCREENSHOT_CTRL_G :Screenshot Gigante (Ctrl-G)
STR_02D9_ABOUT_OPENTTD :Informazioni su 'OpenTTD'
@@ -803,22 +803,22 @@
STR_02DD_SUBSIDIES :Sussidi
STR_02DE_MAP_OF_WORLD :Mappa del mondo
STR_EXTRA_VIEW_PORT :Mini visuale extra
-STR_SIGN_LIST :Lista cartelli
+STR_SIGN_LIST :Elenco cartelli
STR_TRANSPARENCY_OPTIONS :Opzioni trasparenza
STR_02DF_TOWN_DIRECTORY :Elenco cittÃ
STR_TOWN_POPULATION :{BLACK}Popolazione mondiale: {COMMA}
STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Mini visuale {COMMA}
STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Copia nella mini visuale
-STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Copia la posizione dalla finestra principale alla mini visuale
+STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Copia la posizione della visuale principale in questa mini misuale
STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Copia dalla mini visuale
-STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT :{BLACK}Copia la posizione dalla mini visuale alla finestra principale
+STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT :{BLACK}Copia la posizione di questa mini visuale nella visuale principale
STR_02E0_CURRENCY_UNITS :{BLACK}Valuta
STR_02E1 :{BLACK}{SKIP}{STRING}
STR_02E2_CURRENCY_UNITS_SELECTION :{BLACK}Selezione della valuta
STR_MEASURING_UNITS :{BLACK}Unità di misura
STR_02E4 :{BLACK}{SKIP}{SKIP}{STRING}
-STR_MEASURING_UNITS_SELECTION :{BLACK}Selezione unità di misura
+STR_MEASURING_UNITS_SELECTION :{BLACK}Seleziona le unità di misura
STR_02E6_ROAD_VEHICLES :{BLACK}Automezzi
STR_02E7 :{BLACK}{SKIP}{SKIP}{SKIP}{STRING}
STR_02E8_SELECT_SIDE_OF_ROAD_FOR :{BLACK}Seleziona il lato della strada sul quale devono guidare i veicoli
@@ -854,7 +854,7 @@
STR_0312_FUND_CONSTRUCTION_OF_NEW :{BLACK}Finanzia la costruzione di una nuova industria
############ range for menu starts
-STR_INDUSTRY_DIR :Elenco Industrie
+STR_INDUSTRY_DIR :Elenco industrie
STR_0313_FUND_NEW_INDUSTRY :Finanzia nuova industria
############ range ends here
@@ -878,47 +878,47 @@
STR_0336_7 :{BLACK}7
############ start of townname region
-STR_TOWNNAME_ORIGINAL_ENGLISH :Inglese
-STR_TOWNNAME_FRENCH :Francese
-STR_TOWNNAME_GERMAN :Tedesco
-STR_TOWNNAME_ADDITIONAL_ENGLISH :Inglese (Aggiuntivo)
-STR_TOWNNAME_LATIN_AMERICAN :Latino-Americano
-STR_TOWNNAME_SILLY :Stupidi
-STR_TOWNNAME_SWEDISH :Svedese
-STR_TOWNNAME_DUTCH :Olandese
-STR_TOWNNAME_FINNISH :Finlandese
-STR_TOWNNAME_POLISH :Polacco
-STR_TOWNNAME_SLOVAKISH :Slovacco
-STR_TOWNNAME_NORWEGIAN :Norvegese
-STR_TOWNNAME_HUNGARIAN :Ungherese
+STR_TOWNNAME_ORIGINAL_ENGLISH :Inglesi (originali)
+STR_TOWNNAME_FRENCH :Francesi
+STR_TOWNNAME_GERMAN :Tedeschi
+STR_TOWNNAME_ADDITIONAL_ENGLISH :Inglesi (aggiuntivi)
+STR_TOWNNAME_LATIN_AMERICAN :Latino-americani
+STR_TOWNNAME_SILLY :Sciocchi
+STR_TOWNNAME_SWEDISH :Svedesi
+STR_TOWNNAME_DUTCH :Olandesi
+STR_TOWNNAME_FINNISH :Finlandesi
+STR_TOWNNAME_POLISH :Polacchi
+STR_TOWNNAME_SLOVAKISH :Slovacchi
+STR_TOWNNAME_NORWEGIAN :Norvegesi
+STR_TOWNNAME_HUNGARIAN :Ungheresi
STR_TOWNNAME_AUSTRIAN :Austriaci
-STR_TOWNNAME_ROMANIAN :Rumeno
-STR_TOWNNAME_CZECH :Ceco
-STR_TOWNNAME_SWISS :Svizzero
-STR_TOWNNAME_DANISH :Danese
-STR_TOWNNAME_TURKISH :Turco
-STR_TOWNNAME_ITALIAN :Italiano
-STR_TOWNNAME_CATALAN :Catalano
+STR_TOWNNAME_ROMANIAN :Rumeni
+STR_TOWNNAME_CZECH :Cechi
+STR_TOWNNAME_SWISS :Svizzeri
+STR_TOWNNAME_DANISH :Danesi
+STR_TOWNNAME_TURKISH :Turchi
+STR_TOWNNAME_ITALIAN :Italiani
+STR_TOWNNAME_CATALAN :Catalani
############ end of townname region
STR_CURR_GBP :Sterlina (£)
-STR_CURR_USD :Dollaro USA ($)
+STR_CURR_USD :Dollaro ($)
STR_CURR_EUR :Euro (€)
STR_CURR_YEN :Yen (Â¥)
-STR_CURR_ATS :Scellino Austriano (ATS)
+STR_CURR_ATS :Scellino Austriaco (ATS)
STR_CURR_BEF :Franco Belga (BEF)
STR_CURR_CHF :Franco Svizzero (CHF)
STR_CURR_CZK :Corona Ceca (CZK)
STR_CURR_DEM :Marco Tedesco (DEM)
STR_CURR_DKK :Corona Danese (DKK)
-STR_CURR_ESP :Peseta Spagnola (ESP)
-STR_CURR_FIM :Marco Finlandese(FIM)
+STR_CURR_ESP :Peseta (ESP)
+STR_CURR_FIM :Marco Finlandese (FIM)
STR_CURR_FRF :Franco Francese (FRF)
-STR_CURR_GRD :Drachma Greca (GRD)
+STR_CURR_GRD :Dracma Greca (GRD)
STR_CURR_HUF :Forint Ungherese (HUF)
STR_CURR_ISK :Corona Islandese (ISK)
STR_CURR_ITL :Lira Italiana (ITL)
-STR_CURR_NLG :Fiorino olandese (NLG)
+STR_CURR_NLG :Fiorino Olandese (NLG)
STR_CURR_NOK :Corona Norvegese (NOK)
STR_CURR_PLN :Zloty Polacco (PLN)
STR_CURR_ROL :Leu Rumeno (ROL)
@@ -929,25 +929,25 @@
STR_CURR_SKK :Corona Slovacca (SKK)
STR_CURR_BRR :Real Brasiliano (BRL)
-STR_CURR_CUSTOM :Personalizza...
+STR_CURR_CUSTOM :Personalizzata...
STR_OPTIONS_LANG :{BLACK}Lingua
STR_OPTIONS_LANG_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_OPTIONS_LANG_TIP :{BLACK}Seleziona la lingua da utilizzare
+STR_OPTIONS_LANG_TIP :{BLACK}Seleziona la lingua da utilizzare per l'interfaccia
STR_OPTIONS_FULLSCREEN :{BLACK}Schermo intero
-STR_OPTIONS_FULLSCREEN_TIP :{BLACK}Barra questa casella per giocare a OpenTTD a schermo intero
+STR_OPTIONS_FULLSCREEN_TIP :{BLACK}Attiva questa casella per giocate a OpenTTD in modalità schermo intero
-STR_OPTIONS_RES :{BLACK}Risoluzione video
+STR_OPTIONS_RES :{BLACK}Risoluzione schermo
STR_OPTIONS_RES_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_OPTIONS_RES_TIP :{BLACK}Seleziona la risoluzione video da utilizzare
+STR_OPTIONS_RES_TIP :{BLACK}Seleziona la risoluzione dello schermo da utilizzare
STR_OPTIONS_SCREENSHOT_FORMAT :{BLACK}Formato screenshot
STR_OPTIONS_SCREENSHOT_FORMAT_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_OPTIONS_SCREENSHOT_FORMAT_TIP :{BLACK}Selezionare il formato da usare per le screenshot
+STR_OPTIONS_SCREENSHOT_FORMAT_TIP :{BLACK}Selezionare il formato da usare per gli screenshot
STR_AUTOSAVE_1_MONTH :Ogni mese
-STR_AUTOSAVE_FAILED :{WHITE}Salvataggio automatico fallito.
+STR_AUTOSAVE_FAILED :{WHITE}Salvataggio automatico fallito
STR_MONTH_JAN :Gennaio
STR_MONTH_FEB :Febbraio
@@ -962,8 +962,8 @@
STR_MONTH_NOV :Novembre
STR_MONTH_DEC :Dicembre
-STR_HEADING_FOR_STATION :{LTBLUE}Direzione {STATION}
-STR_HEADING_FOR_STATION_VEL :{LTBLUE}Direzione {STATION}, {VELOCITY}
+STR_HEADING_FOR_STATION :{LTBLUE}Diretto a {STATION}
+STR_HEADING_FOR_STATION_VEL :{LTBLUE}Diretto a {STATION}, {VELOCITY}
STR_NO_ORDERS :{LTBLUE}Nessun ordine
STR_NO_ORDERS_VEL :{LTBLUE}Nessun ordine, {VELOCITY}
@@ -973,178 +973,178 @@
STR_LITERS :litri
STR_ITEMS :oggetti
STR_CRATES :casse
-STR_RES_OTHER :altro
+STR_RES_OTHER :Altra
STR_NOTHING :
STR_SMALL_RIGHT_ARROW :{TINYFONT}{RIGHTARROW}
-STR_CANT_SHARE_ORDER_LIST :{WHITE}Non puoi condividere lista ordini...
-STR_CANT_COPY_ORDER_LIST :{WHITE}Non puoi copiare la lista ordini...
-STR_END_OF_SHARED_ORDERS :{SETX 10}- - Fine degli Ordini Condivisi - -
+STR_CANT_SHARE_ORDER_LIST :{WHITE}Impossibile condividere la lista degli ordini...
+STR_CANT_COPY_ORDER_LIST :{WHITE}Impossibile copiare la lista degli ordini...
+STR_END_OF_SHARED_ORDERS :{SETX 10}- - Fine degli ordini condivisi - -
-STR_TRAIN_IS_LOST :{WHITE}Il treno {COMMA} si è perso.
-STR_TRAIN_IS_UNPROFITABLE :{WHITE}Il profitto del treno {COMMA} per l'anno scorso è stato {CURRENCY}
-STR_EURO_INTRODUCE :{BLACK}{BIGFONT}Unione Monetaria Europea!{}{}E' stato introdotto l'Euro come unica moneta per qualsiasi transazione del tuo Paese!
+STR_TRAIN_IS_LOST :{WHITE}Il Treno {COMMA} si è perso
+STR_TRAIN_IS_UNPROFITABLE :{WHITE}Il profitto del Treno {COMMA} per l'anno scorso è stato {CURRENCY}
+STR_EURO_INTRODUCE :{BLACK}{BIGFONT}Unione Monetaria Europea!{}{}È stato introdotto l'Euro come unica moneta per le transazioni quotidiane nel nostro Paese!
# Start of order review system.
# DON'T ADD OR REMOVE LINES HERE
-STR_TRAIN_HAS_TOO_FEW_ORDERS :{WHITE}Il treno {COMMA} non ha sufficienti ordini pianificati
-STR_TRAIN_HAS_VOID_ORDER :{WHITE}Il treno {COMMA} non ha alcun ordine
-STR_TRAIN_HAS_DUPLICATE_ENTRY :{WHITE}Il treno {COMMA} ha alcuni ordini duplicati
-STR_TRAIN_HAS_INVALID_ENTRY :{WHITE}Il treno {COMMA} ha una stazione non valida negli ordini
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS :{WHITE}Il veicolo {COMMA} non ha sufficienti ordini pianificati
-STR_ROADVEHICLE_HAS_VOID_ORDER :{WHITE}Il veicolo {COMMA} non ha alcun ordine
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY :{WHITE}Il veicolo {COMMA} ha alcuni ordini duplicati
-STR_ROADVEHICLE_HAS_INVALID_ENTRY :{WHITE}Il veicolo {COMMA} ha una stazione non valida negli ordini
-STR_SHIP_HAS_TOO_FEW_ORDERS :{WHITE}La nave {COMMA} non ha sufficienti ordini pianificati
-STR_SHIP_HAS_VOID_ORDER :{WHITE}La nave {COMMA} non ha alcun ordine
-STR_SHIP_HAS_DUPLICATE_ENTRY :{WHITE}La nave {COMMA} ha alcuni ordini duplicati
-STR_SHIP_HAS_INVALID_ENTRY :{WHITE}La nave {COMMA} ha un porto non valido negli ordini
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS :{WHITE}L'aereo {COMMA} non ha abbastanza ordini pianificati
-STR_AIRCRAFT_HAS_VOID_ORDER :{WHITE}L'aereo {COMMA} ha un ordine vuoto nella lista
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY :{WHITE}L'aereo {COMMA} ha alcuni ordini duplicati
-STR_AIRCRAFT_HAS_INVALID_ENTRY :{WHITE}L'aereo {COMMA} ha un aeroporto non valido negli ordini
+STR_TRAIN_HAS_TOO_FEW_ORDERS :{WHITE}Il Treno {COMMA} non ha abbastanza ordini pianificati
+STR_TRAIN_HAS_VOID_ORDER :{WHITE}Il Treno {COMMA} ha un ordine vuoto
+STR_TRAIN_HAS_DUPLICATE_ENTRY :{WHITE}Il Treno {COMMA} ha alcuni ordini duplicati
+STR_TRAIN_HAS_INVALID_ENTRY :{WHITE}Il Treno {COMMA} ha una stazione non valida nei suoi ordini
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS :{WHITE}L'Automezzo {COMMA} non ha abbastanza ordini pianificati
+STR_ROADVEHICLE_HAS_VOID_ORDER :{WHITE}L'Automezzo {COMMA} ha un ordine vuoto
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY :{WHITE}L'Automezzo {COMMA} ha alcuni ordini duplicati
+STR_ROADVEHICLE_HAS_INVALID_ENTRY :{WHITE}L'Automezzo {COMMA} ha una stazione non valida nei suoi ordini
+STR_SHIP_HAS_TOO_FEW_ORDERS :{WHITE}La Nave {COMMA} non ha abbastanza ordini pianificati
+STR_SHIP_HAS_VOID_ORDER :{WHITE}La Nave {COMMA} ha un ordine vuoto
+STR_SHIP_HAS_DUPLICATE_ENTRY :{WHITE}La Nave {COMMA} ha alcuni ordini duplicati
+STR_SHIP_HAS_INVALID_ENTRY :{WHITE}La Nave {COMMA} ha un porto non valido nei suoi ordini
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS :{WHITE}L'Aeromobile {COMMA} non ha abbastanza ordini pianificati
+STR_AIRCRAFT_HAS_VOID_ORDER :{WHITE}L'Aeromobile {COMMA} ha un ordine vuoto
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY :{WHITE}L'Aeromobile {COMMA} ha alcuni ordini duplicati
+STR_AIRCRAFT_HAS_INVALID_ENTRY :{WHITE}L'Aeromobile {COMMA} ha un aeroporto non valido nei suoi ordini
# end of order system
-STR_TRAIN_AUTORENEW_FAILED :{WHITE}Rinnovo automatico fallito per il treno {COMMA} (limite fondi)
-STR_ROADVEHICLE_AUTORENEW_FAILED :{WHITE}Rinnovo automatico fallito per il veicolo {COMMA} (limite fondi)
-STR_SHIP_AUTORENEW_FAILED :{WHITE}Rinnovo automatico fallito per la nave {COMMA} (limite fondi)
-STR_AIRCRAFT_AUTORENEW_FAILED :{WHITE}Rinnovo automatico fallito per l'aereo {COMMA} (limite fondi)
-STR_TRAIN_TOO_LONG_AFTER_REPLACEMENT :{WHITE}Il treno {COMMA} dopo la sostituzione è diventato troppo lungo
+STR_TRAIN_AUTORENEW_FAILED :{WHITE}Rinnovo automatico fallito per il Treno {COMMA} (limite denaro)
+STR_ROADVEHICLE_AUTORENEW_FAILED :{WHITE}Rinnovo automatico fallito per l'Automezzo {COMMA} (limite denaro)
+STR_SHIP_AUTORENEW_FAILED :{WHITE}Rinnovo automatico fallito per la nave {COMMA} (limite denaro)
+STR_AIRCRAFT_AUTORENEW_FAILED :{WHITE}Rinnovo automatico fallito per l'Aeromobile {COMMA} (limite denaro)
+STR_TRAIN_TOO_LONG_AFTER_REPLACEMENT :{WHITE}Il Treno {COMMA} dopo la sostituzione è diventato troppo lungo
-STR_CONFIG_PATCHES :{BLACK}Configura Patch
+STR_CONFIG_PATCHES :{BLACK}Configura patch
STR_CONFIG_PATCHES_TIP :{BLACK}Configura le patch
-STR_CONFIG_PATCHES_CAPTION :{WHITE}Configura Patch
+STR_CONFIG_PATCHES_CAPTION :{WHITE}Configura patch
STR_CONFIG_PATCHES_OFF :No
STR_CONFIG_PATCHES_ON :Si
STR_CONFIG_PATCHES_VEHICLESPEED :{LTBLUE}Mostra velocità veicoli sulla barra di stato: {ORANGE}{STRING}
STR_CONFIG_PATCHES_BUILDONSLOPES :{LTBLUE}Consenti la costruzione sui pendii e coste: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT :{LTBLUE}Permetti aree di carico/scarico più realistiche: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE :{LTBLUE}Permetti rimozione di strade, ponti, ecc. appartenuti alle città : {ORANGE}{STRING}
+STR_CONFIG_PATCHES_CATCHMENT :{LTBLUE}Consenti aree di copertura più realistiche: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_EXTRADYNAMITE :{LTBLUE}Consenti la rimozione di strade, ponti, etc. delle città : {ORANGE}{STRING}
STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Consenti la costruzione di treni molto lunghi: {ORANGE}{STRING}
STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Abilita accelerazione realistica per i treni: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Vieta ai treni e navi di fare curve di 90°: {ORANGE}{STRING} {LTBLUE} (Richiede YAPF o NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Unisci stazioni ferroviarie quando sono vicine: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Lascia stazione quanto uno dei tipi di merce è a pieno carico: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Impedisci a treni e navi di curvare a 90°: {ORANGE}{STRING} {LTBLUE} (richiede NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Unisci le stazioni ferroviarie costruite una accanto all'altra: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Lascia stazione quando una qualsiasi merce è a pieno carico: {ORANGE}{STRING}
STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Usa l'algoritmo di caricamento migliorato: {ORANGE}{STRING}
STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Carica i veicoli gradualmente: {ORANGE}{STRING}
STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflazione: {ORANGE}{STRING}
STR_CONFIG_PATCHES_SELECTGOODS :{LTBLUE}Scarica le merci in una stazione solo se richieste: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LONGBRIDGES :{LTBLUE}Consenti la costruzione di ponti molto lunghi: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT :{LTBLUE}Consenti gli ordini 'vai al deposito': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND :{LTBLUE}Consenti la costruzione di industrie produttrici di materia prima: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN :{LTBLUE}Consenti la costruzione di più industrie simili per città : {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE :{LTBLUE}Consenti la costruzione di industrie uguali anche se molto vicine: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE :{LTBLUE}Mostra sempre formato esteso della data nella barra di stato: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE :{LTBLUE}Mostra segnali sul lato guida: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES :{LTBLUE}Mostra finestra info finanziare alla fine di ogni anno: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP :{LTBLUE}Gestisci funzione 'non-stop' come TTDPatch: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE :{LTBLUE}Accoda veicoli stradali quando l'area di carico è occupata: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL :{LTBLUE}Scorri orizzontalmente la visuale se il mouse è agli angoli: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE :{LTBLUE}Consenti corruzione autorità locale: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_GOTODEPOT :{LTBLUE}Consenti gli ordini 'Vai al deposito': {ORANGE}{STRING}
+STR_CONFIG_PATCHES_BUILDXTRAIND :{LTBLUE}Consenti la costruzione di industrie primarie: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MULTIPINDTOWN :{LTBLUE}Consenti più industrie dello stesso tipo nella stessa città : {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SAMEINDCLOSE :{LTBLUE}Consenti la costruzione di industrie uguali anche molto vicine: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LONGDATE :{LTBLUE}Mostra sempre la data lunga nella barra di stato: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SIGNALSIDE :{LTBLUE}Mostra i segnali sul lato di guida: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SHOWFINANCES :{LTBLUE}Mostra la finestra delle finanze alla fine dell'anno: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NEW_NONSTOP :{LTBLUE}Gestisci la funzione 'non-stop' come in TTDPatch: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE :{LTBLUE}Accodamento automezzi fuori da una stazione occupata: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTOSCROLL :{LTBLUE}Scorri la visuale quando il mouse è su un bordo: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_BRIBE :{LTBLUE}Consenti la corruzione dell'autorità locale: {ORANGE}{STRING}
STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}Stazioni non uniformi: {ORANGE}{STRING}
STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL :{LTBLUE}Nuovo pathfinding globale (NPF, sovrascrive NTP): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}Moltiplicatore di peso per simulare treni pesanti: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD :{LTBLUE}Permetti fermate passanti sulle strade pubbliche: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}Moltiplicatore di peso per simulare treni merci pesanti: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD :{LTBLUE}Consenti fermate passanti sulle strade delle città : {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SMALL_AIRPORTS :{LTBLUE}Consenti la costruzione di piccoli aeroporti: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS :{LTBLUE}Consenti sempre la costruzione di piccoli aeroporti: {ORANGE}{STRING}
STR_CONFIG_PATCHES_WARN_LOST_TRAIN :{LTBLUE}Avvisa se un treno si è perso: {ORANGE}{STRING}
STR_CONFIG_PATCHES_ORDER_REVIEW :{LTBLUE}Controlla gli ordini dei veicoli: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ORDER_REVIEW_OFF :disabilitato
-STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT :si, ma escludi i veicoli fermi
-STR_CONFIG_PATCHES_ORDER_REVIEW_ON :per tutti i veicoli
+STR_CONFIG_PATCHES_ORDER_REVIEW_OFF :No
+STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT :Sì, ma escludi i veicoli fermi
+STR_CONFIG_PATCHES_ORDER_REVIEW_ON :Per tutti i veicoli
STR_CONFIG_PATCHES_WARN_INCOME_LESS :{LTBLUE}Avvisa se i guadagni di un treno sono in negativo: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES :{LTBLUE}I veicoli non invecchiano mai: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTORENEW_VEHICLE :{LTBLUE}Rinnova un veicolo quando diventa datato
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES :{LTBLUE}I veicoli non diventano mai obsoleti: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_VEHICLE :{LTBLUE}Rinnova un veicolo quando diventa vecchio
STR_CONFIG_PATCHES_AUTORENEW_MONTHS :{LTBLUE}Rinnova un veicolo quando è {ORANGE}{STRING}{LTBLUE} mesi fuori età massima
-STR_CONFIG_PATCHES_AUTORENEW_MONEY :{LTBLUE}Rinnova solo se disponibile il fondo minimo di: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION :{LTBLUE}Durata visualizzazione messaggio di errore: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL :{LTBLUE}Mostra la popolazione di un paese nell'etichetta: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES :{LTBLUE}Alberi invisibili (se edifici trasparenti): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONEY :{LTBLUE}Rinnova solo se disponibile il fondo minimo di {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ERRMSG_DURATION :{LTBLUE}Durata dei messaggi d'errore: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL :{LTBLUE}Mostra la popolazione di una città nell'etichetta del nome: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_INVISIBLE_TREES :{LTBLUE}Alberi invisibili (con edifici trasparenti attivati): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LAND_GENERATOR :{LTBLUE}Generatore terreni: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LAND_GENERATOR :{LTBLUE}Generatore terreno: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LAND_GENERATOR_ORIGINAL :Originale
STR_CONFIG_PATCHES_LAND_GENERATOR_TERRA_GENESIS :TerraGenesis
-STR_CONFIG_PATCHES_OIL_REF_EDGE_DISTANCE :{LTBLUE}Massima distanza dal bordo per le Raffinerie {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT :{LTBLUE}Altezza limite delle nevi perenni: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN :{LTBLUE}Ruvidità del terreno (solo TerraGenesis) : {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH :Molto Morbido
+STR_CONFIG_PATCHES_OIL_REF_EDGE_DISTANCE :{LTBLUE}Max distanza delle raffinerie dal bordo della mappa: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT :{LTBLUE}Altezza delle nevi perenni: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN :{LTBLUE}Irregolarità del terreno (solo TerraGenesis): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH :Molto morbido
STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_SMOOTH :Morbido
-STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_ROUGH :Ruvido
-STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_ROUGH :Molto Ruvido
-STR_CONFIG_PATCHES_TREE_PLACER :{LTBLUE}Algoritmo per il piazzamento di alberi: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_ROUGH :Accidentato
+STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_ROUGH :Molto accidentato
+STR_CONFIG_PATCHES_TREE_PLACER :{LTBLUE}Algoritmo di piazzamento degli alberi: {ORANGE}{STRING}
STR_CONFIG_PATCHES_TREE_PLACER_NONE :Nessuno
STR_CONFIG_PATCHES_TREE_PLACER_ORIGINAL :Originale
-STR_CONFIG_PATCHES_TREE_PLACER_IMPROVED :Aggiornato
+STR_CONFIG_PATCHES_TREE_PLACER_IMPROVED :Migliorato
STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION :{LTBLUE}Rotazione heightmap: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE :Antiorario
-STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_CLOCKWISE :Orario
-STR_CONFIG_PATCHES_SE_FLAT_WORLD_HEIGHT :{LTBLUE}La curva di livello della mappa di uno scenario piano ha : {ORANGE}{STRING}
+STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE :Antioraria
+STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_CLOCKWISE :Oraria
+STR_CONFIG_PATCHES_SE_FLAT_WORLD_HEIGHT :{LTBLUE}Altitudine delle mappe pianeggiante: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD :{LTBLUE}Dispersione max. stazione: {ORANGE}{STRING} {RED}Nota: Valore alto rallenta il gioco
-STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}Manutenzione elicotteri direttamente all'eliporto: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_STATION_SPREAD :{LTBLUE}Max estensione stazioni: {ORANGE}{STRING} {RED}Nota: Valori alti rallentano il gioco
+STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}Manutieni automaticamente gli elicotteri presso gli eliporti: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Apri strumenti terreno assieme a quelli di costruzione: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REVERSE_SCROLLING :{LTBLUE}Scorri mappa nella direzione opposta a quella del mouse: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_REVERSE_SCROLLING :{LTBLUE}Inverti direzione di scorrimento della mappa: {ORANGE}{STRING}
STR_CONFIG_PATCHES_MEASURE_TOOLTIP :{LTBLUE}Mostra un tooltip di misura durante la costruzione: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LIVERIES :{LTBLUE}Mostra le livree della società : {ORANGE}{STRING}
STR_CONFIG_PATCHES_LIVERIES_NONE :Nessuna
-STR_CONFIG_PATCHES_LIVERIES_OWN :Propria societÃ
-STR_CONFIG_PATCHES_LIVERIES_ALL :Tutte le societÃ
-STR_CONFIG_PATCHES_PREFER_TEAMCHAT :{LTBLUE}Preferisce team chat con <ENTER>: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LIVERIES_OWN :Propria compagnia
+STR_CONFIG_PATCHES_LIVERIES_ALL :Tutte le compagnie
+STR_CONFIG_PATCHES_PREFER_TEAMCHAT :{LTBLUE}Chatta con la squadra premento INVIO: {ORANGE}{STRING}
STR_CONFIG_PATCHES_SCROLLWHEEL_SCROLLING :{LTBLUE}Funzione della rotellina: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SCROLLWHEEL_ZOOM :Zoom mappa
-STR_CONFIG_PATCHES_SCROLLWHEEL_SCROLL :Scrolla mappa
+STR_CONFIG_PATCHES_SCROLLWHEEL_ZOOM :Zoom della mappa
+STR_CONFIG_PATCHES_SCROLLWHEEL_SCROLL :Scorri la mappa
STR_CONFIG_PATCHES_SCROLLWHEEL_OFF :Off
STR_CONFIG_PATCHES_SCROLLWHEEL_MULTIPLIER :{LTBLUE}Velocità rotellina mappa: {ORANGE}{STRING}
STR_CONFIG_PATCHES_MAX_TRAINS :{LTBLUE}Max treni per giocatore: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH :{LTBLUE}Max veicoli stradali per giocatore: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT :{LTBLUE}Max aeroplani per giocatore: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_ROADVEH :{LTBLUE}Max automezzi per giocatore: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT :{LTBLUE}Max aeromobili per giocatore: {ORANGE}{STRING}
STR_CONFIG_PATCHES_MAX_SHIPS :{LTBLUE}Max navi per giocatore: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS :{LTBLUE}Disabilita treni: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH :{LTBLUE}Disabilita veicoli stradali: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT :{LTBLUE}Disabilita aerei: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS :{LTBLUE}Disabilita navi: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS :{LTBLUE}Disabilita treni dell'IA: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH :{LTBLUE}Disabilita automezzi dell'IA: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT :{LTBLUE}Disabilita aeromobili dell'IA: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS :{LTBLUE}Disabilita navi dell'IA: {ORANGE}{STRING}
STR_CONFIG_PATCHES_AINEW_ACTIVE :{LTBLUE}Abilita la nuova IA (alpha): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_IN_MULTIPLAYER :{LTBLUE}Permetti AI in multiplayer (sperimentale): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_IN_MULTIPLAYER :{LTBLUE}Permetti le IA nelle partite multigiocatore (sperimentale): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SERVINT_TRAINS :{LTBLUE}Intervallo di servizio predefinito per i treni: {ORANGE}{STRING} giorni/%
-STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED :{LTBLUE}Intervallo di servizio predefinito per i treni: {ORANGE}disabilitato
-STR_CONFIG_PATCHES_SERVINT_ROADVEH :{LTBLUE}Intervallo di servizio predefinito per i veicoli stradali: {ORANGE}{STRING} giorni
-STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED :{LTBLUE}Intervallo di servizio predefinito per i veicoli stradali: {ORANGE}disabilitato
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT :{LTBLUE}Intervallo di servizio predefinito per gli aerei: {ORANGE}{STRING} giorni
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED :{LTBLUE}Intervallo di servizio predefinito per gli aerei: {ORANGE}disabilitato
-STR_CONFIG_PATCHES_SERVINT_SHIPS :{LTBLUE}Intervallo di servizio predefinito per le navi: {ORANGE}{STRING} giorni/%
-STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED :{LTBLUE}Intervallo di servizio predefinito per le navi: {ORANGE}disabilitato
-STR_CONFIG_PATCHES_NOSERVICE :{LTBLUE}Disabilità servicing quando i guasti sono "nessuno": {ORANGE}{STRING}
-STR_CONFIG_PATCHES_WAGONSPEEDLIMITS :{LTBLUE}Abilita limite velocità vagoni: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_TRAINS :{LTBLUE}Intervallo manutenzione predefinito treni: {ORANGE}{STRING} giorni/%
+STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED :{LTBLUE}Intervallo manutenzione predefinito treni: {ORANGE}Disabilitato
+STR_CONFIG_PATCHES_SERVINT_ROADVEH :{LTBLUE}Intervallo manutenzione predefinito automezzi: {ORANGE}{STRING} giorni/%
+STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED :{LTBLUE}Intervallo manutenzione predefinito automezzi: {ORANGE}Disabilitato
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT :{LTBLUE}Intervallo manutenzione predefinito aeromobili: {ORANGE}{STRING} giorni/%
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED :{LTBLUE}Intervallo manutenzione predefinito aeromobili: {ORANGE}Disabilitato
+STR_CONFIG_PATCHES_SERVINT_SHIPS :{LTBLUE}Intervallo manutenzione predefinito navi: {ORANGE}{STRING} giorni/%
+STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED :{LTBLUE}Intervallo manutenzione predefinito navi: {ORANGE}Disabilitato
+STR_CONFIG_PATCHES_NOSERVICE :{LTBLUE}Disabilita manutenzione con i guasti veicoli disattivati: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WAGONSPEEDLIMITS :{LTBLUE}Abilita limiti di velocità dei vagoni: {ORANGE}{STRING}
STR_CONFIG_PATCHES_DISABLE_ELRAILS :{LTBLUE}Disabilita ferrovie elettrificate: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_COLORED_NEWS_YEAR :{LTBLUE}Notizie colorate appaiono dal: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_YEAR :{LTBLUE}Data di inizio: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_YEAR :{LTBLUE}Concludi il gioco il: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_YEAR :{LTBLUE}Giornali a colori dal: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_STARTING_YEAR :{LTBLUE}Anno di inizio: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ENDING_YEAR :{LTBLUE}Termina la partita nel: {ORANGE}{STRING}
STR_CONFIG_PATCHES_SMOOTH_ECONOMY :{LTBLUE}Abilita economia fluida (cambiamenti piccoli e frequenti)
-STR_CONFIG_PATCHES_ALLOW_SHARES :{LTBLUE}Permetti l'acquisto di azioni da altre compagnie
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY :{LTBLUE}Trascinando il cursore costruisci i semafori ogni: {ORANGE}{STRING} quadrato/i
-STR_CONFIG_PATCHES_SEMAPHORE_BUILD_BEFORE_DATE :{LTBLUE}Costruisce automaticamente i semafori prima del: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ALLOW_SHARES :{LTBLUE}Permetti l'acquisto di azioni di altre compagnie
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY :{LTBLUE}Trascinando il cursore, piazza i segnali ogni: {ORANGE}{STRING} quadrato/i
+STR_CONFIG_PATCHES_SEMAPHORE_BUILD_BEFORE_DATE :{LTBLUE}Costruisci automaticamente i semafori prima del: {ORANGE}{STRING}
STR_CONFIG_PATCHES_TOOLBAR_POS :{LTBLUE}Posizione barra degli strumenti principale: {ORANGE}{STRING}
STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT :Sinistra
STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER :Centro
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :Destra
-STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Raggio di snap delle finestre: {ORANGE}{STRING} px
-STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}Raggio di snap delle finestre: {ORANGE}disabilitato
+STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Raggio di aggancio delle finestre: {ORANGE}{STRING} px
+STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}Raggio di aggancio delle finestre: {ORANGE}Disabilitato
STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}Velocità di crescita delle città : {ORANGE}{STRING}
STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :Nessuna
STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :Lenta
STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :Normale
STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :Veloce
STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :Molto veloce
-STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}Città che cresceranno a velocità doppia {ORANGE}1 su {STRING}
-STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}Città che cresceranno a velocità doppia {ORANGE}Nessuna
+STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}Città che cresceranno a velocità doppia: {ORANGE}1 su {STRING}
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}Città che cresceranno a velocità doppia: {ORANGE}Nessuna
STR_CONFIG_PATCHES_GUI :{BLACK}Interfaccia
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}Costruzione
@@ -1157,38 +1157,38 @@
STR_CONFIG_PATCHES_INT32 :{NUM}
STR_CONFIG_PATCHES_CURRENCY :{CURRENCY}
-STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Cambia valori impostazioni
-STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Alcuni o tutti gli intervalli di servizio predefiniti sottostanti sono incompatibili con le impostazioni scelte! 5-90% e 30-800 giorni sono valori validi
+STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Cambia impostazione
+STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Alcuni degli intervalli sottostanti sono incompatibili con l'impostazione scelta! Valori ammessi: 5-90% e 30-800 giorni
STR_CONFIG_PATCHES_YAPF_SHIPS :{LTBLUE}Usa YAPF per le navi: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_YAPF_ROAD :{LTBLUE}Usa YAPF per i veicoli stradali: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_YAPF_ROAD :{LTBLUE}Usa YAPF per gli automezzi: {ORANGE}{STRING}
STR_CONFIG_PATCHES_YAPF_RAIL :{LTBLUE}Usa YAPF per i treni: {ORANGE}{STRING}
STR_TEMPERATE_LANDSCAPE :Paesaggio 'temperato'
STR_SUB_ARCTIC_LANDSCAPE :Paesaggio 'sub-artico'
STR_SUB_TROPICAL_LANDSCAPE :Paesaggio 'sub-tropicale'
-STR_TOYLAND_LANDSCAPE :Paesaggio 'Città dei Giocattoli'
+STR_TOYLAND_LANDSCAPE :Paesaggio 'città dei giocattoli'
STR_CHEATS :{WHITE}Trucchi
-STR_CHEATS_TIP :{BLACK}Le caselle indicano se hai già utilizzato questo trucco in passato
-STR_CHEATS_WARNING :{BLACK}Attenzione! Stai per tradire i tuoi avversari. Ricordati che un così grande disonore verrà ricordato per l'eternità .
-STR_CHEAT_MONEY :{LTBLUE}Aumenta soldi di {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Gioca come giocatore: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Bulldozer magico (rimuove industrie e altri): {ORANGE}{STRING}
+STR_CHEATS_TIP :{BLACK}Le caselle indicano se un trucco è già stato usato una volta
+STR_CHEATS_WARNING :{BLACK}Attenzione! Stai per tradire i tuoi avversari. Ricordati che un così grande disonore sarà ricordato per l'eternità .
+STR_CHEAT_MONEY :{LTBLUE}Aumenta denaro di {CURRENCY64}
+STR_CHEAT_CHANGE_PLAYER :{LTBLUE}Controlla il giocatore: {ORANGE}{COMMA}
+STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Bulldozer magico (rimuove industrie e oggetti inamovibili): {ORANGE}{STRING}
STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}I tunnel possono incrociarsi tra loro: {ORANGE}{STRING}
STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Consenti costruzione in pausa: {ORANGE}{STRING}
STR_CHEAT_NO_JETCRASH :{LTBLUE}I jet non si schiantano (frequententemente) nei piccoli aeroporti: {ORANGE} {STRING}
-STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}Cambia paesaggio: {ORANGE} {STRING}
+STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}Cambia tipo di paesaggio: {ORANGE} {STRING}
STR_CHEAT_CHANGE_DATE :{LTBLUE}Cambia data: {ORANGE} {DATE_SHORT}
STR_CHEAT_SETUP_PROD :{LTBLUE}Permetti la modifica dei valori di produzione: {ORANGE}{STRING}
-STR_HEADING_FOR_WAYPOINT :{LTBLUE}Direzione {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Direzione {WAYPOINT}, {VELOCITY}
+STR_HEADING_FOR_WAYPOINT :{LTBLUE}Diretto a {WAYPOINT}
+STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Diretto a {WAYPOINT}, {VELOCITY}
-STR_GO_TO_WAYPOINT :Vai al {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT :Procedi non-stop via {WAYPOINT}
+STR_GO_TO_WAYPOINT :Procedi attraverso {WAYPOINT}
+STR_GO_NON_STOP_TO_WAYPOINT :Procedi non-stop attraverso {WAYPOINT}
-STR_WAYPOINTNAME_CITY :Waypoint {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL :Waypoint {TOWN} #{COMMA}
+STR_WAYPOINTNAME_CITY :Waypoint di {TOWN}
+STR_WAYPOINTNAME_CITY_SERIAL :Waypoint di {TOWN} #{COMMA}
STR_LANDINFO_WAYPOINT :Waypoint
STR_WAYPOINT :{WHITE}Waypoint
@@ -1197,54 +1197,54 @@
STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT}
STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT}
STR_WAYPOINT_RAW :{WAYPOINT}
-STR_EDIT_WAYPOINT_NAME :{WHITE}Cambia il nome al waypoint
+STR_EDIT_WAYPOINT_NAME :{WHITE}Rinomina il waypoint
-STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Non puoi cambiare il nome al waypoint...
-STR_CONVERT_RAIL_TO_WAYPOINT_TIP :{BLACK}Trasforma la ferrovia in un waypoint
-STR_CANT_BUILD_TRAIN_WAYPOINT :{WHITE}Non puoi costruire qui un waypoint ferroviario...
-STR_CANT_REMOVE_TRAIN_WAYPOINT :{WHITE}Non puoi demolire un waypoint ferroviario qui...
+STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Impossibile rinominare il waypoint...
+STR_CONVERT_RAIL_TO_WAYPOINT_TIP :{BLACK}Trasforma la rotaia in un waypoint
+STR_CANT_BUILD_TRAIN_WAYPOINT :{WHITE}Impossibile costruire qui un waypoint ferroviario...
+STR_CANT_REMOVE_TRAIN_WAYPOINT :{WHITE}Impossibile rimuovere il waypoint ferroviario da qui...
STR_BUILD_AUTORAIL_TIP :{BLACK}Costruisci binario usando la modalità automatica
STR_NO_TOWN_IN_SCENARIO :{WHITE}...non ci sono città in questo scenario
-STR_GENERATE_RANDOM_LANDSCAPE :{WHITE}Sei sicuro di voler creare un terreno casuale?
+STR_GENERATE_RANDOM_LANDSCAPE :{WHITE}Si è sicuri di voler generare un paesaggio casuale?
STR_MANY_RANDOM_TOWNS :{BLACK}Alcune città casuali
-STR_RANDOM_TOWNS_TIP :{BLACK}Copri la mappa con città costruite casualmente
+STR_RANDOM_TOWNS_TIP :{BLACK}Copre la mappa con città posizionate casualmente
STR_MANY_RANDOM_INDUSTRIES :{BLACK}Alcune industrie casuali
-STR_RANDOM_INDUSTRIES_TIP :{BLACK}Copri la mappa con industrie costruite casualmente
-STR_CAN_T_GENERATE_INDUSTRIES :{WHITE}Non puoi generare le industrie...
+STR_RANDOM_INDUSTRIES_TIP :{BLACK}Copre la mappa con industrie posizionate casualmente
+STR_CAN_T_GENERATE_INDUSTRIES :{WHITE}Impossibile generare industrie...
-STR_LANDSCAPING_TOOLBAR_TIP :{BLACK}Apri la barra 'Modellazione terreno' per alzare/abbassare il terreno, piantare alberi, ecc.
+STR_LANDSCAPING_TOOLBAR_TIP :{BLACK}Apre la barra di modellazione del terreno per alzare/abbassare il terreno, piantare alberi, etc.
STR_LANDSCAPING_TOOLBAR :{WHITE}Modella terreno
STR_LEVEL_LAND_TOOLTIP :{BLACK}Livella terreno
STR_TREES_RANDOM_TYPE :{BLACK}Alberi casuali
-STR_TREES_RANDOM_TYPE_TIP :{BLACK}Pianta alberi di tipo casuale
+STR_TREES_RANDOM_TYPE_TIP :{BLACK}Pianta alberi di specie a caso
-STR_CANT_BUILD_CANALS :{WHITE}Non puoi costruire qui un canale...
-STR_BUILD_CANALS_TIP :{BLACK}Costruisci canali.
+STR_CANT_BUILD_CANALS :{WHITE}Impossibile costruire qui il canale...
+STR_BUILD_CANALS_TIP :{BLACK}Costruisce canali
STR_LANDINFO_CANAL :Canale
-STR_CANT_BUILD_LOCKS :{WHITE}Non puoi costruire qui una chiusa...
-STR_BUILD_LOCKS_TIP :{BLACK}Costruisci chiusa
-STR_LANDINFO_LOCK :Chiusa
+STR_CANT_BUILD_LOCKS :{WHITE}Impossibile costruire qui le chiuse...
+STR_BUILD_LOCKS_TIP :{BLACK}Costruisci chiuse
+STR_LANDINFO_LOCK :Chiuse
STR_BUOY_IS_IN_USE :{WHITE}...la boa è in uso!
STR_LANDINFO_COORDS :{BLACK}Coordinate: {LTBLUE}{NUM}x{NUM} ({STRING})
-STR_CANT_REMOVE_PART_OF_STATION :{WHITE}Non puoi demolire una porzione di stazione...
-STR_CANT_CONVERT_RAIL :{WHITE}Non puoi convertire il tipo di rotaie...
-STR_CONVERT_RAIL_TIP :{BLACK}Converti/aggiorna il tipo di rotaie
+STR_CANT_REMOVE_PART_OF_STATION :{WHITE}Impossibile rimuovere parte della stazione...
+STR_CANT_CONVERT_RAIL :{WHITE}Impossibile convertire il tipo di rotaie qui...
+STR_CONVERT_RAIL_TIP :{BLACK}Converte/aggiorna il tipo di rotaie
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP :{BLACK}Trascina qui la locomotiva per vendere l'intero treno
+STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP :{BLACK}Trascinare qui la locomotiva di un treno per vendere l'intero treno
-STR_DRAG_DROP :{BLACK}Drag & Drop
-STR_STATION_DRAG_DROP :{BLACK}Costruisci una stazione con il drag & drop
-STR_SELECT_STATION_CLASS_TIP :{BLACK}Seleziona un tipo di classe di stazione per mostrare
-STR_SELECT_STATION_TYPE_TIP :{BLACK}Scegli il tipo di stazione da costruire
+STR_DRAG_DROP :{BLACK}Drag & drop
+STR_STATION_DRAG_DROP :{BLACK}Costruisce una stazione con il drag & drop
+STR_SELECT_STATION_CLASS_TIP :{BLACK}Seleziona il tipo di stazioni da mostrare
+STR_SELECT_STATION_TYPE_TIP :{BLACK}Seleziona il tipo di stazione da costruire
STR_FAST_FORWARD :{BLACK}Aumenta la velocità di gioco
STR_MESSAGE_HISTORY :{WHITE}Cronologia messaggi
@@ -1252,77 +1252,77 @@
STR_MESSAGES_DISABLE_ALL :{BLACK}Disabilita tutti
STR_MESSAGES_ENABLE_ALL :{BLACK}Abilita tutti
-STR_CONSTRUCT_COAL_MINE_TIP :{BLACK}Costruisci Miniera di Carbone
-STR_CONSTRUCT_FOREST_TIP :{BLACK}Pianta Foresta
-STR_CONSTRUCT_OIL_RIG_TIP :{BLACK}Costruisci Piattaforma Petrolifera
-STR_CONSTRUCT_FARM_TIP :{BLACK}Fonda Fattoria
-STR_CONSTRUCT_COPPER_ORE_MINE_TIP :{BLACK}Costruisci Miniera di Rame
-STR_CONSTRUCT_OIL_WELLS_TIP :{BLACK}Costruisci Pozzo Petrolifero
-STR_CONSTRUCT_GOLD_MINE_TIP :{BLACK}Costruisci Miniera d'Oro
-STR_CONSTRUCT_DIAMOND_MINE_TIP :{BLACK}Costruisci Miniera di Diamanti
-STR_CONSTRUCT_IRON_ORE_MINE_TIP :{BLACK}Costruisci Miniera di Ferro
-STR_CONSTRUCT_FRUIT_PLANTATION_TIP :{BLACK}Pianta Piantagione di Frutta
-STR_CONSTRUCT_RUBBER_PLANTATION_TIP :{BLACK}Pianta Piantagione di Gomma
-STR_CONSTRUCT_WATER_SUPPLY_TIP :{BLACK}Fonda Sorgente di Acqua
-STR_CONSTRUCT_COTTON_CANDY_TIP :{BLACK}Pianta Foresta di Cotton Candy
-STR_CONSTRUCT_BATTERY_FARM_TIP :{BLACK}Finanzia Fabbrica di Batterie
-STR_CONSTRUCT_COLA_WELLS_TIP :{BLACK}Pozzi di Cola
-STR_CONSTRUCT_PLASTIC_FOUNTAINS_TIP :{BLACK}Fonda Fontane di Plastica
-STR_CONSTRUCT_BUBBLE_GENERATOR_TIP :{BLACK}Costruisci Generatore di Bolle
-STR_CONSTRUCT_TOFFEE_QUARRY_TIP :{BLACK}Fonda Toffee Quarry
-STR_CONSTRUCT_SUGAR_MINE_TIP :{BLACK}Costruisci Raffineria di Zucchero
+STR_CONSTRUCT_COAL_MINE_TIP :{BLACK}Costruisce una Miniera di carbone
+STR_CONSTRUCT_FOREST_TIP :{BLACK}Pianta una Foresta
+STR_CONSTRUCT_OIL_RIG_TIP :{BLACK}Costruisce una Piattaforma petrolifera
+STR_CONSTRUCT_FARM_TIP :{BLACK}Finanzia una Fattoria
+STR_CONSTRUCT_COPPER_ORE_MINE_TIP :{BLACK}Costruisce una Miniera di rame
+STR_CONSTRUCT_OIL_WELLS_TIP :{BLACK}Scava in cerca di Petrolio
+STR_CONSTRUCT_GOLD_MINE_TIP :{BLACK}Costruisce una Miniera d'oro
+STR_CONSTRUCT_DIAMOND_MINE_TIP :{BLACK}Costruisce una Miniera di diamanti
+STR_CONSTRUCT_IRON_ORE_MINE_TIP :{BLACK}Costruisce una Miniera di ferro
+STR_CONSTRUCT_FRUIT_PLANTATION_TIP :{BLACK}Finanzia una Piantagione di frutta
+STR_CONSTRUCT_RUBBER_PLANTATION_TIP :{BLACK}Finanzia una Piantagione di gomma
+STR_CONSTRUCT_WATER_SUPPLY_TIP :{BLACK}Finanzia la ricerca di una Falda acquifera
+STR_CONSTRUCT_COTTON_CANDY_TIP :{BLACK}Pianta una Foresta di zucchero filato
+STR_CONSTRUCT_BATTERY_FARM_TIP :{BLACK}Finanzia una Fattoria delle batterie
+STR_CONSTRUCT_COLA_WELLS_TIP :{BLACK}Scava in cerca di Cola
+STR_CONSTRUCT_PLASTIC_FOUNTAINS_TIP :{BLACK}Finanzia una Sorgente di plastica
+STR_CONSTRUCT_BUBBLE_GENERATOR_TIP :{BLACK}Costruisce un Generatore di bollicine
+STR_CONSTRUCT_TOFFEE_QUARRY_TIP :{BLACK}Finanzia una Cava di toffee
+STR_CONSTRUCT_SUGAR_MINE_TIP :{BLACK}Costruisce una Miniera di zucchero
STR_INDUSTRYDIR_CAPTION :{WHITE}Industrie
STR_INDUSTRYDIR_ITEM :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% trasportato)
-STR_INDUSTRYDIR_ITEM_TWO :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% trasportate)
+STR_INDUSTRYDIR_ITEM_TWO :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% trasportato)
STR_INDUSTRYDIR_ITEM_NOPROD :{ORANGE}{INDUSTRY}
-STR_INDUSTRY_TOO_CLOSE :{WHITE}...troppo vicina ad un'altra industria.
+STR_INDUSTRY_TOO_CLOSE :{WHITE}...troppo vicina ad un'altra industria
-STR_RAIL_REFIT_VEHICLE_TO_CARRY :{BLACK}Riadatta il treno per trasportare un differente tipo di carico
+STR_RAIL_REFIT_VEHICLE_TO_CARRY :{BLACK}Riadatta il treno per trasportare un carico differente
STR_RAIL_REFIT_VEHICLE :{BLACK}Riadatta treno
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR :{BLACK}Seleziona tipo di carico per il treno
+STR_RAIL_SELECT_TYPE_OF_CARGO_FOR :{BLACK}Selezionare il tipo di carico da far trasportare al treno
STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED :{BLACK}Riadatta il treno per trasportare il tipo di carico selezionato
STR_RAIL_CAN_T_REFIT_VEHICLE :{WHITE}Impossibile riadattare il treno...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT :{LTBLUE}Gli intervalli di servizio sono in percentuale: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT :{LTBLUE}Gli intervalli di manutenzione sono in percentuale: {ORANGE}{STRING}
STR_CONFIG_GAME_PRODUCTION :{WHITE}Cambia produzione
-TEMP_AI_IN_PROGRESS :{WHITE}Benvenuto nella nuova IA, in sviluppo. Puoi aspettarti dei problemi. Quando succede, fai uno screenshot e invialo sul forum. Divertiti!
-TEMP_AI_ACTIVATED :{WHITE}Attenzione: la nuova IA è ancora in alpha! Per ora solo i camion e i bus funzionano!
-TEMP_AI_MULTIPLAYER :{WHITE}Attenzione: questa funzione è sperimentale. Siete pregati di segnalare i relativi probemi a: truelight@openttd.org.
+TEMP_AI_IN_PROGRESS :{WHITE}Benvenuti nella nuova IA, in sviluppo. Se si incontrano dei problemi, fare uno screenshot e inviarlo sul forum.
+TEMP_AI_ACTIVATED :{WHITE}Attenzione: la nuova IA è ancora in alpha! Attualmente funzionano solo camion e autobus!
+TEMP_AI_MULTIPLAYER :{WHITE}Attenzione: l'implementazione è ancora sperimentale (utilizza la nuova IA). Segnalare qualsiasi problema a: truelight@openttd.org.
############ network gui strings
-STR_NETWORK_MULTIPLAYER :{WHITE}Multiplayer
+STR_NETWORK_MULTIPLAYER :{WHITE}Multigiocatore
STR_NETWORK_PLAYER_NAME :{BLACK}Nome giocatore:
-STR_NETWORK_ENTER_NAME_TIP :{BLACK}Questo è il nome con cui gli altri giocatori ti identificheranno
+STR_NETWORK_ENTER_NAME_TIP :{BLACK}Questo è il nome con cui si verrà identificati dagli altri giocatori
STR_NETWORK_CONNECTION :{BLACK}Connessione:
-STR_NETWORK_CONNECTION_TIP :{BLACK}Scegli tra un gioco internet e un gioco in LAN (Local Area Network)
+STR_NETWORK_CONNECTION_TIP :{BLACK}Sceglie fra una partita in Internet o in rete locale (LAN)
STR_NETWORK_START_SERVER :{BLACK}Avvia server
-STR_NETWORK_START_SERVER_TIP :{BLACK}Avvia il tuo server
+STR_NETWORK_START_SERVER_TIP :{BLACK}Avvia il proprio server
STR_NETWORK_GAME_NAME :{BLACK}Nome
-STR_NETWORK_GAME_NAME_TIP :{BLACK}Nome del gioco
-STR_NETWORK_INFO_ICONS_TIP :{BLACK}Lingua, versione server, ecc.
-STR_NETWORK_CLICK_GAME_TO_SELECT :{BLACK}Clicca su un nome della lista per selezionarlo
+STR_NETWORK_GAME_NAME_TIP :{BLACK}Nome della partita
+STR_NETWORK_INFO_ICONS_TIP :{BLACK}Lingua, versione del server, etc.
+STR_NETWORK_CLICK_GAME_TO_SELECT :{BLACK}Fare clic su una partita in elenco per selezionarla
STR_NETWORK_FIND_SERVER :{BLACK}Trova server
-STR_NETWORK_FIND_SERVER_TIP :{BLACK}Cerca nella rete un server
+STR_NETWORK_FIND_SERVER_TIP :{BLACK}Cerca un server sulla rete
STR_NETWORK_ADD_SERVER :{BLACK}Aggiungi server
-STR_NETWORK_ADD_SERVER_TIP :{BLACK}Aggiungi un server alla lista che verrà sempre controllata per giochi attivi.
-STR_NETWORK_ENTER_IP :{BLACK}Digita indirizzo IP del server
+STR_NETWORK_ADD_SERVER_TIP :{BLACK}Aggiunge all'elenco un server che verrà sempre controllato in cerca di partite attive
+STR_NETWORK_ENTER_IP :{BLACK}Digitare l'indirizzo del server
STR_NETWORK_GENERAL_ONLINE :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION :{BLACK}Clients
-STR_NETWORK_CLIENTS_CAPTION_TIP :{BLACK}Clients online / clients max{}Società online / società max
+STR_NETWORK_CLIENTS_CAPTION :{BLACK}Client
+STR_NETWORK_CLIENTS_CAPTION_TIP :{BLACK}Client online / client max{}Compagnie online / compagnie max
STR_NETWORK_GAME_INFO :{SILVER}INFORMAZIONI PARTITA
STR_ORANGE :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS :{SILVER}Clients: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_CLIENTS :{SILVER}Client: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
STR_NETWORK_LANGUAGE :{SILVER}Lingua: {WHITE}{STRING}
-STR_NETWORK_TILESET :{SILVER}Ambiente: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE :{SILVER}Dimens: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_TILESET :{SILVER}Paesaggio: {WHITE}{STRING}
+STR_NETWORK_MAP_SIZE :{SILVER}Dimensione mappa: {WHITE}{COMMA}x{COMMA}
STR_NETWORK_SERVER_VERSION :{SILVER}Versione server: {WHITE}{STRING}
STR_NETWORK_SERVER_ADDRESS :{SILVER}Indirizzo del server: {WHITE}{STRING} : {NUM}
STR_NETWORK_START_DATE :{SILVER}Data di inizio: {WHITE}{DATE_SHORT}
@@ -1331,26 +1331,26 @@
STR_NETWORK_SERVER_OFFLINE :{SILVER}SERVER OFFLINE
STR_NETWORK_SERVER_FULL :{SILVER}SERVER PIENO
STR_NETWORK_VERSION_MISMATCH :{SILVER}VERSIONE DIFFERENTE
-STR_NETWORK_GRF_MISMATCH :{SILVER}NEWGRF DISALLINEATA
+STR_NETWORK_GRF_MISMATCH :{SILVER}NEWGRF DIFFERENTI
-STR_NETWORK_JOIN_GAME :{BLACK}Entra nel gioco
+STR_NETWORK_JOIN_GAME :{BLACK}Entra nella partita
-STR_NETWORK_START_GAME_WINDOW :{WHITE}Avvia nuovo gioco
+STR_NETWORK_START_GAME_WINDOW :{WHITE}Avvia nuova partita multigiocatore
-STR_NETWORK_NEW_GAME_NAME :{BLACK}Nome gioco:
-STR_NETWORK_NEW_GAME_NAME_TIP :{BLACK}Il nome della partita verrà visualizzato dagli altri giocatori nel menu di selezione del gioco
+STR_NETWORK_NEW_GAME_NAME :{BLACK}Nome partita:
+STR_NETWORK_NEW_GAME_NAME_TIP :{BLACK}Il nome della partita sarà mostrato dagli altri giocatori nel menu di selezione delle partite multigiocatore
STR_NETWORK_SET_PASSWORD :{BLACK}Imposta password
-STR_NETWORK_PASSWORD_TIP :{BLACK}Proteggi il tuo gioco con una password se non vuoi che altre persone vi entrino
+STR_NETWORK_PASSWORD_TIP :{BLACK}Protegge la partita con una password in modo che non sia accessibile pubblicamente
STR_NETWORK_SELECT_MAP :{BLACK}Seleziona una mappa:
STR_NETWORK_SELECT_MAP_TIP :{BLACK}Con quale mappa vuoi giocare?
-STR_NETWORK_NUMBER_OF_CLIENTS :{BLACK}Massimo numero di clients:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP :{BLACK}Imposta il numero massimo di clients. Non tutti i slot devono essere riempiti
+STR_NETWORK_NUMBER_OF_CLIENTS :{BLACK}Max client:
+STR_NETWORK_NUMBER_OF_CLIENTS_TIP :{BLACK}Imposta il numero massimo di client. Non tutti i posti dovranno essere occupati
STR_NETWORK_COMBO1 :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
STR_NETWORK_LAN :LAN
STR_NETWORK_INTERNET :Internet
STR_NETWORK_LAN_INTERNET :LAN / Internet
-STR_NETWORK_INTERNET_ADVERTISE :Internet (avvisa)
+STR_NETWORK_INTERNET_ADVERTISE :Internet (pubblicizza)
STR_NETWORK_COMBO2 :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
STR_NETWORK_0_PLAYERS :0 giocatori
STR_NETWORK_1_PLAYERS :1 giocatore
@@ -1363,19 +1363,19 @@
STR_NETWORK_8_PLAYERS :8 giocatori
STR_NETWORK_9_PLAYERS :9 giocatori
STR_NETWORK_10_PLAYERS :10 giocatori
-STR_NETWORK_NUMBER_OF_COMPANIES :{BLACK}Massimo società :
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP :{BLACK}Limitare il server ad un certo numero di societÃ
+STR_NETWORK_NUMBER_OF_COMPANIES :{BLACK}Max compagnie:
+STR_NETWORK_NUMBER_OF_COMPANIES_TIP :{BLACK}Limita il server a un certo numero di compagnie
STR_NETWORK_COMBO3 :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_NUMBER_OF_SPECTATORS :{BLACK}Massimo spettatori:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP :{BLACK}Limitare il server ad un certo numero di spettatori
+STR_NETWORK_NUMBER_OF_SPECTATORS :{BLACK}Max spettatori:
+STR_NETWORK_NUMBER_OF_SPECTATORS_TIP :{BLACK}Limita il server a un certo numero di spettatori
STR_NETWORK_COMBO4 :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
STR_NETWORK_LANGUAGE_SPOKEN :{BLACK}Lingua parlata:
-STR_NETWORK_LANGUAGE_TIP :{BLACK}Gli altri giocatori sapranno quale lingua viene parlata sul server
+STR_NETWORK_LANGUAGE_TIP :{BLACK}Fa spaere agli altri giocatori quale lingua è parlata sul server
STR_NETWORK_COMBO5 :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME :{BLACK}Avvia gioco
-STR_NETWORK_START_GAME_TIP :{BLACK}Inizia una nuova partita in rete partendo da una mappa random o da uno scenario
-STR_NETWORK_LOAD_GAME :{BLACK}Carica Gioco
-STR_NETWORK_LOAD_GAME_TIP :{BLACK}Riprendi una partita salvata in precedenza (Assicurati di connetterti come il giocatore corretto)
+STR_NETWORK_START_GAME :{BLACK}Avvia partita
+STR_NETWORK_START_GAME_TIP :{BLACK}Inizia una nuova partita in rete con una mappa casuale o uno scenario
+STR_NETWORK_LOAD_GAME :{BLACK}Carica partita
+STR_NETWORK_LOAD_GAME_TIP :{BLACK}Riprende una partita multigiocatore salvata in precedenza (assicurarsi di connettersi come il giocatore corretto)
############ Leave those lines in this order!!
STR_NETWORK_LANG_ANY :Qualsiasi
@@ -1384,97 +1384,97 @@
STR_NETWORK_LANG_FRENCH :Francese
############ End of leave-in-this-order
-STR_NETWORK_GAME_LOBBY :{WHITE}Stanza di gioco multiplayer
+STR_NETWORK_GAME_LOBBY :{WHITE}Stanza principale partite multigiocatore
-STR_NETWORK_PREPARE_TO_JOIN :{BLACK}In procinto di entrare: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP :{BLACK}Lista di tutte le società attualmente nel gioco. Puoi usare una di queste o fondarne una se c'è un posto libero
-STR_NETWORK_NEW_COMPANY :{BLACK}Nuova societÃ
-STR_NETWORK_NEW_COMPANY_TIP :{BLACK}Apri una nuova societÃ
+STR_NETWORK_PREPARE_TO_JOIN :{BLACK}Preparazione all'ingresso in: {ORANGE}{STRING}
+STR_NETWORK_COMPANY_LIST_TIP :{BLACK}Elenco di tutte le compagnie attualmente nella partita. È possibile unirsi ad una di esse o fondarne una nuova se è disponibile un posto
+STR_NETWORK_NEW_COMPANY :{BLACK}Nuova compagnia
+STR_NETWORK_NEW_COMPANY_TIP :{BLACK}Crea una nuova compagnia
STR_NETWORK_SPECTATE_GAME :{BLACK}Assisti alla partita
-STR_NETWORK_SPECTATE_GAME_TIP :{BLACK}Assisti al gioco come spettatore
-STR_NETWORK_JOIN_COMPANY :{BLACK}Usa societÃ
-STR_NETWORK_JOIN_COMPANY_TIP :{BLACK}Aiuta a controllare questa societÃ
-STR_NETWORK_REFRESH :{BLACK}Ricarica server
-STR_NETWORK_REFRESH_TIP :{BLACK}Ricarica informazioni del server
+STR_NETWORK_SPECTATE_GAME_TIP :{BLACK}Osserva la partita come spettatore
+STR_NETWORK_JOIN_COMPANY :{BLACK}Usa compagnia
+STR_NETWORK_JOIN_COMPANY_TIP :{BLACK}Aiuta a controllare questa compagnia
+STR_NETWORK_REFRESH :{BLACK}Aggiorna
+STR_NETWORK_REFRESH_TIP :{BLACK}Aggiorna le informazioni sul server
STR_NETWORK_COMPANY_INFO :{SILVER}INFORMAZIONI COMPAGNIA
-STR_NETWORK_COMPANY_NAME :{SILVER}Nome società : {WHITE}{STRING}
+STR_NETWORK_COMPANY_NAME :{SILVER}Nome compagnia: {WHITE}{STRING}
STR_NETWORK_INAUGURATION_YEAR :{SILVER}Inaugurazione: {WHITE}{NUM}
-STR_NETWORK_VALUE :{SILVER}Valore società : {WHITE}{CURRENCY64}
+STR_NETWORK_VALUE :{SILVER}Valore compagnia: {WHITE}{CURRENCY64}
STR_NETWORK_CURRENT_BALANCE :{SILVER}Bilancio corrente: {WHITE}{CURRENCY64}
-STR_NETWORK_LAST_YEARS_INCOME :{SILVER}Entrate dell'ultimo anno: {WHITE}{CURRENCY64}
+STR_NETWORK_LAST_YEARS_INCOME :{SILVER}Incassi anno scorso: {WHITE}{CURRENCY64}
STR_NETWORK_PERFORMANCE :{SILVER}Prestazioni: {WHITE}{NUM}
STR_NETWORK_VEHICLES :{SILVER}Veicoli: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
STR_NETWORK_STATIONS :{SILVER}Stazioni: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
STR_NETWORK_PLAYERS :{SILVER}Giocatori: {WHITE}{STRING}
-STR_NETWORK_CONNECTING :{WHITE}Connessione in corso...
+STR_NETWORK_CONNECTING :{WHITE}Connessione...
############ Leave those lines in this order!!
STR_NETWORK_CONNECTING_1 :{BLACK}(1/6) Connessione..
STR_NETWORK_CONNECTING_2 :{BLACK}(2/6) Autorizzazione..
-STR_NETWORK_CONNECTING_3 :{BLACK}(3/6) Attendere prego..
-STR_NETWORK_CONNECTING_4 :{BLACK}(4/6) Download mappa..
-STR_NETWORK_CONNECTING_5 :{BLACK}(5/6) Caricamento dei dati..
+STR_NETWORK_CONNECTING_3 :{BLACK}(3/6) In attesa..
+STR_NETWORK_CONNECTING_4 :{BLACK}(4/6) Download della mappa..
+STR_NETWORK_CONNECTING_5 :{BLACK}(5/6) Elaborazione dei dati..
STR_NETWORK_CONNECTING_6 :{BLACK}(6/6) Registrazione..
-STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}Ricezione informazioni gioco..
-STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Ricezione informazioni società ..
+STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}Recupero informazioni partita..
+STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Recupero informazioni compagnie..
############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} clients in attesa
+STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} client in attesa
STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kbyte scaricati
-STR_NETWORK_DISCONNECT :{BLACK}Disconnessione
+STR_NETWORK_DISCONNECT :{BLACK}Disconnetti
-STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Inserisci l'ammontare di denaro che vuoi donare
-STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Server protetto. Inserisci la password
-STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Società protetta. Inserisci la password
-STR_NETWORK_CLIENT_LIST :{WHITE}Lista dei clients
+STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Inserire la quantità di denaro da donare
+STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Server protetto. Inserire la password
+STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Compagnia protetta. Inserire la password
+STR_NETWORK_CLIENT_LIST :{WHITE}Elenco dei client
STR_NETWORK_ERR_NOTAVAILABLE :{WHITE} Nessun dispositivo di rete trovato o compilato senza ENABLE_NETWORK
STR_NETWORK_ERR_NOSERVER :{WHITE} Impossibile trovare partite in rete
STR_NETWORK_ERR_NOCONNECTION :{WHITE} Il server non ha risposto alla richiesta
-STR_NETWORK_ERR_NEWGRF_MISMATCH :{WHITE} Impossibile collegarsi causa file NewGRF non corrispondenti
-STR_NETWORK_ERR_DESYNC :{WHITE} Sincronizzazione alla partita in rete fallita.
+STR_NETWORK_ERR_NEWGRF_MISMATCH :{WHITE} Impossibile connettersi a causa di file NewGRF differenti
+STR_NETWORK_ERR_DESYNC :{WHITE} Sincronizzazione alla partita in rete fallita
STR_NETWORK_ERR_LOSTCONNECTION :{WHITE} Connessione alla partita in rete persa.
-STR_NETWORK_ERR_SAVEGAMEERROR :{WHITE} Impossibile caricare il savegame dal server.
-STR_NETWORK_ERR_SERVER_START :{WHITE} Impossibile inizializzare il server
+STR_NETWORK_ERR_SAVEGAMEERROR :{WHITE} Impossibile caricare la partita salvata
+STR_NETWORK_ERR_SERVER_START :{WHITE} Impossibile avviare il server
STR_NETWORK_ERR_CLIENT_START :{WHITE} Impossibile connettersi
-STR_NETWORK_ERR_TIMEOUT :{WHITE} Connessione #{NUM} time-out.
+STR_NETWORK_ERR_TIMEOUT :{WHITE} Tempo scaduto per la connessione #{NUM}
STR_NETWORK_ERR_SERVER_ERROR :{WHITE} Un errore di protocollo ha chiuso la connessione
-STR_NETWORK_ERR_WRONG_REVISION :{WHITE} La revision del client non è la stessa di quella del server
-STR_NETWORK_ERR_WRONG_PASSWORD :{WHITE} Password Errata
+STR_NETWORK_ERR_WRONG_REVISION :{WHITE} La revisione di questo client non corrisponde a quella del server
+STR_NETWORK_ERR_WRONG_PASSWORD :{WHITE} Password errata
STR_NETWORK_ERR_SERVER_FULL :{WHITE} Il server è pieno
STR_NETWORK_ERR_SERVER_BANNED :{WHITE} Sei stato bannato da questo server
-STR_NETWORK_ERR_KICKED :{WHITE} Sei stato espulso dal gioco
+STR_NETWORK_ERR_KICKED :{WHITE} Sei stato espulso dalla partita
STR_NETWORK_ERR_CHEATER :{WHITE} I trucchi non sono ammessi su questo server
STR_NETWORK_ERR_LEFT :ha lasciato il gioco
############ Leave those lines in this order!!
STR_NETWORK_ERR_CLIENT_GENERAL :errore generale
STR_NETWORK_ERR_CLIENT_DESYNC :errore di sincronizzazione
-STR_NETWORK_ERR_CLIENT_SAVEGAME :Impossibile caricare la mappa
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST :Connessione perduta
+STR_NETWORK_ERR_CLIENT_SAVEGAME :impossibile caricare la mappa
+STR_NETWORK_ERR_CLIENT_CONNECTION_LOST :connessione perduta
STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR :errore di protocollo
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH :File NewGRF non corrispondenti
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED :Non Autorizzato
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED :ricevuto uno strano pacchetto
+STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH :file NewGRF non corrispondenti
+STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED :non autorizzato
+STR_NETWORK_ERR_CLIENT_NOT_EXPECTED :ricevuto un pacchetto inatteso
STR_NETWORK_ERR_CLIENT_WRONG_REVISION :revisione differente
STR_NETWORK_ERR_CLIENT_NAME_IN_USE :nome già in uso
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :game-password errata
-STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :player-id errato in DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED :Espulso dal server
+STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD :password errata
+STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH :id giocatore errato in DoCommand
+STR_NETWORK_ERR_CLIENT_KICKED :espulso dal server
STR_NETWORK_ERR_CLIENT_CHEATER :ha provato a usare un trucco
STR_NETWORK_ERR_CLIENT_SERVER_FULL :server pieno
############ End of leave-in-this-order
-STR_NETWORK_CLIENT_JOINED :è entrato nel gioco
-STR_NETWORK_GIVE_MONEY :ha donato alla tua società del denaro ({CURRENCY})
+STR_NETWORK_CLIENT_JOINED :è entrato nella partita
+STR_NETWORK_GIVE_MONEY :ha donato alla tua compagnia del denaro ({CURRENCY})
STR_NETWORK_GAVE_MONEY_AWAY :hai donato a {STRING} del denaro ({CURRENCY})
-STR_NETWORK_CHAT_COMPANY_CAPTION :[Team] :
-STR_NETWORK_CHAT_COMPANY :[Gruppo] {STRING}: {GRAY}{STRING}
-STR_NETWORK_CHAT_TO_COMPANY :[Gruppo] A {STRING}: {GRAY}{STRING}
+STR_NETWORK_CHAT_COMPANY_CAPTION :[Squadra] :
+STR_NETWORK_CHAT_COMPANY :[Squadra] {STRING}: {GRAY}{STRING}
+STR_NETWORK_CHAT_TO_COMPANY :[Squadra] A {STRING}: {GRAY}{STRING}
STR_NETWORK_CHAT_CLIENT_CAPTION :[Privato] :
STR_NETWORK_CHAT_CLIENT :[Privato] {STRING}: {GRAY}{STRING}
STR_NETWORK_CHAT_TO_CLIENT :[Privato] A {STRING}: {GRAY}{STRING}
@@ -1488,7 +1488,7 @@
STR_NETWORK_CLIENT :Client
STR_NETWORK_SPECTATORS :Spettatori
-STR_NETWORK_CLIENTLIST_NONE :(niente)
+STR_NETWORK_CLIENTLIST_NONE :(nessuno)
STR_NETWORK_CLIENTLIST_KICK :Espelli
STR_NETWORK_CLIENTLIST_GIVE_MONEY :Dona denaro
STR_NETWORK_CLIENTLIST_SPEAK_TO_ALL :Parla a tutti
@@ -1501,27 +1501,27 @@
############ end network gui strings
-STR_CONFIG_PATCHES_MAP_X :{LTBLUE}X della mappa: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y :{LTBLUE}Y della mappa: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X :{LTBLUE}Dimensione X della mappa: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_Y :{LTBLUE}Dimensione Y della mappa: {ORANGE}{STRING}
##### PNG-MAP-Loader
-STR_PNGMAP_ERROR :{WHITE}Non posso caricare il terreno dal PNG...
+STR_PNGMAP_ERROR :{WHITE}Impossibile caricare il terreno il terreno dal file PNG...
STR_PNGMAP_ERR_FILE_NOT_FOUND :{WHITE}...file non trovato.
-STR_PNGMAP_ERR_IMAGE_TYPE :{WHITE}...non posso convertire il tipo di immagine. Richiede immagine PNG 8 o 24-bit.
-STR_PNGMAP_ERR_MISC :{WHITE}...qualcosa è andato male. Spiacente. (probabilimente il file è corrotto)
+STR_PNGMAP_ERR_IMAGE_TYPE :{WHITE}...impossibile convertire il tipo di immagine. È richiesta un'immagine PNG a 8 o 24 bit.
+STR_PNGMAP_ERR_MISC :{WHITE}...qualcosa non ha funzionato (probabilimente il file è corrotto)
-STR_BMPMAP_ERROR :{WHITE}Non posso caricare il terreno da BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE :{WHITE}...non posso convertire il tipo di immagine.
+STR_BMPMAP_ERROR :{WHITE}Impossibile caricare il terreno dalla bitmap...
+STR_BMPMAP_ERR_IMAGE_TYPE :{WHITE}...impossibile convertire il tipo di immagine
##id 0x0800
STR_0800_COST :{TINYFONT}{RED}Costo: {CURRENCY}
STR_0801_COST :{RED}Costo: {CURRENCY}
STR_0802_INCOME :{TINYFONT}{GREEN}Incasso: {CURRENCY}
STR_0803_INCOME :{GREEN}Incasso: {CURRENCY}
-STR_FEEDER_TINY :{TINYFONT}{YELLOW}Trasferisci: {CURRENCY}
-STR_FEEDER :{YELLOW}Trasferisci: {CURRENCY}
+STR_FEEDER_TINY :{TINYFONT}{YELLOW}Trasferiti: {CURRENCY}
+STR_FEEDER :{YELLOW}Trasferiti: {CURRENCY}
STR_0805_ESTIMATED_COST :{WHITE}Costo stimato: {CURRENCY}
STR_0807_ESTIMATED_INCOME :{WHITE}Incasso stimato: {CURRENCY}
STR_0808_CAN_T_RAISE_LAND_HERE :{WHITE}Impossibile alzare il terreno qui...
@@ -1544,7 +1544,7 @@
STR_1007_ALREADY_BUILT :{WHITE}...già costruito
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Bisogna demolire i binari prima
STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Costruzione ferrovie
-STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Costruzione Ferrovie Elettrificate
+STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Costruzione ferrovie elettrificate
STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Costruzione monorotaia
STR_100C_MAGLEV_CONSTRUCTION :{WHITE}Costruzione maglev
STR_100D_SELECT_RAIL_BRIDGE :{WHITE}Seleziona ponte ferroviario
@@ -1571,16 +1571,16 @@
STR_1021_RAILROAD_TRACK :Binari
STR_1023_RAILROAD_TRAIN_DEPOT :Deposito ferroviario
STR_1024_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...l'area appartiene a un'altra compagnia
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS :Binario ferroviario con segnali normali
-STR_RAILROAD_TRACK_WITH_PRESIGNALS :Binario ferroviario con presegnali
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS :Binario ferroviario con segnali di uscita
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Binario ferroviario con segnali combinati
+STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS :Ferrovia con segnali normali
+STR_RAILROAD_TRACK_WITH_PRESIGNALS :Ferrovia con pre-segnali
+STR_RAILROAD_TRACK_WITH_EXITSIGNALS :Ferrovia con segnali di uscita
+STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Ferrovia con segnali combinati
##id 0x1800
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Bisogna rimuovere la strada prima
-STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Lavori stradali in progresso
+STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Lavori stradali in corso
STR_1802_ROAD_CONSTRUCTION :{WHITE}Costruzione strade
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Seleziona ponte stradale
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Impossibile costruire la strada qui...
@@ -1603,8 +1603,8 @@
STR_1816_TREE_LINED_ROAD :Strada alberata
STR_1817_ROAD_VEHICLE_DEPOT :Deposito automezzi
STR_1818_ROAD_RAIL_LEVEL_CROSSING :Passaggio a livello
-STR_CAN_T_REMOVE_BUS_STATION :{WHITE}Non posso togliere la fermata bus...
-STR_CAN_T_REMOVE_TRUCK_STATION :{WHITE}Non posso togliere la stazione camion...
+STR_CAN_T_REMOVE_BUS_STATION :{WHITE}Impossibile rimuovere la stazione degli autobus...
+STR_CAN_T_REMOVE_TRUCK_STATION :{WHITE}Impossibile rimuovere l'area di carico per camion...
##id 0x2000
STR_2000_TOWNS :{WHITE}CittÃ
@@ -1613,7 +1613,7 @@
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
STR_2002 :{TINYFONT}{BLACK}{STRING}
-STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}L'edificio dele essere demolito prima
+STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}L'edificio deve essere demolito prima
STR_2005 :{WHITE}{TOWN}
STR_2006_POPULATION :{BLACK}Popolazione: {ORANGE}{COMMA}{BLACK} Case: {ORANGE}{COMMA}
STR_2007_RENAME_TOWN :Rinomina cittÃ
@@ -1651,13 +1651,13 @@
STR_2027_FROM_TO :{ORANGE}{STRING} da {STRING} a {STRING}
STR_2028_BY :{YELLOW} (entro {DATE_SHORT})
STR_202A_NONE :{ORANGE}Nessuno
-STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Servizi già sussidiati:
+STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Servizi già sovvenzionati:
STR_202C_FROM_TO :{ORANGE}{STRING} da {STATION} a {STATION}{YELLOW} ({COMPANY}
STR_202D_UNTIL :{YELLOW}, fino al {DATE_SHORT})
STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Offerta di sussidio scaduta:{}{}Il trasporto di {STRING} da {STRING} a {STRING} non darà più diritto a sovvenzioni.
-STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Sussidio terminato:{}{}servizio di {STRING} da {STATION} a {STATION} non è più sovvenzionato.
-STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Offerta di sussidio:{}{}Primo servizio di {STRING} da {STRING} a {STRING} riceverà un'anno di sussidio dall'autorità locale!
-STR_2031_SERVICE_SUBSIDY_AWARDED :{BLACK}{BIGFONT}Sussidio aggiudicato da {COMPANY}!{}{}servizio di {STRING} da {STATION} a {STATION} verrà pagato il 50% in più per il prossimo anno!
+STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Sussidio terminato:{}{}Il trasporto di {STRING} da {STATION} a {STATION} non è più sovvenzionato.
+STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Offerta di sussidio:{}{}Il primo servizio di {STRING} da {STRING} a {STRING} riceverà un'anno di sovvenzioni dall'autorità locale!
+STR_2031_SERVICE_SUBSIDY_AWARDED :{BLACK}{BIGFONT}Sussidio aggiudicato alla {COMPANY}!{}{}Il trasporto di {STRING} da {STATION} a {STATION} verrà pagato il 50% in più per il prossimo anno!
STR_2032_SERVICE_SUBSIDY_AWARDED :{BLACK}{BIGFONT}Sussidio aggiudicato alla {COMPANY}!{}{}Il trasporto di {STRING} da {STATION} a {STATION} verrà pagato il doppio per il prossimo anno!
STR_2033_SERVICE_SUBSIDY_AWARDED :{BLACK}{BIGFONT}Sussidio aggiudicato alla {COMPANY}!{}{}Il trasporto di {STRING} da {STATION} a {STATION} verrà pagato il triplo per il prossimo anno!
STR_2034_SERVICE_SUBSIDY_AWARDED :{BLACK}{BIGFONT}Sussidio aggiudicato alla {COMPANY}!{}{}Il trasporto di {STRING} da {STATION} a {STATION} verrà pagato il quadruplo per il prossimo anno!
@@ -1693,7 +1693,7 @@
STR_2051_BUILD_A_STATUE_IN_HONOR :{WHITE}{STRING}{}{YELLOW} Costruisce una statua in onore della compagnia.{} Costo: {CURRENCY}
STR_2052_FUND_THE_CONSTRUCTION_OF :{WHITE}{STRING}{}{YELLOW} Finanzia la costruzione di nuovi edifici commerciali nella città .{} Costo: {CURRENCY}
STR_2053_BUY_1_YEAR_S_EXCLUSIVE :{WHITE}{STRING}{}{YELLOW} Compra un 1 di diritti di trasporto esclusivi in città . L'autorità cittadina permetterà a passeggeri e merci di usare solo le stazioni della compagnia.{} Costo: {CURRENCY}
-STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC :{WHITE}{STRING}{}{YELLOW} Corrompi l'autorità locale per incrementare la tua valutazione con il rischio di una severa multa se scoperto.{} Costo: {CURRENCY}
+STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC :{WHITE}{STRING}{}{YELLOW} Corrompi l'autorità locale per autmentare la tua valutazione, con il rischio di una severa multa se scoperto.{} Costo: {CURRENCY}
STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING :{BIGFONT}{BLACK}Traffico nel caos a {TOWN}!{}{}La ricostruzione delle strade finanziata dalla {COMPANY} porterà 6 mesi di disagio agli automobilisti!
STR_2056 :{TINYFONT}{WHITE}{TOWN}
STR_2058_UNDER_CONSTRUCTION :{STRING} (in costruzione)
@@ -1704,7 +1704,7 @@
STR_INDUSTRY :{INDUSTRY}
STR_TOWN :{TOWN}
-STR_INDUSTRY_FORMAT :{TOWN} {STRING}
+STR_INDUSTRY_FORMAT :{1:STRING} di {0:TOWN}
STR_STATION :{STATION}
##id 0x2800
@@ -1963,9 +1963,9 @@
STR_SV_EMPTY :
STR_SV_UNNAMED :Senza nome
STR_SV_TRAIN_NAME :Treno {COMMA}
-STR_SV_ROADVEH_NAME :Veicolo Stradale {COMMA}
+STR_SV_ROADVEH_NAME :Automezzo {COMMA}
STR_SV_SHIP_NAME :Nave {COMMA}
-STR_SV_AIRCRAFT_NAME :Aereo {COMMA}
+STR_SV_AIRCRAFT_NAME :Aeromobile {COMMA}
STR_SV_STNAME :{STRING}
STR_SV_STNAME_NORTH :{STRING} Nord
@@ -1976,14 +1976,14 @@
STR_SV_STNAME_TRANSFER :{STRING} Interscambio
STR_SV_STNAME_HALT :{STRING} Fermata
STR_SV_STNAME_VALLEY :{STRING} Valle
-STR_SV_STNAME_HEIGHTS :{STRING} Altura
+STR_SV_STNAME_HEIGHTS :Alture di {STRING}
STR_SV_STNAME_WOODS :{STRING} Bosco
STR_SV_STNAME_LAKESIDE :{STRING} Lago
STR_SV_STNAME_EXCHANGE :{STRING} Scambio
-STR_SV_STNAME_AIRPORT :{STRING} Aeroporto
-STR_SV_STNAME_OILFIELD :{STRING} Campo Petrolifero
+STR_SV_STNAME_AIRPORT :Aeroporto di {STRING}
+STR_SV_STNAME_OILFIELD :Pozzi di {STRING}
STR_SV_STNAME_MINES :{STRING} Miniere
-STR_SV_STNAME_DOCKS :{STRING} Molo
+STR_SV_STNAME_DOCKS :Porto di {STRING}
STR_SV_STNAME_BUOY_1 :{STRING} Boa 1
STR_SV_STNAME_BUOY_2 :{STRING} Boa 2
STR_SV_STNAME_BUOY_3 :{STRING} Boa 3
@@ -1993,12 +1993,12 @@
STR_SV_STNAME_BUOY_7 :{STRING} Boa 7
STR_SV_STNAME_BUOY_8 :{STRING} Boa 8
STR_SV_STNAME_BUOY_9 :{STRING} Boa 9
-STR_SV_STNAME_ANNEXE :{STRING} Annesso
-STR_SV_STNAME_SIDINGS :{STRING} Tronchino
-STR_SV_STNAME_BRANCH :{STRING} Ramo
+STR_SV_STNAME_ANNEXE :{STRING} Distaccata
+STR_SV_STNAME_SIDINGS :{STRING} Raccordo
+STR_SV_STNAME_BRANCH :{STRING} Ramificata
STR_SV_STNAME_UPPER :Alta {STRING}
STR_SV_STNAME_LOWER :Bassa {STRING}
-STR_SV_STNAME_HELIPORT :{STRING} Eliporto
+STR_SV_STNAME_HELIPORT :Eliporto di {STRING}
STR_SV_STNAME_FOREST :{STRING} Foresta
############ end of savegame specific region!
@@ -2011,14 +2011,14 @@
STR_6801_EASY :{BLACK}Facile
STR_6802_MEDIUM :{BLACK}Medio
STR_6803_HARD :{BLACK}Difficile
-STR_6804_CUSTOM :{BLACK}Personalizzato
+STR_6804_CUSTOM :{BLACK}Personalizzata
############ range for difficulty levels ends
############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS :{LTBLUE}Numero max. di avversari: {ORANGE}{COMMA}
+STR_6805_MAXIMUM_NO_COMPETITORS :{LTBLUE}Numero massimo di avversari: {ORANGE}{COMMA}
STR_6806_COMPETITOR_START_TIME :{LTBLUE}Partenza avversari: {ORANGE}{STRING}
-STR_6807_NO_OF_TOWNS :{LTBLUE}Num. di città : {ORANGE}{STRING}
-STR_6808_NO_OF_INDUSTRIES :{LTBLUE}Num. di industrie: {ORANGE}{STRING}
+STR_6807_NO_OF_TOWNS :{LTBLUE}Numero di città : {ORANGE}{STRING}
+STR_6808_NO_OF_INDUSTRIES :{LTBLUE}Numero di industrie: {ORANGE}{STRING}
STR_6809_MAXIMUM_INITIAL_LOAN_000 :{LTBLUE}Prestito massimo iniziale: {ORANGE}{CURRENCY}
STR_680A_INITIAL_INTEREST_RATE :{LTBLUE}Tasso d'interesse iniziale: {ORANGE}{COMMA}%
STR_680B_VEHICLE_RUNNING_COSTS :{LTBLUE}Costi d'esercizio dei veicoli: {ORANGE}{STRING.mp}
@@ -2048,20 +2048,8 @@
STR_681F_VERY_FAST :Molto veloce
STR_VERY_LOW :Molto basso
STR_6820_LOW :Basso
-STR_6820_LOW.ms :Basso
-STR_6820_LOW.mp :Bassi
-STR_6820_LOW.fs :Bassa
-STR_6820_LOW.fp :Basse
STR_6821_MEDIUM :Medio
-STR_6821_MEDIUM.ms :Medio
-STR_6821_MEDIUM.mp :Medi
-STR_6821_MEDIUM.fs :Media
-STR_6821_MEDIUM.fp :Medie
STR_6822_HIGH :Alto
-STR_6822_HIGH.ms :Alto
-STR_6822_HIGH.mp :Alti
-STR_6822_HIGH.fs :Alta
-STR_6822_HIGH.fp :Alte
STR_6823_NONE :Nessuno
STR_6824_REDUCED :Ridotti
STR_6825_NORMAL :Normali
@@ -2091,7 +2079,7 @@
##id 0x7000
STR_7000 :
STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
-STR_7002_PLAYER :(Giocatore {COMMA})
+STR_7002_PLAYER : (Giocatore {COMMA})
STR_7004_NEW_FACE :{BLACK}Nuova faccia
STR_7005_COLOR_SCHEME :{BLACK}Colori compagnia
STR_7006_COLOR_SCHEME :{GOLD}Schema colori:
@@ -2126,9 +2114,9 @@
STR_CURRCOMPACT :{CURRCOMPACT64}
STR_7024 :{COMMA}
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}Grafico profitto operativo
-STR_7026_BANK_BALANCE :{WHITE}Bilancio Bancario
+STR_7026_BANK_BALANCE :{WHITE}Bilancio bancario
STR_7027_LOAN :{WHITE}Prestito
-STR_MAX_LOAN :{WHITE}Prestito Massimo: {BLACK}{CURRENCY64}
+STR_MAX_LOAN :{WHITE}Prestito massimo: {BLACK}{CURRENCY64}
STR_7028 :{BLACK}{CURRENCY64}
STR_7029_BORROW :{BLACK}Chiedi in prestito {SKIP}{SKIP}{SKIP}{SKIP}{CURRENCY}
STR_702A_REPAY :{BLACK}Ripaga {SKIP}{SKIP}{SKIP}{SKIP}{CURRENCY}
@@ -2137,7 +2125,7 @@
STR_702D_LOAN_ALREADY_REPAYED :{WHITE}...debito già estinto
STR_702E_REQUIRED :{WHITE}...{CURRENCY} richiesti
STR_702F_CAN_T_REPAY_LOAN :{WHITE}Impossibile ripagare il prestito...
-STR_INSUFFICIENT_FUNDS :{WHITE}Non è possibile donare denaro, è in prestito dalla banca
+STR_INSUFFICIENT_FUNDS :{WHITE}Impossibile donare denaro prestato dalla banca...
STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT :{BLACK}Seleziona una nuova faccia per il presidente
STR_7031_CHANGE_THE_COMPANY_VEHICLE :{BLACK}Cambia la livrea dei veicoli della compagnia
STR_7032_CHANGE_THE_PRESIDENT_S :{BLACK}Cambia il nome del presidente
@@ -2149,8 +2137,8 @@
STR_7038_INAUGURATED :{GOLD}Inaugurata nel: {WHITE}{NUM}
STR_7039_VEHICLES :{GOLD}Veicoli:
STR_TRAINS :{WHITE}{COMMA} tren{P o i}
-STR_ROAD_VEHICLES :{WHITE}{COMMA} veicol{P o i} stradal{P e i}
-STR_AIRCRAFT :{WHITE}{COMMA} aere{P o i}
+STR_ROAD_VEHICLES :{WHITE}{COMMA} automezz{P o i}
+STR_AIRCRAFT :{WHITE}{COMMA} aeromobil{P e i}
STR_SHIPS :{WHITE}{COMMA} nav{P e i}
STR_7042_NONE :{WHITE}Nessuno
STR_7043_FACE_SELECTION :{WHITE}Seleziona faccia
@@ -2180,7 +2168,7 @@
STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT :{WHITE}Stiamo cercando una compagnia di trasporti disposta a rilevare la nostra società .{}{} Vorrebbe acquistare la {COMPANY} per {CURRENCY}?
STR_705C_BANKRUPT :{BLACK}{BIGFONT}Bancarotta!
STR_705D_HAS_BEEN_CLOSED_DOWN_BY :{BLACK}{BIGFONT}La {COMPANY} è stata chiusa dai creditori e tutti i suoi beni sono stati venduti!
-STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED :{BLACK}{BIGFONT}Lanciata nuova compagnia di trasporti!
+STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED :{BLACK}{BIGFONT}Nuova compagnia di trasporti!
STR_705F_STARTS_CONSTRUCTION_NEAR :{BLACK}{BIGFONT}La {COMPANY} inizia a costruire vicino a {TOWN}!
STR_7060_CAN_T_BUY_COMPANY :{WHITE}Impossibile comprare la compagnia...
STR_7061_CARGO_PAYMENT_RATES :{WHITE}Tariffe di pagamento merci
@@ -2199,13 +2187,13 @@
STR_706E_TYCOON :Magnate
STR_706F_BUILD_HQ :{BLACK}Costr. sede
STR_7070_BUILD_COMPANY_HEADQUARTERS :{BLACK}Costruisce la sede della compagnia / visualizza la sede della compagnia
-STR_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Sposta la sede della compagnia pagando 1% del valore societario
+STR_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Ricostruisce la sede della compagnia in un altro luogo pagando l'1% del valore della compagnia
STR_7071_CAN_T_BUILD_COMPANY_HEADQUARTERS :{WHITE}Impossibile costruire la sede della compagnia...
STR_7072_VIEW_HQ :{BLACK}Vedi sede
-STR_RELOCATE_HQ :{BLACK}Sposta Sede
+STR_RELOCATE_HQ :{BLACK}Sposta sede
STR_COMPANY_PASSWORD :{BLACK}Password
-STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Protegge la tuo compagnia con una password per impedire accessi non autorizzati.
-STR_SET_COMPANY_PASSWORD :Imposta password della societÃ
+STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Protegge la compagnia con una password per impedire ad utenti non autorizzati di accedervi.
+STR_SET_COMPANY_PASSWORD :Imposta password compagnia
STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Recessione mondiale!{}{}Il crollo dell'economia porta gli analisti finanziari a temere il peggio!
STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Recessione finita!{}{}La ripresa del commercio da fiducia alle industrie e rafforza l'economia!
STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Seleziona dimensione grande/piccola della finestra
@@ -2214,41 +2202,41 @@
STR_7078_SELL_25_SHARE_IN_COMPANY :{BLACK}Vendi il 25% delle azioni
STR_7079_BUY_25_SHARE_IN_THIS_COMPANY :{BLACK}Compra il 25% delle azioni di questa compagnia
STR_707A_SELL_25_SHARE_IN_THIS_COMPANY :{BLACK}Vende il 25% delle azioni di questa compagnia
-STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Impossibile comprare il 25% delle azioni di questa compagnia...
-STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Impossibile vendere il 25% delle azioni di questa compagnia...
+STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Impossibile comprare il 25% delle azioni...
+STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Impossibile vendere il 25% delle azioni...
STR_707D_OWNED_BY :{WHITE}({COMMA}% posseduto dalla {COMPANY})
STR_707E_OWNED_BY_OWNED_BY :{WHITE}({COMMA}% posseduto dalla {COMPANY}{} {COMMA}% posseduto dalla {COMPANY})
STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}La {COMPANY} è stata rilevata dalla {COMPANY}!
STR_7080_PROTECTED :{WHITE}Questa compagnia non è abbastanza vecchia per scambiare azioni...
-STR_LIVERY_DEFAULT :Livrea Standard
-STR_LIVERY_STEAM :Locomotiva a Vapore
-STR_LIVERY_DIESEL :Locomotiva Diesel
-STR_LIVERY_ELECTRIC :Locomotore Elettrico
-STR_LIVERY_MONORAIL :Monorotaia
-STR_LIVERY_MAGLEV :Maglev
+STR_LIVERY_DEFAULT :Livrea standard
+STR_LIVERY_STEAM :Locomotiva a vapore
+STR_LIVERY_DIESEL :Locomotiva diesel
+STR_LIVERY_ELECTRIC :Locomotiva elettrica
+STR_LIVERY_MONORAIL :Locomotiva monorotaia
+STR_LIVERY_MAGLEV :Locomotiva maglev
STR_LIVERY_DMU :DMU
STR_LIVERY_EMU :EMU
-STR_LIVERY_PASSENGER_WAGON_STEAM :Carrozza Passeggeri (Vapore)
-STR_LIVERY_PASSENGER_WAGON_DIESEL :Carrozza Passeggeri (Diesel)
-STR_LIVERY_PASSENGER_WAGON_ELECTRIC :Carrozza Passeggeri (Elettrico)
-STR_LIVERY_FREIGHT_WAGON :Vagone Merci
+STR_LIVERY_PASSENGER_WAGON_STEAM :Carrozza passeggeri (V)
+STR_LIVERY_PASSENGER_WAGON_DIESEL :Carrozza passeggeri (D)
+STR_LIVERY_PASSENGER_WAGON_ELECTRIC :Carrozza passeggeri (E)
+STR_LIVERY_FREIGHT_WAGON :Vagone merci
STR_LIVERY_BUS :Autobus
-STR_LIVERY_TRUCK :Autocarro
+STR_LIVERY_TRUCK :Camion
STR_LIVERY_PASSENGER_SHIP :Traghetto
-STR_LIVERY_FREIGHT_SHIP :Nave Mercantile
+STR_LIVERY_FREIGHT_SHIP :Mercantile
STR_LIVERY_HELICOPTER :Elicottero
-STR_LIVERY_SMALL_PLANE :Aeroplano (S)
-STR_LIVERY_LARGE_PLANE :Aeroplano (L)
+STR_LIVERY_SMALL_PLANE :Aeroplano piccolo
+STR_LIVERY_LARGE_PLANE :Aeroplano grande
-STR_LIVERY_GENERAL_TIP :{BLACK}Mostra schemi colore generale
-STR_LIVERY_TRAIN_TIP :{BLACK}Mostra schemi colore treni
-STR_LIVERY_ROADVEH_TIP :{BLACK}Mostra schemi colore veicoli
-STR_LIVERY_SHIP_TIP :{BLACK}Mostra schemi colore navi
-STR_LIVERY_AIRCRAFT_TIP :{BLACK}Mostra schemi colore aerei
-STR_LIVERY_PRIMARY_TIP :{BLACK}Scegli il colore primario per lo schema selezionato
-STR_LIVERY_SECONDARY_TIP :{BLACK}Scegli il colore secondario per lo schema selezionato
-STR_LIVERY_PANEL_TIP :{BLACK}Scegli uno schema colori per cambiare, o schemi multipli con CTRL + click. Clicca sul box per attivare/disattivare lo schema
+STR_LIVERY_GENERAL_TIP :{BLACK}Mostra gli schemi di colorazione generali
+STR_LIVERY_TRAIN_TIP :{BLACK}Mostra gli schemi di colorazione dei treni
+STR_LIVERY_ROADVEH_TIP :{BLACK}Mostra gli schemi di colorazione degli automezzi
+STR_LIVERY_SHIP_TIP :{BLACK}Mostra gli schemi di colorazione delle navi
+STR_LIVERY_AIRCRAFT_TIP :{BLACK}Mostra gli schemi di colorazione degli aeromobili
+STR_LIVERY_PRIMARY_TIP :{BLACK}Sceglie il colore primario per lo schema selezionato
+STR_LIVERY_SECONDARY_TIP :{BLACK}Sceglie il colore secondario per lo schema selezionato
+STR_LIVERY_PANEL_TIP :{BLACK}Selezionare uno schema colori da cambiare, o schemi multipli con CTRL+clic. Fare clic sulla casella per attivare/disattivare uno schema
##id 0x8000
STR_8000_KIRBY_PAUL_TANK_STEAM :Kirby Paul Tank (Vapore)
@@ -2535,358 +2523,358 @@
STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Vai non-stop a {STATION} (Trasferisci e parti vuoto)
STR_8810_GO_NON_STOP_TO_LOAD :Vai non-stop a {STATION} (Carica)
STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Vai non-stop a {STATION} (Trasferisci e aspetta carico completo)
-STR_GO_TO_TRAIN_DEPOT :Vai a {TOWN} Deposito Treni
-STR_SERVICE_AT_TRAIN_DEPOT :Manutenzione a {TOWN} Deposito Ferroviario
-STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Vai non-stop a {TOWN} Deposito Ferroviario
-STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Manutenzione non-stop a {TOWN} Deposito Ferroviario
+STR_GO_TO_TRAIN_DEPOT :Vai al Deposito ferroviario di {TOWN}
+STR_SERVICE_AT_TRAIN_DEPOT :Manutenzione al Deposito di {TOWN}
+STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Vai non-stop al Deposito ferroviario di {TOWN}
+STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Manutenzione non-stop al Deposito di {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT :{ORANGE}Direzione per {TOWN} Deposito Treni
-STR_HEADING_FOR_TRAIN_DEPOT_VEL :{ORANGE}Direzione per {TOWN} Deposito Treni, {VELOCITY}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE :{LTBLUE}Servizio a {TOWN} Deposito Treni
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL :{LTBLUE}Servizio a {TOWN} Deposito Treni, {VELOCITY}
+STR_HEADING_FOR_TRAIN_DEPOT :{ORANGE}Diretto al Deposito di {TOWN}
+STR_HEADING_FOR_TRAIN_DEPOT_VEL :{ORANGE}Diretto al Deposito di {TOWN}, {VELOCITY}
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE :{LTBLUE}Manutenzione al Deposito di {TOWN}
+STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL :{LTBLUE}Manutenzione al Deposito di {TOWN}, {VELOCITY}
-STR_INVALID_ORDER :{RED} (Ordine non Valido)
+STR_INVALID_ORDER :{RED} (Ordine non valido)
STR_UNKNOWN_DESTINATION :destinazione sconosciuta
STR_8812_EMPTY :{LTBLUE}Vuoto
STR_8813_FROM :{LTBLUE}{CARGO} da {STATION}
STR_FROM_MULT :{LTBLUE}{CARGO} da {STATION} (x{NUM})
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT :{WHITE}Treno {COMMA} sta aspettando nel deposito
-STR_8815_NEW_VEHICLES :{BLACK}Nuovi Veicoli
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT :{WHITE}Il Treno {COMMA} sta aspettando nel deposito
+STR_8815_NEW_VEHICLES :{BLACK}Nuovi veicoli
STR_8816 :{BLACK}-
STR_8819_TRAIN_TOO_LONG :{WHITE}Treno troppo lungo
-STR_881A_TRAINS_CAN_ONLY_BE_ALTERED :{WHITE}Un treno può essere modificato solo quando è fermo nel deposito
-STR_881B_TRAINS :{WHITE}{COMPANY} - {COMMA} Tren{P o i}
+STR_881A_TRAINS_CAN_ONLY_BE_ALTERED :{WHITE}Un treno può essere modificato solo quando è fermo in un deposito
+STR_881B_TRAINS :{WHITE}{COMPANY} - {COMMA} tren{P o i}
-STR_881C_NEW_RAIL_VEHICLES :{WHITE}Nuovo Veicolo Ferroviario
-STR_NEW_ELRAIL_VEHICLES :{WHITE}Nuovi Veicoli Ferroviari Elettrici
-STR_881D_NEW_MONORAIL_VEHICLES :{WHITE}Nuovo Veicolo Monorotaia
-STR_881E_NEW_MAGLEV_VEHICLES :{WHITE}Nuovo Veicolo Maglev
-STR_ALL_AVAIL_RAIL_VEHICLES :{WHITE}Veicoli Ferroviari
+STR_881C_NEW_RAIL_VEHICLES :{WHITE}Nuovi veicoli ferroviari
+STR_NEW_ELRAIL_VEHICLES :{WHITE}Nuovi veicoli ferroviari elettrici
+STR_881D_NEW_MONORAIL_VEHICLES :{WHITE}Nuovi veicoli monorotaia
+STR_881E_NEW_MAGLEV_VEHICLES :{WHITE}Nuovi veicoli maglev
+STR_ALL_AVAIL_RAIL_VEHICLES :{WHITE}Veicoli ferroviari
-STR_881F_BUILD_VEHICLE :{BLACK}Costruisci Veicolo
-STR_CLONE_ROAD_VEHICLE :{BLACK}Clona Veicolo
-STR_CLONE_ROAD_VEHICLE_INFO :{BLACK}Costruisce una copia del veicolo stradale. Premere contemporaneamente Control per condividere gli ordini
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO :{BLACK}Costruisce una copia di un veicolo stradale. Cliccare su questo pulsante e poi sul veicolo stradale (dentro o fuori dal deposito) da copiare. Premere contemporaneamente Control per condividere gli ordini
-STR_CLONE_TRAIN :{BLACK}Clona Treno
-STR_CLONE_TRAIN_INFO :{BLACK}Costruisce una copia del treno, vagoni inclusi. Premere contemporaneamente Control per condividere gli ordini
-STR_CLONE_TRAIN_DEPOT_INFO :{BLACK}Costruisce una copia di un treno, vagoni inclusi. Cliccare su questo pulsante e poi sul treno (dentro o fuori dal deposito) da copiare. Premere contemporaneamente Control per condividere gli ordini
+STR_881F_BUILD_VEHICLE :{BLACK}Costruisci veicolo
+STR_CLONE_ROAD_VEHICLE :{BLACK}Clona automezzo
+STR_CLONE_ROAD_VEHICLE_INFO :{BLACK}Costruisce una copia dell'automezzo. Tenere premuto CTRL per condividere gli ordini
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO :{BLACK}Costruisce una copia di un automezzo. Fare clic su questo pulsante e quindi su un automezzo dentro o fuori dal deposito. Tenere premuto CTRL per condividere gli ordini
+STR_CLONE_TRAIN :{BLACK}Clona treno
+STR_CLONE_TRAIN_INFO :{BLACK}Costruisce una copia del treno, inclusi tutti i vagoni. Tenere premuto CTRL per condividere gli ordini.
+STR_CLONE_TRAIN_DEPOT_INFO :{BLACK}Costruisce una copia di un treno, inclusi tutti i vagoni. Fare clic su questo pulsante e quindi su un treno dentro o fuori dal deposito. Tenere premuto CTRL per condividere gli ordini
STR_8820_RENAME :{BLACK}Rinomina
STR_8823_SKIP :{BLACK}Salta
STR_8824_DELETE :{BLACK}Elimina
-STR_8825_NON_STOP :{BLACK}Non-Stop
+STR_8825_NON_STOP :{BLACK}Non-stop
STR_8826_GO_TO :{BLACK}Vai a
STR_8827_FULL_LOAD :{BLACK}Carica
STR_8828_UNLOAD :{BLACK}Scarica
-STR_REFIT :{BLACK}Modifica
-STR_REFIT_TIP :{BLACK}Scegli iltipo di merce da modificare in questo ordine. CTRL+click per togliere l'istruzione di modifica
-STR_REFIT_ORDER :(Modifica a {STRING})
+STR_REFIT :{BLACK}Riadatta
+STR_REFIT_TIP :{BLACK}Selezionare il tipo di carico per il quale riadattare in questo ordine. Premere CTRL+clic per rimuovere l'istruzione di riadattamento
+STR_REFIT_ORDER :(Riadatta per {STRING})
STR_8829_ORDERS :{WHITE}{VEHICLE} (Ordini)
-STR_882A_END_OF_ORDERS :{SETX 10}- - Fine degli Ordini - -
+STR_882A_END_OF_ORDERS :{SETX 10}- - Fine degli ordini - -
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
-STR_SERVICE :{BLACK}Manutenzione
-STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Non puoi costruire veicolo ferroviario...
-STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Costr. nel: {LTBLUE}{NUM}{BLACK} Valore: {LTBLUE}{CURRENCY}
+STR_SERVICE :{BLACK}Manutieni
+STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Impossibile costruire il veicolo ferroviario...
+STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Costruito nel: {LTBLUE}{NUM}{BLACK} Valore: {LTBLUE}{CURRENCY}
STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Valore: {LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
-STR_882F_LOADING_UNLOADING :{LTBLUE}Carica / Scarica
-STR_TRAIN_MUST_BE_STOPPED :{WHITE}Il treno deve essere fermato nel deposito
-STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT :{WHITE}Non puoi mandare treno al deposito...
+STR_882F_LOADING_UNLOADING :{LTBLUE}Caricamento / Scaricamento
+STR_TRAIN_MUST_BE_STOPPED :{WHITE}Il treno deve essere fermo in un deposito
+STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT :{WHITE}Impossibile mandare il treno al deposito...
STR_8831_NO_MORE_SPACE_FOR_ORDERS :{WHITE}Spazio per gli ordini terminato
STR_8832_TOO_MANY_ORDERS :{WHITE}Troppi ordini
-STR_8833_CAN_T_INSERT_NEW_ORDER :{WHITE}Non puoi inserire nuovo ordine...
-STR_8834_CAN_T_DELETE_THIS_ORDER :{WHITE}Non puoi cancellare questo ordine...
-STR_8835_CAN_T_MODIFY_THIS_ORDER :{WHITE}Non puoi modificare questo ordine...
-STR_8837_CAN_T_MOVE_VEHICLE :{WHITE}Non puoi spostare il veicolo...
-STR_REAR_ENGINE_FOLLOW_FRONT_ERROR :{WHITE}La locomotiva di coda seguirà sempre quella di testa
+STR_8833_CAN_T_INSERT_NEW_ORDER :{WHITE}Impossibile inserire un nuovo ordine...
+STR_8834_CAN_T_DELETE_THIS_ORDER :{WHITE}Impossibile cancellare questo ordine...
+STR_8835_CAN_T_MODIFY_THIS_ORDER :{WHITE}Impossibile modificare questo ordine...
+STR_8837_CAN_T_MOVE_VEHICLE :{WHITE}Impossibile spostare il veicolo...
+STR_REAR_ENGINE_FOLLOW_FRONT_ERROR :{WHITE}La locomotiva di coda segue sempre quella di testa
STR_8838_N_A :N/A{SKIP}
-STR_8839_CAN_T_SELL_RAILROAD_VEHICLE :{WHITE}Non puoi vendere veicolo ferroviario...
-STR_883A_UNABLE_TO_FIND_ROUTE_TO :{WHITE}Non riesce a trovare il deposito locale
-STR_883B_CAN_T_STOP_START_TRAIN :{WHITE}Non puoi far fermare/ripartire il treno...
-STR_883C_SERVICING_INTERVAL_DAYS :{BLACK}Intervallo Manut.: {LTBLUE}{COMMA}giorni{BLACK} Ultima Manut.: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT :{BLACK}Intervallo Manutenz.: {LTBLUE}{COMMA}%{BLACK} Ultima Manut.: {LTBLUE}{DATE_LONG}
-STR_883D_TRAINS_CLICK_ON_TRAIN_FOR :{BLACK}Treni - fai clic sul treno per le informazioni
-STR_883E_BUILD_NEW_TRAINS_REQUIRES :{BLACK}Costruisci nuovi treni (Necessario deposito)
-STR_883F_TRAINS_CLICK_ON_TRAIN_FOR :{BLACK}Treni - fai clic sul treno per le informazioni, trascina i veicoli per aggiungerli/rimuoverli dal treno
-STR_8840_BUILD_NEW_TRAIN_VEHICLE :{BLACK}Costruisci nuovo veicolo ferroviario
-STR_8841_DRAG_TRAIN_VEHICLE_TO_HERE :{BLACK}Trascina veicolo qui per venderlo
-STR_8842_CENTER_MAIN_VIEW_ON_TRAIN :{BLACK}Centra visuale sul deposito ferroviario
-STR_8843_TRAIN_VEHICLE_SELECTION :{BLACK}Lista treni - fai clic sul veicolo per le informazioni
-STR_8844_BUILD_THE_HIGHLIGHTED_TRAIN :{BLACK}Costruisci veicolo ferroviario evidenziato
-STR_8845_RENAME_TRAIN_VEHICLE_TYPE :{BLACK}Rinomina tipo di veicolo
-STR_8846_CURRENT_TRAIN_ACTION_CLICK :{BLACK}Azione corrente del treno - Clicca qui per fermarlo/farlo partire
-STR_8847_SHOW_TRAIN_S_ORDERS :{BLACK}Mostra ordini del treno
-STR_8848_CENTER_MAIN_VIEW_ON_TRAIN :{BLACK}Centra visuale sul treno
-STR_8849_SEND_TRAIN_TO_DEPOT :{BLACK}Manda treno al deposito
+STR_8839_CAN_T_SELL_RAILROAD_VEHICLE :{WHITE}Impossibile vendere il veicolo ferroviario...
+STR_883A_UNABLE_TO_FIND_ROUTE_TO :{WHITE}Impossibile determinare il tragitto verso il deposito più vicino
+STR_883B_CAN_T_STOP_START_TRAIN :{WHITE}Impossibile fermare/avviare il treno...
+STR_883C_SERVICING_INTERVAL_DAYS :{BLACK}Manutenzione ogni: {LTBLUE}{COMMA} giorni{BLACK} Ultima volta: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT :{BLACK}Intervallo manutenzione: {LTBLUE}{COMMA}%{BLACK} Ultima il: {LTBLUE}{DATE_LONG}
+STR_883D_TRAINS_CLICK_ON_TRAIN_FOR :{BLACK}Treni - fare clic su un treno per informazioni
+STR_883E_BUILD_NEW_TRAINS_REQUIRES :{BLACK}Costruisce nuovi treni (è necessario un deposito ferroviario)
+STR_883F_TRAINS_CLICK_ON_TRAIN_FOR :{BLACK}Treni - fare clic su un treno per informazioni, trascinare i veicoli per aggiungerli/rimuoverli dal treno
+STR_8840_BUILD_NEW_TRAIN_VEHICLE :{BLACK}Costruisce un nuovo veicolo ferroviario
+STR_8841_DRAG_TRAIN_VEHICLE_TO_HERE :{BLACK}Trascianre qui un veicolo ferroviario per venderlo
+STR_8842_CENTER_MAIN_VIEW_ON_TRAIN :{BLACK}Centra la visuale principale sulla posizione del deposito ferroviario
+STR_8843_TRAIN_VEHICLE_SELECTION :{BLACK}Elenco di selezione dei veicoli ferroviari - fare clic su un veicolo per informazioni
+STR_8844_BUILD_THE_HIGHLIGHTED_TRAIN :{BLACK}Costruisce il veicolo ferroviario selezionato
+STR_8845_RENAME_TRAIN_VEHICLE_TYPE :{BLACK}Rinomina il tipo di veicolo ferroviario
+STR_8846_CURRENT_TRAIN_ACTION_CLICK :{BLACK}Azione corrente del treno - fare clic qui per fermarlo/avviarlo
+STR_8847_SHOW_TRAIN_S_ORDERS :{BLACK}Mostra gli ordini del treno
+STR_8848_CENTER_MAIN_VIEW_ON_TRAIN :{BLACK}Centra la visuale principale sulla posizione del treno
+STR_8849_SEND_TRAIN_TO_DEPOT :{BLACK}Manda il treno al deposito e CTRL+clic per eseguire solo una manutenzione
STR_884A_FORCE_TRAIN_TO_PROCEED :{BLACK}Forza il treno a proseguire senza aspettare il segnale di via libera
-STR_884B_REVERSE_DIRECTION_OF_TRAIN :{BLACK}Inverti direzione del treno
-STR_884C_SHOW_TRAIN_DETAILS :{BLACK}Mostra dettagli del treno
-STR_884D_INCREASE_SERVICING_INTERVAL :{BLACK}Aumenta intervallo di manutenzione
-STR_884E_DECREASE_SERVICING_INTERVAL :{BLACK}Riduci intervallo di manutenzione
-STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Mostra dettagli del carico trasportato
-STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Mostra dettagli di ogni veicolo
-STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Mostra capienza di ogni veicolo
-STR_8852_SHOW_TOTAL_CARGO :{BLACK}Mostra la capacità massima del treno per tipo di carico
-STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Lista ordini - fai clic sull'ordine per evidenziarlo
+STR_884B_REVERSE_DIRECTION_OF_TRAIN :{BLACK}Inverte la direzione del treno
+STR_884C_SHOW_TRAIN_DETAILS :{BLACK}Mostra i dettagli sul treno
+STR_884D_INCREASE_SERVICING_INTERVAL :{BLACK}Aumenta l'intervallo di manutenzione
+STR_884E_DECREASE_SERVICING_INTERVAL :{BLACK}Riduce l'intervallo di manutenzione
+STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Mostra i dettagli sul carico trasportato
+STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Mostra i dettagli sui veicoli che compongono il treno
+STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Mostra la capienza di ogni veicolo
+STR_8852_SHOW_TOTAL_CARGO :{BLACK}Mostra la capacità totale del treno, suddivisa per tipo di carico
+STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Lista degli ordini - fare clic su un ordine per selezionarlo e CTRL+clic per portarsi sulla stazione corrispondente
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Salta l'ordine corrente e inizia il successivo
-STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Elimina l'ordine evidenziato
-STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Fai diventare l'ordine evidenziato 'non-stop'
-STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Aggiungi un nuovo ordine prima di quello evidenziato o aggiungilo alla fine della lista
-STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Fai diventare l'ordine evidenziato 'forza il veicolo ad attendere il carico completo'
-STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Fai diventare l'ordine evidenziato 'forza il veicolo a scaricare'
-STR_SERVICE_HINT :{BLACK}Ignora l'ordine finché non sia necessaria la manutenzione
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER :{BLACK}Costo: {CURRENCY} Peso: {WEIGHT_S}{}Velocità : {VELOCITY} Potenza: {POWER}{}Consumi: {CURRENCY}/anno{}Capienza: {CARGO}
-STR_885C_BROKEN_DOWN :{RED}Guasto!
-STR_885D_AGE_RUNNING_COST_YR :{BLACK}Età : {LTBLUE}{STRING}{BLACK} Consumi: {LTBLUE}{CURRENCY}/anno
-STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Peso: {LTBLUE}{WEIGHT_S} {BLACK}Potenza: {LTBLUE}{POWER}{BLACK} Velocità Max: {LTBLUE}{VELOCITY}
-STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Peso: {LTBLUE}{WEIGHT_S} {BLACK}Potenza: {LTBLUE}{POWER}{BLACK} Vel. Max: {LTBLUE}{VELOCITY} {BLACK}Sforzo Trazione Max.: {LTBLUE}{FORCE}
+STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Elimina l'ordine selezionato
+STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Fa diventare l'ordine selezionato 'non-stop'
+STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Inserisce un nuovo ordine prima di quello selezionato, o lo aggiunge alla fine della lista
+STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Fa in modo che l'ordine selezionato forzi il veicolo ad aspettare il carico completo
+STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Fa in modo che l'ordine selezionato forzi il veicolo a scaricare
+STR_SERVICE_HINT :{BLACK}Ingnora quest'ordine a meno che non sia necessaria una manutenzione
+STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER :{BLACK}Costo: {CURRENCY} Peso: {WEIGHT_S}{}Velocità : {VELOCITY} Potenza: {POWER}{}Costo d'esercizio: {CURRENCY}/anno{}Capacità : {CARGO}
+STR_885C_BROKEN_DOWN :{RED}Guasto
+STR_885D_AGE_RUNNING_COST_YR :{BLACK}Età : {LTBLUE}{STRING}{BLACK} Costo d'esercizio: {LTBLUE}{CURRENCY}/anno
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Peso: {LTBLUE}{WEIGHT_S} {BLACK}Potenza: {LTBLUE}{POWER}{BLACK} Velocità max: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Peso: {LTBLUE}{WEIGHT_S} {BLACK}Potenza: {LTBLUE}{POWER}{BLACK} Velocità max: {LTBLUE}{VELOCITY} {BLACK}Trazione max: {LTBLUE}{FORCE}
STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Profitto quest'anno: {LTBLUE}{CURRENCY} (anno scorso: {CURRENCY})
STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}Affidabilità : {LTBLUE}{COMMA}% {BLACK}Guasti dall'ultima manutenzione: {LTBLUE}{COMMA}
-STR_8861_STOPPED :{RED}Fermato
-STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL :{WHITE}Non puoi fargli passare i segnali al rischio di...
+STR_8861_STOPPED :{RED}Fermo
+STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL :{WHITE}Impossibile far passare al treno un segnale di pericolo...
STR_8863_CRASHED :{RED}Distrutto!
-STR_8865_NAME_TRAIN :{WHITE}Nome Treno
-STR_8866_CAN_T_NAME_TRAIN :{WHITE}Non puoi rinominare il treno...
-STR_8867_NAME_TRAIN :{BLACK}Nome Treno
-STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL :{BLACK}{BIGFONT}Treno schiantato!{}{COMMA} morti in una palla di fuoco dopo la collisione
-STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Non puoi invertire la direzione del treno...
-STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Rinomina il tipo di veicolo
-STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Non puoi rinominare tipo di veicolo...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Fai diventare l'ordine evidenziato 'forza il veicolo a trasferire il carico'
+STR_8865_NAME_TRAIN :{WHITE}Nome del treno
+STR_8866_CAN_T_NAME_TRAIN :{WHITE}Impossibile rinominare il treno...
+STR_8867_NAME_TRAIN :{BLACK}Rinomina il treno
+STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL :{BLACK}{BIGFONT}Incidente ferroviario!{}In {COMMA} muoiono nell'incendio seguito alla collisione
+STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Impossibile invertire la direzione del treno...
+STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Rinomina tipo di veicolo ferroviario
+STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Impossibile rinominare il tipo di veicolo ferroviario...
+STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Fa in modo che l'ordine selezionato forzi il veicolo a trasferire il carico
STR_886F_TRANSFER :{BLACK}Trasferisci
STR_TRAIN_STOPPING :{RED}In frenata
STR_TRAIN_STOPPING_VEL :{RED}In frenata, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES :Tipo binario incompatibile
-STR_TRAIN_NO_POWER :{RED}Nessuna potenza
-STR_TRAIN_START_NO_CATENARY :Questo tratto manca la catenaria, per questo il treno non può partire
+STR_INCOMPATIBLE_RAIL_TYPES :Tipi di rotaia non compatibili
+STR_TRAIN_NO_POWER :{RED}Alimentazione mancante
+STR_TRAIN_START_NO_CATENARY :In questo binario manca la catenaria, quindi il treno non può essere avviato
-STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Nuovo {STRING} è disponibile!
+STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Nuov{G o a} {STRING} disponibile!
STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nuovo {STRING} è disponibile! - {STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Nuov{G o a} {STRING} disponibile! - {STRING}
##id 0x9000
-STR_9000_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Veicolo in mezzo
-STR_9001_ROAD_VEHICLES :{WHITE}{COMPANY} - {COMMA} Veicol{P o i} stradal{P e i}
+STR_9000_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Automezzo di mezzo
+STR_9001_ROAD_VEHICLES :{WHITE}{COMPANY} - {COMMA} automezz{P o i}
STR_9002 :{WHITE}{VEHICLE}
-STR_9003_ROAD_VEHICLE_DEPOT :{WHITE}{TOWN} Deposito Veicoli Stradali
-STR_9004_NEW_VEHICLES :{BLACK}Nuovi Veicoli
-STR_9006_NEW_ROAD_VEHICLES :{WHITE}Nuovi Veicoli Stradali
-STR_9007_BUILD_VEHICLE :{BLACK}Costruisci Veicolo
-STR_9009_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Non puoi costruire veicolo stradale...
+STR_9003_ROAD_VEHICLE_DEPOT :{WHITE}Deposito automezzi di {TOWN}
+STR_9004_NEW_VEHICLES :{BLACK}Nuovi veicoli
+STR_9006_NEW_ROAD_VEHICLES :{WHITE}Nuovi automezzi
+STR_9007_BUILD_VEHICLE :{BLACK}Costruisci veicolo
+STR_9009_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Impossibile costruire l'automezzo...
STR_900C_DETAILS :{WHITE}{VEHICLE} (Dettagli)
-STR_900D_AGE_RUNNING_COST_YR :{BLACK}Età : {LTBLUE}{STRING}{BLACK} Consumi: {LTBLUE}{CURRENCY}/anno
-STR_900E_MAX_SPEED :{BLACK}Velocità Max: {LTBLUE}{VELOCITY}
+STR_900D_AGE_RUNNING_COST_YR :{BLACK}Età : {LTBLUE}{STRING}{BLACK} Costo d'esercizio: {LTBLUE}{CURRENCY}/anno
+STR_900E_MAX_SPEED :{BLACK}Velocità max: {LTBLUE}{VELOCITY}
STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Profitto quest'anno: {LTBLUE}{CURRENCY} (anno scorso: {CURRENCY})
STR_9010_RELIABILITY_BREAKDOWNS :{BLACK}Affidabilità : {LTBLUE}{COMMA}% {BLACK}Guasti dall'ultima manutenzione: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Costr. nel: {LTBLUE}{NUM}{BLACK} Valore: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY :{BLACK}Capienza: {LTBLUE}{CARGO}
-STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}...deve essere fermato nel deposito veicoli
-STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}Non puoi vendere veicolo stradale
-STR_9015_CAN_T_STOP_START_ROAD_VEHICLE :{WHITE}Non puoi far fermare/avviare veicolo stradale...
-STR_9016_ROAD_VEHICLE_IS_WAITING :{WHITE}Veicolo stradale {COMMA} sta aspettando nel deposito
-STR_HEADING_FOR_ROAD_DEPOT :{ORANGE}Direzione per {TOWN} Deposito Veicoli
-STR_HEADING_FOR_ROAD_DEPOT_VEL :{ORANGE}Direzione per {TOWN} Deposito Veicoli, {VELOCITY}
-STR_HEADING_FOR_ROAD_DEPOT_SERVICE :{LTBLUE}Servizio a {TOWN} Deposito Veicoli
-STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL :{LTBLUE}Servizio a {TOWN} Deposito Veicoli, {VELOCITY}
-STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT :{WHITE}Non puoi mandare il veicolo al deposito...
-STR_9019_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Non riesce a trovare il deposito locale
-STR_901A_ROAD_VEHICLES_CLICK_ON :{BLACK}Veicoli stradali - clicca sul veicolo per le informazioni
-STR_901B_BUILD_NEW_ROAD_VEHICLES :{BLACK}Costruisci nuovi veicoli stradali (richiesto deposito veicoli stradali)
-STR_901C_CURRENT_VEHICLE_ACTION :{BLACK}Azione corrente del veicolo - fai clic qui per far fermare/ripartire il veicolo
-STR_901D_SHOW_VEHICLE_S_ORDERS :{BLACK}Mostra ordini del veicolo
-STR_901E_CENTER_MAIN_VIEW_ON_VEHICLE :{BLACK}Centra visuale sul veicolo
-STR_901F_SEND_VEHICLE_TO_DEPOT :{BLACK}Manda veicolo al deposito
-STR_9020_FORCE_VEHICLE_TO_TURN_AROUND :{BLACK}Fai girare il veicolo
-STR_9021_SHOW_ROAD_VEHICLE_DETAILS :{BLACK}Mostra dettagli del veicolo
-STR_9022_VEHICLES_CLICK_ON_VEHICLE :{BLACK}Veicoli - fai clic sul veicolo per le informazioni
-STR_9023_BUILD_NEW_ROAD_VEHICLE :{BLACK}Costruisci nuovo veicolo stradale
-STR_9024_DRAG_ROAD_VEHICLE_TO_HERE :{BLACK}Trascina veicolo stradale qui per venderlo
-STR_9025_CENTER_MAIN_VIEW_ON_ROAD :{BLACK}Centra visuale sul deposito veicoli
-STR_9026_ROAD_VEHICLE_SELECTION :{BLACK}Lista veicoli - fai clic sul veicolo per le informazioni
-STR_9027_BUILD_THE_HIGHLIGHTED_ROAD :{BLACK}Costruisci veicolo stradale evidenziato
-STR_902A_COST_SPEED_RUNNING_COST :{BLACK}Costo: {CURRENCY}{}Velocità : {VELOCITY}{}Consumi: {CURRENCY}/anno{}Capienza: {CARGO}
+STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Costruito nel: {LTBLUE}{NUM}{BLACK} Valore: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY :{BLACK}Capacità : {LTBLUE}{CARGO}
+STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}...deve essere fermo nel deposito automezzi
+STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}Impossibile vendere l'automezzo...
+STR_9015_CAN_T_STOP_START_ROAD_VEHICLE :{WHITE}Impossibile fermare/avviare l'automezzo...
+STR_9016_ROAD_VEHICLE_IS_WAITING :{WHITE}L'Automezzo {COMMA} sta aspettando nel deposito
+STR_HEADING_FOR_ROAD_DEPOT :{ORANGE}Diretto al Deposito di {TOWN}
+STR_HEADING_FOR_ROAD_DEPOT_VEL :{ORANGE}Diretto al Deposito di {TOWN}, {VELOCITY}
+STR_HEADING_FOR_ROAD_DEPOT_SERVICE :{LTBLUE}Manutenzione al Deposito di {TOWN}
+STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL :{LTBLUE}Manutenzione al Deposito di {TOWN}, {VELOCITY}
+STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT :{WHITE}Impossibile mandare l'automezzo al deposito...
+STR_9019_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Impossibile trovare il deposito più vicino
+STR_901A_ROAD_VEHICLES_CLICK_ON :{BLACK}Automezzi - fare clic su un veicolo per informazioni
+STR_901B_BUILD_NEW_ROAD_VEHICLES :{BLACK}Costruisce nuovi automezzi (è richiesto un deposito automezzi)
+STR_901C_CURRENT_VEHICLE_ACTION :{BLACK}Azione corrente del veicolo - fare clic qui per fermarlo/avviarlo
+STR_901D_SHOW_VEHICLE_S_ORDERS :{BLACK}Mostra gli ordini del veicolo
+STR_901E_CENTER_MAIN_VIEW_ON_VEHICLE :{BLACK}Centra la visuale principale sulla posizione dell'automezzo
+STR_901F_SEND_VEHICLE_TO_DEPOT :{BLACK}Manda l'automezzo al deposito e CTRL+clic per eseguire solo una manutenzione
+STR_9020_FORCE_VEHICLE_TO_TURN_AROUND :{BLACK}Fa fare un'inversione al veicolo
+STR_9021_SHOW_ROAD_VEHICLE_DETAILS :{BLACK}Mostra i dettagli sull'automezzo
+STR_9022_VEHICLES_CLICK_ON_VEHICLE :{BLACK}Veicoli - fare clic su un veicolo per informazioni
+STR_9023_BUILD_NEW_ROAD_VEHICLE :{BLACK}Costruisce un nuovo automezzo
+STR_9024_DRAG_ROAD_VEHICLE_TO_HERE :{BLACK}Trascinare qui un automezzo per venderlo
+STR_9025_CENTER_MAIN_VIEW_ON_ROAD :{BLACK}Centra la visuale principale sulla posizione del deposito automezzi
+STR_9026_ROAD_VEHICLE_SELECTION :{BLACK}Elenco selezione automezzi - fare clic su un veicolo per informazioni
+STR_9027_BUILD_THE_HIGHLIGHTED_ROAD :{BLACK}Costruisce l'automezzo selezionato
+STR_902A_COST_SPEED_RUNNING_COST :{BLACK}Costo: {CURRENCY}{}Velocità : {VELOCITY}{}Costo d'esercizio: {CURRENCY}/anno{}Capacità : {CARGO}
-STR_902C_NAME_ROAD_VEHICLE :{WHITE}Nome veicolo stradale
-STR_902D_CAN_T_NAME_ROAD_VEHICLE :{WHITE}Non puoi rinominare veicolo stradale...
-STR_902E_NAME_ROAD_VEHICLE :{BLACK}Nome veicolo stradale
-STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Primo bus arrivato a {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}I cittadini festeggiano. . .{}Primo camion arrivato a {STATION}!
-STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Veicolo distrutto!{}Il conducente muore in una palla di fuoco dopo la collisione
-STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Veicolo distrutto!{}{COMMA} morti in una palla di fuoco dopo la collisione col treno
-STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Non puoi far girare il veicolo...
-STR_ONLY_TURN_SINGLE_UNIT :{WHITE}Non posso invertire veicoli composti da unità multiple
+STR_902C_NAME_ROAD_VEHICLE :{WHITE}Rinomina l'automezzo
+STR_902D_CAN_T_NAME_ROAD_VEHICLE :{WHITE}Impossibile rinominare l'automezzo...
+STR_902E_NAME_ROAD_VEHICLE :{BLACK}Rinomina l'automezzo
+STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Il primo autobus arriva a {STATION}!
+STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}I cittadini festeggiano. . .{}Il primo camion arriva a {STATION}!
+STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Incidente stradale!{}Il conducente muore nell'incendio seguito alla collisione con un treno
+STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Incidente stradale!{}In {COMMA} muoiono nell'incendio seguito alla collisione con un treno
+STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Impossibile far girare il veicolo...
+STR_ONLY_TURN_SINGLE_UNIT :{WHITE}Impossibile invertire i veicoli composti da più unitÃ
STR_9034_RENAME :{BLACK}Rinomina
-STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Rinomina tipo di veicolo stradale
-STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Rinomina tipo di veicolo stradale
-STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Non puoi rinominare tipo di veicolo stradale...
-STR_9038_GO_TO_ROADVEH_DEPOT :Vai a {TOWN} Deposito Veicoli Stradali
-STR_SERVICE_AT_ROADVEH_DEPOT :Manutenzione a {TOWN} Deposito Stradale
+STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Rinomina il tipo di automezzo
+STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Rinomina tipo automezzo
+STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Impossibile rinominare il tipo di automezzo...
+STR_9038_GO_TO_ROADVEH_DEPOT :Vai al Deposito automezzi di {TOWN}
+STR_SERVICE_AT_ROADVEH_DEPOT :Manutenzione al Deposito di {TOWN}
-STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Riadatta il veicolo stradale per trasportare un tipo di merce differente
-STR_REFIT_ROAD_VEHICLE :{BLACK}Riadatta il veicolo stradale
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED :{BLACK}Riadatta il veicolo stradale tper trasportare il tipo di merce selezionato
-STR_REFIT_ROAD_VEHICLE_CAN_T :{WHITE}Non posso riadattare il veicolo...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR :{BLACK}Scegli il tipo di merce da caricare sul veicolo stradale
+STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Riadatta l'automezzo per trasportare un tipo di carico differente
+STR_REFIT_ROAD_VEHICLE :{BLACK}Riadatta l'automezzo
+STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED :{BLACK}Riadatta l'automezzo per trasportare il tipo di carico selezionato
+STR_REFIT_ROAD_VEHICLE_CAN_T :{WHITE}Impossibile riadattare l'automezzo...
+STR_ROAD_SELECT_TYPE_OF_CARGO_FOR :{BLACK}Selezionare il tipo di carico da far trasportare all'automezzo
##id 0x9800
STR_9800_DOCK_CONSTRUCTION :Costruzione moli
STR_9801_DOCK_CONSTRUCTION :{WHITE}Costruzione moli
-STR_9802_CAN_T_BUILD_DOCK_HERE :{WHITE}Non puoi costruire molo qui...
-STR_9803_SHIP_DEPOT :{WHITE}{TOWN} Deposito Navale
-STR_9804_NEW_SHIPS :{BLACK}Nuove Navi
-STR_9805_SHIPS :{WHITE}{COMPANY} - {COMMA} Nav{P e i}
-STR_9808_NEW_SHIPS :{WHITE}Nuove Navi
-STR_9809_BUILD_SHIP :{BLACK}Costruisci Nave
-STR_CLONE_SHIP :{BLACK}Clona Nave
-STR_CLONE_SHIP_INFO :{BLACK}Costruisce una copia della nave. Premere contemporaneamente Control per condividere gli ordini
-STR_CLONE_SHIP_DEPOT_INFO :{BLACK}Costruisce una copia di una nave. Cliccare su questo pulsante e poi sulla nave (dentro o fuori dal deposito) da copiare. Premere contemporaneamente Control per condividere gli ordini
+STR_9802_CAN_T_BUILD_DOCK_HERE :{WHITE}Impossibile costruire il molo qui...
+STR_9803_SHIP_DEPOT :{WHITE}Deposito navale di {TOWN}
+STR_9804_NEW_SHIPS :{BLACK}Nuove navi
+STR_9805_SHIPS :{WHITE}{COMPANY} - {COMMA} nav{P e i}
+STR_9808_NEW_SHIPS :{WHITE}Nuove navi
+STR_9809_BUILD_SHIP :{BLACK}Costruisci nave
+STR_CLONE_SHIP :{BLACK}Clona nave
+STR_CLONE_SHIP_INFO :{BLACK}Costruisce una copia della nave. Tenere premuto CTRL per condividere gli ordini
+STR_CLONE_SHIP_DEPOT_INFO :{BLACK}Costruisce una copia di una nave. Fare clic su questo pulsante e quindi su una nave dentro o fuori dal deposito. Tenere premuto CTRL per condividere gli ordini
STR_980B_SHIP_MUST_BE_STOPPED_IN :{WHITE}La nave deve essere ferma nel deposito
-STR_980C_CAN_T_SELL_SHIP :{WHITE}Non puoi vendere la nave...
-STR_980D_CAN_T_BUILD_SHIP :{WHITE}Non puoi costruire nave...
-STR_980E_SHIP_IN_THE_WAY :{WHITE}Nave in mezzo
+STR_980C_CAN_T_SELL_SHIP :{WHITE}Impossibile vendere la nave...
+STR_980D_CAN_T_BUILD_SHIP :{WHITE}Impossibile costruire la nave...
+STR_980E_SHIP_IN_THE_WAY :{WHITE}Nave di mezzo
STR_980F :{WHITE}{VEHICLE}
STR_9811_DETAILS :{WHITE}{VEHICLE} (Dettagli)
-STR_9812_AGE_RUNNING_COST_YR :{BLACK}Età : {LTBLUE}{STRING}{BLACK} Consumi: {LTBLUE}{CURRENCY}/anno
-STR_9813_MAX_SPEED :{BLACK}Velocità Max: {LTBLUE}{VELOCITY}
+STR_9812_AGE_RUNNING_COST_YR :{BLACK}Età : {LTBLUE}{STRING}{BLACK} Costo d'esercizio: {LTBLUE}{CURRENCY}/anno
+STR_9813_MAX_SPEED :{BLACK}Velocità max: {LTBLUE}{VELOCITY}
STR_9814_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Profitto quest'anno: {LTBLUE}{CURRENCY} (anno scorso: {CURRENCY})
STR_9815_RELIABILITY_BREAKDOWNS :{BLACK}Affidabilità : {LTBLUE}{COMMA}% {BLACK}Guasti dall'ultima manutenzione: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Costr. nel: {LTBLUE}{NUM}{BLACK} Valore: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY :{BLACK}Capienza: {LTBLUE}{CARGO}
-STR_9818_CAN_T_STOP_START_SHIP :{WHITE}Non puoi far fermare/ripartire la nave...
-STR_9819_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}Non puoi mandare nave al deposito...
-STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Non riesce a trovare il deposito locale
-STR_HEADING_FOR_SHIP_DEPOT :{ORANGE}Direzione per {TOWN} Deposito Navale
-STR_HEADING_FOR_SHIP_DEPOT_VEL :{ORANGE}Direzione per {TOWN} Deposito Navale, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE :{LTBLUE}Servizio a {TOWN} Deposito Navale
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL :{LTBLUE}Servizio a {TOWN} Deposito Navale, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT :{WHITE}Nave {COMMA} sta aspettano nel deposito
-STR_981D_BUILD_SHIP_DOCK :{BLACK}Costruisci molo
-STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING :{BLACK}Costruisci deposito navale (per costruzione e manutenzione)
-STR_981F_SHIPS_CLICK_ON_SHIP_FOR :{BLACK}Navi - fai clic sulla nave per le informazioni
-STR_9820_BUILD_NEW_SHIP :{BLACK}Costruisci una nuova nave
-STR_9821_DRAG_SHIP_TO_HERE_TO_SELL :{BLACK}Trascina qui una nave per venderla
-STR_9822_CENTER_MAIN_VIEW_ON_SHIP :{BLACK}Centra la visuale sul deposito
-STR_9823_SHIPS_CLICK_ON_SHIP_FOR :{BLACK}Navi - fai clic sulla nave per le informazioni
-STR_9824_BUILD_NEW_SHIPS_REQUIRES :{BLACK}Costruisci nuove navi (richiede un deposito navale)
-STR_9825_SHIP_SELECTION_LIST_CLICK :{BLACK}Lista navi - fai clic sulla nave per le informazioni
-STR_9826_BUILD_THE_HIGHLIGHTED_SHIP :{BLACK}Costruisci la nave evidenziata
-STR_9827_CURRENT_SHIP_ACTION_CLICK :{BLACK}Azione della nave corrente - fai clic qui per farla fermare/ripartire
+STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Costruito nel: {LTBLUE}{NUM}{BLACK} Valore: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY :{BLACK}Capacità : {LTBLUE}{CARGO}
+STR_9818_CAN_T_STOP_START_SHIP :{WHITE}Impossibile fermare/avviare la nave...
+STR_9819_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}Impossibile mandare la nave al deposito...
+STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}Impossibile trovare il deposito più vicino
+STR_HEADING_FOR_SHIP_DEPOT :{ORANGE}Diretto al Deposito di {TOWN}
+STR_HEADING_FOR_SHIP_DEPOT_VEL :{ORANGE}Diretto al Deposito di {TOWN}, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE :{LTBLUE}Manutenzione al Deposito di {TOWN}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL :{LTBLUE}Manutenzione al Deposito di {TOWN}, {VELOCITY}
+STR_981C_SHIP_IS_WAITING_IN_DEPOT :{WHITE}La Nave {COMMA} sta aspettano nel deposito
+STR_981D_BUILD_SHIP_DOCK :{BLACK}Costruisce un molo per le navi
+STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING :{BLACK}Costruisce un deposito navale (per costruire e manutenere le navi)
+STR_981F_SHIPS_CLICK_ON_SHIP_FOR :{BLACK}Navi - fare clic su una nave per informazioni
+STR_9820_BUILD_NEW_SHIP :{BLACK}Costruisce una nuova nave
+STR_9821_DRAG_SHIP_TO_HERE_TO_SELL :{BLACK}Trascinare qui una nave per venderla
+STR_9822_CENTER_MAIN_VIEW_ON_SHIP :{BLACK}Centra la visuale principale sulla posizione del deposito navale
+STR_9823_SHIPS_CLICK_ON_SHIP_FOR :{BLACK}Navi - fare clic su una nave per informazioni
+STR_9824_BUILD_NEW_SHIPS_REQUIRES :{BLACK}Costruisce nuove navi (è richiesto un deposito navale)
+STR_9825_SHIP_SELECTION_LIST_CLICK :{BLACK}Elenco selezione navi - fare clic su una nave per informazioni
+STR_9826_BUILD_THE_HIGHLIGHTED_SHIP :{BLACK}Costruisce la nave selezionata
+STR_9827_CURRENT_SHIP_ACTION_CLICK :{BLACK}Azione corrente della nave - fare clic qui per fermarla/avviarla
STR_9828_SHOW_SHIP_S_ORDERS :{BLACK}Mostra gli ordini della nave
-STR_9829_CENTER_MAIN_VIEW_ON_SHIP :{BLACK}Centra la visuale sulla nave
-STR_982A_SEND_SHIP_TO_DEPOT :{BLACK}Manda la nave al deposito
-STR_982B_SHOW_SHIP_DETAILS :{BLACK}Mostra dettagli sulla nave
-STR_982E_COST_MAX_SPEED_CAPACITY :{BLACK}Costo: {CURRENCY} Velocità Max: {VELOCITY}{}Capienza: {CARGO}{}Consumi: {CURRENCY}/anno
-STR_982F_NAME_SHIP :{BLACK}Nome Nave
+STR_9829_CENTER_MAIN_VIEW_ON_SHIP :{BLACK}Centra la visuale principale sulla posizione della nave
+STR_982A_SEND_SHIP_TO_DEPOT :{BLACK}Manda la nave al deposito e CTRL+clic per eseguire solo una manutenzione
+STR_982B_SHOW_SHIP_DETAILS :{BLACK}Mostra i dettagli sulla nave
+STR_982E_COST_MAX_SPEED_CAPACITY :{BLACK}Costo: {CURRENCY} Velocità max: {VELOCITY}{}Capacità : {CARGO}{}Costo d'esercizio: {CURRENCY}/anno
+STR_982F_NAME_SHIP :{BLACK}Rinomina la nave
-STR_9831_NAME_SHIP :{WHITE}Nome Nave
-STR_9832_CAN_T_NAME_SHIP :{WHITE}Non puoi rinominare il nome della nave...
-STR_9833_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Prima nave arrivata a {STATION}!
-STR_9834_POSITION_BUOY_WHICH_CAN :{BLACK}Posiziona boa, può essere usata come way point.
-STR_9835_CAN_T_POSITION_BUOY_HERE :{WHITE}Non puoi posizionare una boa qui...
+STR_9831_NAME_SHIP :{WHITE}Rinomina nave
+STR_9832_CAN_T_NAME_SHIP :{WHITE}Impossibile rinominare la nave...
+STR_9833_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}La prima nave attracca a {STATION}!
+STR_9834_POSITION_BUOY_WHICH_CAN :{BLACK}Posiziona una boa che può essere usata come waypoint
+STR_9835_CAN_T_POSITION_BUOY_HERE :{WHITE}Impossibile posizionare una boa qui...
STR_9836_RENAME :{BLACK}Rinomina
STR_9837_RENAME_SHIP_TYPE :{BLACK}Rinomina il tipo di nave
-STR_9838_RENAME_SHIP_TYPE :{WHITE}Rinomina il tipo di nave
-STR_9839_CAN_T_RENAME_SHIP_TYPE :{WHITE}Non puoi rinominare il tipo di nave...
-STR_983A_REFIT_CARGO_SHIP_TO_CARRY :{BLACK}Converti la nave per caricare un tipo di merce diversa
-STR_983B_REFIT :{WHITE}{VEHICLE} (Converti)
-STR_983C_REFIT_SHIP :{BLACK}Converti nave
-STR_983D_SELECT_TYPE_OF_CARGO_FOR :{BLACK}Seleziona tipo di merce da caricare
-STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED :{BLACK}Converti la nave per trasportare il tipo di merce evidenziata
-STR_983F_SELECT_CARGO_TYPE_TO_CARRY :{GOLD}Seleziona il tipo di merce da caricare:
-STR_9840_NEW_CAPACITY_COST_OF_REFIT :{BLACK}Nuova Capienza: {GOLD}{CARGO}{}{BLACK}Costo conversione: {GOLD}{CURRENCY}
-STR_9841_CAN_T_REFIT_SHIP :{WHITE}Non puoi convertire la nave...
-STR_9842_REFITTABLE :(convertibile)
-STR_GO_TO_SHIP_DEPOT :Vai a {TOWN} Deposito Navale
+STR_9838_RENAME_SHIP_TYPE :{WHITE}Rinomina tipo di nave
+STR_9839_CAN_T_RENAME_SHIP_TYPE :{WHITE}Impossibile rinominare il tipo di nave...
+STR_983A_REFIT_CARGO_SHIP_TO_CARRY :{BLACK}Riadatta il mercantile per permettere il trasporto di un tipo di carico differente
+STR_983B_REFIT :{WHITE}{VEHICLE} (Riadatta)
+STR_983C_REFIT_SHIP :{BLACK}Riadatta nave
+STR_983D_SELECT_TYPE_OF_CARGO_FOR :{BLACK}Seleziona il tipo di carico da far trasportare alla nave
+STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED :{BLACK}Riadatta la nave per permettere il trasporto del tipo di carico selezionato
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY :{GOLD}Selezionare il tipo di carico da trasportare:
+STR_9840_NEW_CAPACITY_COST_OF_REFIT :{BLACK}Nuova capacità : {GOLD}{CARGO}{}{BLACK}Costo riadattamento: {GOLD}{CURRENCY}
+STR_9841_CAN_T_REFIT_SHIP :{WHITE}Impossibile riadattare la nave...
+STR_9842_REFITTABLE :(riadattabile)
+STR_GO_TO_SHIP_DEPOT :Vai al Deposito navale di {TOWN}
SERVICE_AT_SHIP_DEPOT :Manutenzione al Deposito navale di {TOWN}
##id 0xA000
STR_A000_AIRPORTS :{WHITE}Aeroporti
-STR_A001_CAN_T_BUILD_AIRPORT_HERE :{WHITE}Non puoi costruire un aeroporto qui...
-STR_A002_AIRCRAFT_HANGAR :{WHITE}{STATION} Hangar
-STR_A003_NEW_AIRCRAFT :{BLACK}Nuovo Aereo
-STR_CLONE_AIRCRAFT :{BLACK}Clona Aereo
-STR_CLONE_AIRCRAFT_INFO :{BLACK}Costruisce una copia dell'aereo. Premere contemporaneamente Control per condividere gli ordini
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Costruisce una copia di un aereo. Cliccare su questo pulsante e poi sull'aereo (dentro o fuori dal deposito) da copiare. Premere contemporaneamente Control per condividere gli ordini
-STR_A005_NEW_AIRCRAFT :{WHITE}Nuovo Aereo
-STR_A006_BUILD_AIRCRAFT :{BLACK}Costruisci Aereo
-STR_A008_CAN_T_BUILD_AIRCRAFT :{WHITE}Non puoi costruire l'aereo
-STR_A009_AIRCRAFT :{WHITE}{COMPANY} - {COMMA} Aereo
+STR_A001_CAN_T_BUILD_AIRPORT_HERE :{WHITE}Impossibile costruire un aeroporto qui...
+STR_A002_AIRCRAFT_HANGAR :{WHITE}Hangar di {STATION}
+STR_A003_NEW_AIRCRAFT :{BLACK}Nuovo aeromobile
+STR_CLONE_AIRCRAFT :{BLACK}Clona aeromobile
+STR_CLONE_AIRCRAFT_INFO :{BLACK}Costruisce una copia dell'aeromobile. Tenere premuto CTRL per condividere gli ordini
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Costruisce una copia di un aeromobile. Fare clic su questo pusalnte e quindi su un aeromobile dentro o fuori dall'hangar. Tenere premuto CTRL per convidivere gli ordini.
+STR_A005_NEW_AIRCRAFT :{WHITE}Nuovo aeromobile
+STR_A006_BUILD_AIRCRAFT :{BLACK}Costruisci aeromobile
+STR_A008_CAN_T_BUILD_AIRCRAFT :{WHITE}Impossibile costruire l'aeromobile...
+STR_A009_AIRCRAFT :{WHITE}{COMPANY} - {COMMA} aeromobil{P e i}
STR_A00A :{WHITE}{VEHICLE}
STR_A00B_ORDERS :{WHITE}{VEHICLE} (Ordini)
STR_A00C_DETAILS :{WHITE}{VEHICLE} (Dettagli)
-STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Età : {LTBLUE}{STRING}{BLACK} Consumi: {LTBLUE}{CURRENCY}/anno
-STR_A00E_MAX_SPEED :{BLACK}Velocità Max: {LTBLUE}{VELOCITY}
+STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Età : {LTBLUE}{STRING}{BLACK} Costo d'esercizio: {LTBLUE}{CURRENCY}/anno
+STR_A00E_MAX_SPEED :{BLACK}Velocità max: {LTBLUE}{VELOCITY}
STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Profitto quest'anno: {LTBLUE}{CURRENCY} (anno scorso: {CURRENCY})
STR_A010_RELIABILITY_BREAKDOWNS :{BLACK}Affidabilità : {LTBLUE}{COMMA}% {BLACK}Guasti dall'ultima manutenzione: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Costr. nel: {LTBLUE}{NUM}{BLACK} Valore: {LTBLUE}{CURRENCY}
-STR_A012_CAN_T_SEND_AIRCRAFT_TO :{WHITE}Non puoi mandare l'aereo nell'hangar...
-STR_HEADING_FOR_HANGAR :{ORANGE}Direzione per {STATION} Hangar
-STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Direzione per {STATION} Hangar, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE :{LTBLUE}Servizio a {STATION} Hangar
-STR_HEADING_FOR_HANGAR_SERVICE_VEL :{LTBLUE}Servizio a {STATION} Hangar, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN :{WHITE}Aereo {COMMA} sta aspettano nell'hangar
-STR_A015_AIRCRAFT_IN_THE_WAY :{WHITE}Aereo in mezzo
-STR_A016_CAN_T_STOP_START_AIRCRAFT :{WHITE}Non puoi far fermare/ripartire l'aereo...
-STR_A017_AIRCRAFT_IS_IN_FLIGHT :{WHITE}Aereo in volo
-STR_A019_CAPACITY :{BLACK}Capienza: {LTBLUE}{CARGO}, {CARGO}
-STR_A01A_CAPACITY :{BLACK}Capienza: {LTBLUE}{CARGO}
-STR_A01B_AIRCRAFT_MUST_BE_STOPPED :{WHITE}Dev'essere fermo nell'hangar
-STR_A01C_CAN_T_SELL_AIRCRAFT :{WHITE}Non puoi vendere l'aereo...
-STR_A01D_AIRPORT_CONSTRUCTION :Costruzioni aeroporto
-STR_A01E_BUILD_AIRPORT :{BLACK}Costruisci aeroporto
-STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT :{BLACK}Aereo - fai clic sull'aereo per le informazioni
-STR_A020_BUILD_NEW_AIRCRAFT_REQUIRES :{BLACK}Costruisci un nuovo aereo (richiesto aeroporto con hangar)
-STR_A021_AIRCRAFT_CLICK_ON_AIRCRAFT :{BLACK}Aereo - clicca sull'aereo per le informazioni
-STR_A022_BUILD_NEW_AIRCRAFT :{BLACK}Costruisci un nuovo aereo
-STR_A023_DRAG_AIRCRAFT_TO_HERE_TO :{BLACK}Trascina qui l'aereo per venderlo
-STR_A024_CENTER_MAIN_VIEW_ON_HANGAR :{BLACK}Centra visuale sull'hangar
-STR_A025_AIRCRAFT_SELECTION_LIST :{BLACK}Lista aerei - fai clic sull'aereo per le informazioni
-STR_A026_BUILD_THE_HIGHLIGHTED_AIRCRAFT :{BLACK}Costruisci l'aereo evidenziato
-STR_A027_CURRENT_AIRCRAFT_ACTION :{BLACK}Azione corrente dell'aereo - fai clic qui per far fermare/ripartire l'aereo
-STR_A028_SHOW_AIRCRAFT_S_ORDERS :{BLACK}Mostra ordini dell'aereo
-STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT :{BLACK}Centra visuale sull'aereo
-STR_A02A_SEND_AIRCRAFT_TO_HANGAR :{BLACK}Manda l'aereo all'hangar
-STR_A02B_SHOW_AIRCRAFT_DETAILS :{BLACK}Mostra dettagli dell'aereo
-STR_A02E_COST_MAX_SPEED_CAPACITY :{BLACK}Costo: {CURRENCY} Velocità Max: {VELOCITY}{}Capienza: {COMMA} passeggeri, {COMMA} sacchi postali{}Consumi: {CURRENCY}/anno
+STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Costruito nel: {LTBLUE}{NUM}{BLACK} Valore: {LTBLUE}{CURRENCY}
+STR_A012_CAN_T_SEND_AIRCRAFT_TO :{WHITE}Impossibile mandare l'aeromobile all'hangar...
+STR_HEADING_FOR_HANGAR :{ORANGE}Diretto all'Hangar di {STATION}
+STR_HEADING_FOR_HANGAR_VEL :{ORANGE}Diretto all'Hangar di {STATION}, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE :{LTBLUE}Manutenzione all'Hangar di {STATION}
+STR_HEADING_FOR_HANGAR_SERVICE_VEL :{LTBLUE}Manutenzione all'Hangar di {STATION}, {VELOCITY}
+STR_A014_AIRCRAFT_IS_WAITING_IN :{WHITE}L'Aeromobile {COMMA} sta aspettano nell'hangar
+STR_A015_AIRCRAFT_IN_THE_WAY :{WHITE}Aeromobile di mezzo
+STR_A016_CAN_T_STOP_START_AIRCRAFT :{WHITE}Impossibile fermare/avviare l'aeromobile...
+STR_A017_AIRCRAFT_IS_IN_FLIGHT :{WHITE}L'aeromobile è in volo
+STR_A019_CAPACITY :{BLACK}Capacità : {LTBLUE}{CARGO}, {CARGO}
+STR_A01A_CAPACITY :{BLACK}Capacità : {LTBLUE}{CARGO}
+STR_A01B_AIRCRAFT_MUST_BE_STOPPED :{WHITE}L'aeromobile deve essere fermo nell'hangar
+STR_A01C_CAN_T_SELL_AIRCRAFT :{WHITE}Impossibile vendere l'aeromobile...
+STR_A01D_AIRPORT_CONSTRUCTION :Costruzione aeroporto
+STR_A01E_BUILD_AIRPORT :{BLACK}Costruisce un aeroporto
+STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT :{BLACK}Aeromobili - fare clic su un aeromobile per informazioni
+STR_A020_BUILD_NEW_AIRCRAFT_REQUIRES :{BLACK}Costruisce un nuovo aeromobile (è richiesto un aeroporto con hangar)
+STR_A021_AIRCRAFT_CLICK_ON_AIRCRAFT :{BLACK}Aereomobili - fare clic su un aeromobile per informazioni
+STR_A022_BUILD_NEW_AIRCRAFT :{BLACK}Costruisce un nuovo aeromobile
+STR_A023_DRAG_AIRCRAFT_TO_HERE_TO :{BLACK}Trascianre qui un aeromobile per venderlo
+STR_A024_CENTER_MAIN_VIEW_ON_HANGAR :{BLACK}Centra la visuale principale sulla posizione dell'hangar
+STR_A025_AIRCRAFT_SELECTION_LIST :{BLACK}Elenco selezione aeromobili - fare clic su un aeromobile per informazioni
+STR_A026_BUILD_THE_HIGHLIGHTED_AIRCRAFT :{BLACK}Costruisce l'aeromobile selezionato
+STR_A027_CURRENT_AIRCRAFT_ACTION :{BLACK}Azione corrente dell'aeromobile - fare clic qui per fermare/avviare l'aeromobile
+STR_A028_SHOW_AIRCRAFT_S_ORDERS :{BLACK}Mostra gli ordini dell'aeromobile
+STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT :{BLACK}Centra la visuale principale sulla posizione dell'aeromobile
+STR_A02A_SEND_AIRCRAFT_TO_HANGAR :{BLACK}Manda l'aeromobile all'hangar e CTRL+clic esegue solo una manutenzione
+STR_A02B_SHOW_AIRCRAFT_DETAILS :{BLACK}Mostra i dettagli sull'aeromobile
+STR_A02E_COST_MAX_SPEED_CAPACITY :{BLACK}Costo: {CURRENCY} Velocità max: {VELOCITY}{}Capacità : {COMMA} passeggeri, {COMMA} sacchi postali{}Costo d'esercizio: {CURRENCY}/anno
-STR_A030_NAME_AIRCRAFT :{WHITE}Nome aereo
-STR_A031_CAN_T_NAME_AIRCRAFT :{WHITE}Non puoi rinominare l'aereo...
-STR_A032_NAME_AIRCRAFT :{BLACK}Nome aereo
-STR_A033_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Primo aereo atterrato a {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL :{BLACK}{BIGFONT}Aereo Schiantato!{}{COMMA} morti in una palla di fuoco a {STATION}
-STR_PLANE_CRASH_OUT_OF_FUEL :{BLACK}{BIGFONT}Incidente aereo!{}L'aereo ha esaurito il carburante, {COMMA} morti in una palla di fuoco!
+STR_A030_NAME_AIRCRAFT :{WHITE}Rinomina aeromobile
+STR_A031_CAN_T_NAME_AIRCRAFT :{WHITE}Impossibile rinominare l'aeromobile...
+STR_A032_NAME_AIRCRAFT :{BLACK}Rinomina l'aeromobile
+STR_A033_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}I cittadini festeggiano . . .{}Il primo aereo atterra a {STATION}!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL :{BLACK}{BIGFONT}Aeroplano precipitato!{}In {COMMA} muoiono nel fuoco a {STATION}
+STR_PLANE_CRASH_OUT_OF_FUEL :{BLACK}{BIGFONT}Incidente aereo!{}L'aereo ha esaurito il carburante. In {COMMA} muoiono fra le fiamme!
STR_A036 :{TINYFONT}{BLACK}{STATION}
STR_A037_RENAME :{BLACK}Rinomina
-STR_A038_RENAME_AIRCRAFT_TYPE :{BLACK}Rinomina il tipo di aereo
-STR_A039_RENAME_AIRCRAFT_TYPE :{WHITE}Rinomina il tipo di aereo
-STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE :{WHITE}Non puoi rinominare il tipo di aereo...
-STR_A03B_REFIT_AIRCRAFT_TO_CARRY :{BLACK}Converti l'aereo per trasportare un tipo di merce diversa
-STR_A03C_REFIT :{WHITE}{VEHICLE} (Converti)
-STR_A03D_REFIT_AIRCRAFT :{BLACK}Converti l'aereo
-STR_A03E_SELECT_TYPE_OF_CARGO_FOR :{BLACK}Seleziona il tipo di merce da caricare
-STR_A03F_REFIT_AIRCRAFT_TO_CARRY :{BLACK}Converti l'aereo per trasportare il tipo di merce evidenziata
-STR_A040_SELECT_CARGO_TYPE_TO_CARRY :{GOLD}Seleziona il tipo di merce da caricare:
-STR_A041_NEW_CAPACITY_COST_OF_REFIT :{BLACK}Nuova capacità : {GOLD}{STRING}{}{BLACK}Costo conversione: {GOLD}{CURRENCY}
-STR_A042_CAN_T_REFIT_AIRCRAFT :{WHITE}Non puoi convertire l'aereo...
-STR_GO_TO_AIRPORT_HANGAR :Vai a {STATION} Hangar
+STR_A038_RENAME_AIRCRAFT_TYPE :{BLACK}Rinomina il tipo di aeromobile
+STR_A039_RENAME_AIRCRAFT_TYPE :{WHITE}Rinomina tipo di aeromobile
+STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE :{WHITE}Impossibile rinominare il tipo di aeromobile...
+STR_A03B_REFIT_AIRCRAFT_TO_CARRY :{BLACK}Riadatta l'aeromobile per trasportare un tipo di carico differente
+STR_A03C_REFIT :{WHITE}{VEHICLE} (Riadatta)
+STR_A03D_REFIT_AIRCRAFT :{BLACK}Riadatta aeromobile
+STR_A03E_SELECT_TYPE_OF_CARGO_FOR :{BLACK}Seleziona il tipo di carico da far trasportare all'aeromobile
+STR_A03F_REFIT_AIRCRAFT_TO_CARRY :{BLACK}Riadatta l'aeromobile per permettere il trasporto del tipo di carico selezionato
+STR_A040_SELECT_CARGO_TYPE_TO_CARRY :{GOLD}Seleziona il tipo di carico da trasportare:
+STR_A041_NEW_CAPACITY_COST_OF_REFIT :{BLACK}Nuova capacità : {GOLD}{STRING}{}{BLACK}Costo riadattamento: {GOLD}{CURRENCY}
+STR_A042_CAN_T_REFIT_AIRCRAFT :{WHITE}Impossibile riadattare l'aeromobile...
+STR_GO_TO_AIRPORT_HANGAR :Vai all'Hangar di {STATION}
SERVICE_AT_AIRPORT_HANGAR :Manutenzione all'Hangar di {STATION}
##id 0xB000
STR_B000_ZEPPELIN_DISASTER_AT :{BLACK}{BIGFONT}Disastro Zeppelin a {STATION}!
-STR_B001_ROAD_VEHICLE_DESTROYED :{BLACK}{BIGFONT}Veicolo distrutto in una collisione con un 'UFO'
+STR_B001_ROAD_VEHICLE_DESTROYED :{BLACK}{BIGFONT}Automezzo distrutto in una collisione con un 'UFO'!
STR_B002_OIL_REFINERY_EXPLOSION :{BLACK}{BIGFONT}Esplosione in una raffineria vicino a {TOWN}!
STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS :{BLACK}{BIGFONT}Fabbrica distrutta in circostanze sospette vicino a {TOWN}!
-STR_B004_UFO_LANDS_NEAR :{BLACK}{BIGFONT}'UFO' atterra vicino a {TOWN}!
-STR_B005_COAL_MINE_SUBSIDENCE_LEAVES :{BLACK}{BIGFONT}Cedimento in una miniera di carbone lascia tracce di distruzione vicino a {TOWN}!
-STR_B006_FLOOD_VEHICLE_DESTROYED :{BLACK}{BIGFONT}Alluvione!{}{COMMA} distrutto o disperso a seguito di una mortale alluvione!
+STR_B004_UFO_LANDS_NEAR :{BLACK}{BIGFONT}Un 'UFO' atterra vicino a {TOWN}!
+STR_B005_COAL_MINE_SUBSIDENCE_LEAVES :{BLACK}{BIGFONT}Cedimento in una miniera di carbone lascia una scia di distruzione vicino a {TOWN}!
+STR_B006_FLOOD_VEHICLE_DESTROYED :{BLACK}{BIGFONT}Alluvione!{}Almeno {COMMA} dispersi, presunti morti, in una imponente alluvione!
-STR_BRIBE_FAILED :{WHITE}Il tentativo di corruzione è stato
+STR_BRIBE_FAILED :{WHITE}Il tuo tentativo di corruzione è stato
STR_BRIBE_FAILED_2 :{WHITE}scoperto dalla Guardia di Finanzia.
-STR_BUILD_DATE :{BLACK}Realizzato il: {LTBLUE}{DATE_LONG}
+STR_BUILD_DATE :{BLACK}Costruito il: {LTBLUE}{DATE_LONG}
-STR_PERFORMANCE_DETAIL :{WHITE}Dettagli valutazione delle prestazioni
+STR_PERFORMANCE_DETAIL :{WHITE}Valutazione dettagliata prestazioni
STR_PERFORMANCE_DETAIL_KEY :{BLACK}Dettagli
STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
STR_PERFORMANCE_DETAIL_AMOUNT_INT :{BLACK}({COMMA}/{COMMA})
@@ -2895,84 +2883,84 @@
############ Those following lines need to be in this order!!
STR_PERFORMANCE_DETAIL_VEHICLES :{BLACK}Veicoli:
STR_PERFORMANCE_DETAIL_STATIONS :{BLACK}Stazioni:
-STR_PERFORMANCE_DETAIL_MIN_PROFIT :{BLACK}Profitto Min.:
-STR_PERFORMANCE_DETAIL_MIN_INCOME :{BLACK}Incasso Min.:
-STR_PERFORMANCE_DETAIL_MAX_INCOME :{BLACK}Incasso Max.:
-STR_PERFORMANCE_DETAIL_DELIVERED :{BLACK}Trasportati:
-STR_PERFORMANCE_DETAIL_CARGO :{BLACK}Merce:
+STR_PERFORMANCE_DETAIL_MIN_PROFIT :{BLACK}Profitto min:
+STR_PERFORMANCE_DETAIL_MIN_INCOME :{BLACK}Incasso min:
+STR_PERFORMANCE_DETAIL_MAX_INCOME :{BLACK}Incasso max:
+STR_PERFORMANCE_DETAIL_DELIVERED :{BLACK}Consegnato:
+STR_PERFORMANCE_DETAIL_CARGO :{BLACK}Merci:
STR_PERFORMANCE_DETAIL_MONEY :{BLACK}Denaro:
STR_PERFORMANCE_DETAIL_LOAN :{BLACK}Prestito:
STR_PERFORMANCE_DETAIL_TOTAL :{BLACK}Totale:
############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP :{BLACK}Numero di veicoli. Include Veicoli Stradali, Treni, Navi e Aerei.
-STR_PERFORMANCE_DETAIL_STATIONS_TIP :{BLACK}Numero di blocchi stazione. Ogni parte di una stazione (e.g. stazione ferroviaria, fermata dell'autobus, aeroporti) viene contata, anche se insieme formano un'unica stazione.
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP :{BLACK}Profitto del veicolo con l'incasso minore (tra tutti i veicoli più vecchi di 2 anni)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP :{BLACK}Ammontare di denaro guadagnato nel mese con il minimo profitto degli ultimi 12 quarti
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP :{BLACK}Ammontare di denaro guadagnato nel mese con il massimo profitto degli ultimi 12 quarti
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP :{BLACK}Unità di merce trasportata nell'ultimo quarto.
-STR_PERFORMANCE_DETAIL_CARGO_TIP :{BLACK}Tipi di merci trasportate nell'ultimo quarto.
-STR_PERFORMANCE_DETAIL_MONEY_TIP :{BLACK}Ammontare di denaro in tasca
-STR_PERFORMANCE_DETAIL_LOAN_TIP :{BLACK}Hai preso un prestito troppo elevato?
-STR_PERFORMANCE_DETAIL_TOTAL_TIP :{BLACK}Totale dei punti rispetto ad un massimo di punti possibili
+STR_PERFORMANCE_DETAIL_VEHICLES_TIP :{BLACK}Numero di veicoli; include automezzi, treni, navi e aeromobili
+STR_PERFORMANCE_DETAIL_STATIONS_TIP :{BLACK}Numero di blocchi stazione. Sono contate tutte le parti di una stazione (es. stazione ferroviaria, stazione autobus, aeroporto), anche se connesse insieme a formare un'unica stazione
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP :{BLACK}Profitto del veicolo con l'incasso minore (fra tutti i veicoli più vecchi di 2 anni)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP :{BLACK}Ammontare di denaro guadagnato nel mese con il minimo profitto degli ultimi 12 trimestri
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP :{BLACK}Ammontare di denaro guadagnato nel mese con il massimo profitto degli ultimi 12 trimestri
+STR_PERFORMANCE_DETAIL_DELIVERED_TIP :{BLACK}Unità di merce consegnate negli ultimi quattro trimestri
+STR_PERFORMANCE_DETAIL_CARGO_TIP :{BLACK}Tipi di merci consegnati nell'ultimo trimestre
+STR_PERFORMANCE_DETAIL_MONEY_TIP :{BLACK}Ammontare di denaro di questa compagnia in banca
+STR_PERFORMANCE_DETAIL_LOAN_TIP :{BLACK}L'ammontare di denaro che questa compagnia ha preso in prestito
+STR_PERFORMANCE_DETAIL_TOTAL_TIP :{BLACK}Punteggio totale rispetto al massimo realizzabile
STR_NEWGRF_SETTINGS_BUTTON :{BLACK}Impostazioni NewGRF
-STR_NEWGRF_SETTINGS_CAPTION :{WHITE}Impostazioni newgrf
+STR_NEWGRF_SETTINGS_CAPTION :{WHITE}Impostazioni NewGRF
STR_NEWGRF_APPLY_CHANGES :{BLACK}Applica cambiamenti
STR_NEWGRF_SET_PARAMETERS :{BLACK}Imposta parametri
-STR_NEWGRF_TIP :{BLACK}Una lista di tutti i Newgrf che hai installato. Cliccane uno per cambiarne le impostazioni
-STR_NEWGRF_NO_FILES_INSTALLED :{BLACK}Non ci sono attualmente file newgrf installati! Fare riferimento al manuale per installarne di nuovi
+STR_NEWGRF_TIP :{BLACK}Elenco di tutti i pacchetti NewGRF installati. Fare clic su uno di essi per cambiarne le impostazioni
+STR_NEWGRF_NO_FILES_INSTALLED :{BLACK}Attualmente non ci sono file NewGRF installati! Fare riferimento al manuale per istruzioni sull'installazione di grafica aggiuntiva
STR_NEWGRF_FILENAME :{BLACK}Nome file: {SILVER}{STRING}
STR_NEWGRF_GRF_ID :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM :{BLACK}MD5sum: {SILVER}{STRING}
-STR_NEWGRF_CONFIRMATION_TEXT :{YELLOW}Stai per fare cambiamenti a una partita in corso; questa cosa può crashare OpenTTD.{}Sei assolutamente sicuro di farlo?
+STR_NEWGRF_MD5SUM :{BLACK}Somma MD5: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT :{YELLOW}Si stanno per apportare cambiamenti a una partita in corso: questo potrebbe causare un crash di OpenTTD.{}Si è assolutamente sicuri?
STR_NEWGRF_ERROR_MSG_INFO :{SILVER}{STRING}
STR_NEWGRF_ERROR_MSG_WARNING :{RED}Attenzione: {SILVER}{STRING}
STR_NEWGRF_ERROR_MSG_ERROR :{RED}Errore: {SILVER}{STRING}
-STR_NEWGRF_ERROR_MSG_FATAL :{RED}Errore Fatale: {SILVER}{STRING}
-STR_NEWGRF_ERROR_VERSION_NUMBER :{STRING} può non funzionare con la versione di TTDPatch riportata da OpenTTD.
+STR_NEWGRF_ERROR_MSG_FATAL :{RED}Errore fatale: {SILVER}{STRING}
+STR_NEWGRF_ERROR_VERSION_NUMBER :{STRING} non funziona con la versione di TTDPatch riferita da OpenTTD.
STR_NEWGRF_ERROR_DOS_OR_WINDOWS :{STRING} è per la versione {STRING} di TTD.
STR_NEWGRF_ERROR_UNSET_SWITCH :{STRING} è progettato per essere usato con {STRING}
-STR_NEWGRF_ERROR_INVALID_PARAMETER :Parametri invalidi per {STRING}: parametri {STRING} ({NUM})
+STR_NEWGRF_ERROR_INVALID_PARAMETER :Parametro non valido per {STRING}: parametro {STRING} ({NUM})
STR_NEWGRF_ERROR_LOAD_BEFORE :{STRING} deve essere caricato prima di {STRING}.
STR_NEWGRF_ERROR_LOAD_AFTER :{STRING} deve essere caricato dopo {STRING}.
STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE :il file GRF che era progettato per tradurre
STR_NEWGRF_ADD :{BLACK}Aggiungi
-STR_NEWGRF_ADD_TIP :{BLACK}Aggiungi un file NewGRF alla lista
-STR_NEWGRF_REMOVE :{BLACK}Togli
-STR_NEWGRF_REMOVE_TIP :{BLACK}Togli il file NewGRF selezionato dalla lista
+STR_NEWGRF_ADD_TIP :{BLACK}Aggiunge un file NewGRF all'elenco
+STR_NEWGRF_REMOVE :{BLACK}Rimuovi
+STR_NEWGRF_REMOVE_TIP :{BLACK}Rimuove il file NewGRF selezionato dall'elenco
STR_NEWGRF_MOVEUP :{BLACK}Sposta su
-STR_NEWGRF_MOVEUP_TIP :{BLACK}Sposta su il file NewGRF selezionato nella lista
+STR_NEWGRF_MOVEUP_TIP :{BLACK}Sposta su il file NewGRF selezionato nell'elenco
STR_NEWGRF_MOVEDOWN :{BLACK}Sposta giù
-STR_NEWGRF_MOVEDOWN_TIP :{BLACK}Sposta giù il file NewGRF selezionato nella lista
-STR_NEWGRF_FILE_TIP :{BLACK}Una lista dei file NewGRF installati. Clicca un file per cambiare i parametri
+STR_NEWGRF_MOVEDOWN_TIP :{BLACK}Sposta giù il file NewGRF selezionato nell'elenco
+STR_NEWGRF_FILE_TIP :{BLACK}Elenco dei file NewGRF installati. Fare clic su un file per cambiarne i parametri
STR_NEWGRF_PARAMETER :{BLACK}Parametri: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY :{BLACK}Immetti i parametri NewGRF
+STR_NEWGRF_PARAMETER_QUERY :{BLACK}Inserire i parametri NewGRF
STR_NEWGRF_NO_INFO :{BLACK}Informazioni non disponibili
STR_NEWGRF_ADD_CAPTION :{WHITE}File NewGRF disponibili
STR_NEWGRF_ADD_FILE :{BLACK}Aggiungi alla selezione
-STR_NEWGRF_ADD_FILE_TIP :{BLACK}Aggiungi il file NewGRF selezionato nella vostra configurazione
+STR_NEWGRF_ADD_FILE_TIP :{BLACK}Aggiunge il file NewGRF selezionato alla configurazione
STR_NEWGRF_RESCAN_FILES :{BLACK}Aggiorna file
STR_NEWGRF_RESCAN_FILES_TIP :{BLACK}Aggiorna la lista dei file NewGRF disponibili
-STR_NEWGRF_DUPLICATE_GRFID :{WHITE}Non posso aggiungere un altro file: GRF ID esistente
+STR_NEWGRF_DUPLICATE_GRFID :{WHITE}Impossibile aggiungere il file: GRF ID duplicato
-STR_NEWGRF_NOT_FOUND :{RED}File simile non trovato
+STR_NEWGRF_NOT_FOUND :{RED}File corrispondente non trovato
STR_NEWGRF_DISABLED :{RED}Disabilitato
-STR_NEWGRF_COMPATIBLE_LOADED :{ORANGE}File corrispondente non trovato (file GRF compatibile caricato)
+STR_NEWGRF_COMPATIBLE_LOADED :{ORANGE}File corrispondente non trovato (caricato file GRF compatibile)
-STR_NEWGRF_COMPATIBLE_LOAD_WARNING :{WHITE}File GRF compatibili caricati per i file mancanti
-STR_NEWGRF_DISABLED_WARNING :{WHITE}File GRF mancanti sono stati disabilitati
-STR_NEWGRF_NOT_FOUND_WARNING :{WHITE}File GRF mancanti per poter caricare il gioco
+STR_NEWGRF_COMPATIBLE_LOAD_WARNING :{WHITE}File GRF compatibili caricati al posto dei file mancanti
+STR_NEWGRF_DISABLED_WARNING :{WHITE}I file GRF mancanti sono stati disabilitati
+STR_NEWGRF_NOT_FOUND_WARNING :{WHITE}Mancano file GRF necessari per caricare la partita
STR_CURRENCY_WINDOW :{WHITE}Valuta personalizzata
STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Cambio: {ORANGE}{CURRENCY} = £ {COMMA}
STR_CURRENCY_SEPARATOR :{LTBLUE}Separatore:
STR_CURRENCY_PREFIX :{LTBLUE}Prefisso:
STR_CURRENCY_SUFFIX :{LTBLUE}Suffisso:
-STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Passa agli Euro: {ORANGE}{NUM}
-STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Passa agli Euro: {ORANGE}mai
+STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}Passa all'Euro: {ORANGE}{NUM}
+STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}Passa all'Euro: {ORANGE}Mai
STR_CURRENCY_PREVIEW :{LTBLUE}Anteprima: {ORANGE}{CURRENCY}
STR_CURRENCY_CHANGE_PARAMETER :{BLACK}Cambia i parametri della valuta personalizzata
@@ -2982,58 +2970,58 @@
STR_PLANE :{BLACK}{PLANE}
STR_SHIP :{BLACK}{SHIP}
-STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} Treni
-STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} Veicoli
-STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} Aerei
-STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Navi
+STR_SCHEDULED_TRAINS :{WHITE}{STATION} - {COMMA} tren{P o i}
+STR_SCHEDULED_ROAD_VEHICLES :{WHITE}{STATION} - {COMMA} automezz{P o i}
+STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION} - {COMMA} aeromobil{P e i}
+STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} nav{P e i}
-STR_SCHEDULED_TRAINS_TIP :{BLACK}Mostra tutti i treni che hanno questa stazione tra gli ordini
-STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Mostra tutti i veicoli che hanno questa stazione tra gli ordini
-STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Mostra tutti gli aerei che hanno questa stazione tra gli ordini
-STR_SCHEDULED_SHIPS_TIP :{BLACK}Mostra tutte le navi che hanno questo porto tra gli ordini
+STR_SCHEDULED_TRAINS_TIP :{BLACK}Mostra tutti i treni che hanno questa stazione pianificata
+STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Mostra tutti gli automezzi che hanno questa stazione pianificata
+STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Mostra tutti gli aeromobili che hanno questa stazione pianificata
+STR_SCHEDULED_SHIPS_TIP :{BLACK}Mostra tutte le navi che hanno questa stazione pianificata
-STR_VEH_WITH_SHARED_ORDERS_LIST :{WHITE}Ordini comuni di {COMMA} Veicol{P o i}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Mostra tutti i veicoli con la stessa lista ordini
+STR_VEH_WITH_SHARED_ORDERS_LIST :{WHITE}Ordini condivisi da {COMMA} veicol{P o i}
+STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Mostra tutti i veicoli che condividono questa lista ordini
### depot strings
STR_DEPOT_SELL_CONFIRMATION_TEXT :{YELLOW}Stai per vendere tutti i veicoli nel deposito. Sei sicuro?
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Vendi tutti i treni nel deposito
-STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Vendi tutti i veicoli nel deposito
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP :{BLACK}Vendi tute le navi nel deposito
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP :{BLACK}Vendi tutti gli aerei nell'hangar
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Vende tutti i treni nel deposito
+STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Vende tutti gli automezzi nel deposito
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP :{BLACK}Vende tute le navi nel deposito
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP :{BLACK}Vende tutti gli aeromobili nell'hangar
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP :{BLACK}Lista tutti i treni che hanno questo deposito negli ordini
-STR_DEPOT_VEHICLE_ORDER_LIST_ROADVEH_TIP :{BLACK}Lista tutti i veicoli stradali che hanno questo deposito negli ordini
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP :{BLACK}Lista tutte le navi che hanno questo deposito negli ordini
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP :{BLACK}Lista tutti gli aerei che usano gli hangar di questo aeroporto negli ordini
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP :{BLACK}Elenca tutti i treni che hanno questo deposito nei loro ordini
+STR_DEPOT_VEHICLE_ORDER_LIST_ROADVEH_TIP :{BLACK}Elenca tutti gli automezzi che hanno questo deposito nei loro ordini
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP :{BLACK}Elenca tutte le navi che hanno questo deposito nei loro ordini
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP :{BLACK}Elenca tutti gli aeromobili che hanno un hangar di questo aeroporto nei loro ordini
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP :{BLACK}Sostituisci automaticamente tutti i treni nel deposito
-STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Sostituisci automaticamente tutti i veicoli nel deposito
-STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Sostituisci automaticamente tutte le navi nel deposito
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Sostituisci automaticamente tutti gli aerei nell'hangar
+STR_DEPOT_AUTOREPLACE_TRAIN_TIP :{BLACK}Rimpiazza automaticamente tutti i treni nel deposito
+STR_DEPOT_AUTOREPLACE_ROADVEH_TIP :{BLACK}Rimpiazza automaticamente gli automezzi nel deposito
+STR_DEPOT_AUTOREPLACE_SHIP_TIP :{BLACK}Rimpiazza automaticamente tutte le navi nel deposito
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP :{BLACK}Rimpiazza automaticamente tutti gli aeromobili nell'hangar
-STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} Tren{P o i}
-STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} Veicol{P o i} stradal{P e i}
-STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} Nav{P e i}
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Aere{P o i}
+STR_VEHICLE_LIST_TRAIN_DEPOT :{BLACK}{STRING} - {COMMA} tren{P o i}
+STR_VEHICLE_LIST_ROADVEH_DEPOT :{BLACK}{STRING} - {COMMA} automezz{P o i}
+STR_VEHICLE_LIST_SHIP_DEPOT :{BLACK}{STRING} - {COMMA} nav{P e i}
+STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} aeromobil{P e i}
STR_REPLACE_VEHICLES_WHITE :{WHITE}Rimpiazza {STRING}
-STR_REPLACE_VEHICLES_START :{BLACK}Inizia Rimpiazzo Veicoli
-STR_REPLACE_VEHICLES_STOP :{BLACK}Finisci Rimpiazzo Veicoli
+STR_REPLACE_VEHICLES_START :{BLACK}Inizia rimpiazzamento
+STR_REPLACE_VEHICLES_STOP :{BLACK}Interrompi rimpiazzamento
STR_NOT_REPLACING :{BLACK}Nessun rimpiazzo
STR_NOT_REPLACING_VEHICLE_SELECTED :{BLACK}Nessun veicolo selezionato
-STR_REPLACE_HELP_LEFT_ARRAY :{BLACK}Seleziona il tipo di locomotiva da rimpiazzare
-STR_REPLACE_HELP_RIGHT_ARRAY :{BLACK}Seleziona quale locomotiva usare al posto di quella selezionata a sinistra
-STR_REPLACE_HELP_STOP_BUTTON :{BLACK}Premi per fermare il rimpiazzo delle locomotive del tipo selezionato a sinistra
-STR_REPLACE_HELP_START_BUTTON :{BLACK}Premi per iniziare il rimpiazzo delle locomotive del tipo selezionato a sinistra con quello selezionato a destra
-STR_REPLACE_HELP_RAILTYPE :{BLACK}Seleziona il tipo di binario per la quale vuoi rimpiazzare le locomotive
-STR_REPLACE_HELP_REPLACE_INFO_TAB :{BLACK}Mostra con quale locomotore verrà rimpiazzato il tipo selezionato a sinistra, se disponibile
-STR_REPLACE_HELP :{BLACK}Permette di rimpiazzare un locomotore con uno di un altro tipo, quando i treni con quel locomotore entrano in un deposito
+STR_REPLACE_HELP_LEFT_ARRAY :{BLACK}Selezionare il tipo di locomotiva da rimpiazzare
+STR_REPLACE_HELP_RIGHT_ARRAY :{BLACK}Selezionare il nuovo modello di locomotiva che si desidera usare al posto di quello selezionato a sinistra
+STR_REPLACE_HELP_STOP_BUTTON :{BLACK}Premere per interrompere il rimpiazzamento del modello di locomotiva selezionato a sinistra
+STR_REPLACE_HELP_START_BUTTON :{BLACK}Premere per iniziare il rimpiazzamento del modello di locomotiva selezionato a sinistra con quello selezionato a destra
+STR_REPLACE_HELP_RAILTYPE :{BLACK}Selezionare il tipo di rotaia per la quale si desidera rimpiazzare le locomotive
+STR_REPLACE_HELP_REPLACE_INFO_TAB :{BLACK}Mostra con quale locomotiva sarà rimpiazzato il modello eventualmente selezionato a sinistra
+STR_REPLACE_HELP :{BLACK}Questa funzione permette di rimpiazzare un tipo di locomotiva con un altro, quando treni che usano il vecchio tipo entrano in un deposito
STR_REPLACE_REMOVE_WAGON :{BLACK}Rimozione vagoni: {ORANGE}{SKIP}{STRING}
-STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}La autosostituzione mantiene la lunghezza del treno togliendo vagoni (iniziando dalla testa), se la sostituzione della locomotiva lo farebbe piu lungo.
-STR_REPLACE_ENGINE_WAGON_SELECT :{BLACK}Sostituzione: {ORANGE}{SKIP}{SKIP}{STRING}
-STR_REPLACE_ENGINE_WAGON_SELECT_HELP :{BLACK} FEATURE SPERIMENTALE {}Scambia tra loro le finestre di sostituizione locomotive e vagoni. {}La sostituizione del vagone avverrà solo se il nuovo vagone può essere convertito nello stesso tipo di merce del vecchio vagone. Questo controllo viene fatto per ogni vagone sostituito.
+STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Fa sì che il rimpiazzamento automatico mantenga costante la lunghezza dei treni rimuovendo vagoni (iniziando dalla testa) nel caso in cui la sostituzione della locomotiva rendesse il treno più lungo
+STR_REPLACE_ENGINE_WAGON_SELECT :{BLACK}Rimpiazza: {ORANGE}{SKIP}{SKIP}{STRING}
+STR_REPLACE_ENGINE_WAGON_SELECT_HELP :{BLACK} FUNZIONALITÀ SPERIMENTALE {}Scambia tra loro le finestre di rimpiazzamento delle locomotive e dei vagoni. {}Il rimpiazzamento del vagone avverrà solo se il nuovo vagone può essere riadattato per il trasporto dello stesso tipo di carico di quello vecchio. Questo controllo viene eseguito per ogni vagone al momento della sostituzione.
STR_RAIL_VEHICLE_NOT_AVAILABLE :{WHITE}Il veicolo non è disponibile
STR_ROAD_VEHICLE_NOT_AVAILABLE :{WHITE}L'automezzo non è disponibile
STR_SHIP_NOT_AVAILABLE :{WHITE}La nave non è disponibile
@@ -3042,30 +3030,30 @@
STR_ENGINES :Locomotive
STR_WAGONS :Vagoni
-STR_MASS_STOP_DEPOT_TRAIN_TIP :{BLACK}Clicca per fermare tutti i treni dentro il deposito
-STR_MASS_STOP_DEPOT_ROADVEH_TIP :{BLACK}Clicca per fermare tutti i veicoli stradali dentro il deposito
-STR_MASS_STOP_DEPOT_SHIP_TIP :{BLACK}Clicca per fermare tutte le navi dentro il deposito
-STR_MASS_STOP_HANGAR_TIP :{BLACK}Clicca per fermare tutti gli aerei dentro l'hangar
+STR_MASS_STOP_DEPOT_TRAIN_TIP :{BLACK}Fare clic per fermare tutti i treni nel deposito
+STR_MASS_STOP_DEPOT_ROADVEH_TIP :{BLACK}Fare clic per fermare tutti gli automezzi nel deposito
+STR_MASS_STOP_DEPOT_SHIP_TIP :{BLACK}Fare clic per fermare tutte le navi nel deposito
+STR_MASS_STOP_HANGAR_TIP :{BLACK}Fare clic per fermare tutti gli aeromobili nell'hangar
-STR_MASS_START_DEPOT_TRAIN_TIP :{BLACK}Clicca per avviare tutti i treni dentro il deposito
-STR_MASS_START_DEPOT_ROADVEH_TIP :{BLACK}Clicca per avviare tutti i veicoli stradali dentro il deposito
-STR_MASS_START_DEPOT_SHIP_TIP :{BLACK}Clicca per avviare tutte le navi dentro il deposito
-STR_MASS_START_HANGAR_TIP :{BLACK}Clicca per avviare tutti gli aerei dentro l'hangar
+STR_MASS_START_DEPOT_TRAIN_TIP :{BLACK}Fare clic per avviare tutti i treni nel deposito
+STR_MASS_START_DEPOT_ROADVEH_TIP :{BLACK}Fare clic per avviare tutti gli automezzi nel deposito
+STR_MASS_START_DEPOT_SHIP_TIP :{BLACK}Fare clic per avviare tutte le navi nel deposito
+STR_MASS_START_HANGAR_TIP :{BLACK}Fare clic per avviare tutti gli aeromobili nell'hangar
-STR_MASS_STOP_LIST_TIP :{BLACK}Clicca per fermare tutti i veicoli nella lista
-STR_MASS_START_LIST_TIP :{BLACK}Clicca per far partire i veicoli nella lista
+STR_MASS_STOP_LIST_TIP :{BLACK}Fare clic per fermare tutti i veicoli nell'elenco
+STR_MASS_START_LIST_TIP :{BLACK}Fare clic per avviare tutti i veicoli nell'elenco
STR_SHORT_DATE :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION :{WHITE}Lista dei Cartelli - {COMMA} Cartell{P o i}
+STR_SIGN_LIST_CAPTION :{WHITE}Elenco cartelli - {COMMA} cartell{P o i}
-STR_ORDER_REFIT_FAILED :{WHITE}Ordine fermato per modifica fallita {STRING} {COMMA}
+STR_ORDER_REFIT_FAILED :{WHITE}{STRING} {COMMA} fermato causa riadattamento fallito
############ Lists rail types
-STR_RAIL_VEHICLES :Veicoli Ferroviari
-STR_ELRAIL_VEHICLES :Veicoli Ferrovie Elettrificate
-STR_MONORAIL_VEHICLES :Veicoli Monorotaia
-STR_MAGLEV_VEHICLES :Veicoli Maglev
+STR_RAIL_VEHICLES :Veicoli ferroviari
+STR_ELRAIL_VEHICLES :Veicoli ferroviari elettrici
+STR_MONORAIL_VEHICLES :Veicoli monorotaia
+STR_MAGLEV_VEHICLES :Veicoli maglev
############ End of list of rail types
@@ -3074,71 +3062,71 @@
STR_PURCHASE_INFO_COST_WEIGHT :{BLACK}Costo: {GOLD}{CURRENCY}{BLACK} Peso: {GOLD}{WEIGHT_S}
STR_PURCHASE_INFO_SPEED_POWER :{BLACK}Velocità : {GOLD}{VELOCITY}{BLACK} Potenza: {GOLD}{POWER}
STR_PURCHASE_INFO_SPEED :{BLACK}Velocità : {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_RUNNINGCOST :{BLACK}Costi d'esercizio: {GOLD}{CURRENCY}/anno
-STR_PURCHASE_INFO_CAPACITY :{BLACK}Capienza: {GOLD}{CARGO} {STRING}
+STR_PURCHASE_INFO_RUNNINGCOST :{BLACK}Costo d'esercizio: {GOLD}{CURRENCY}/anno
+STR_PURCHASE_INFO_CAPACITY :{BLACK}Capacità : {GOLD}{CARGO} {STRING}
STR_PURCHASE_INFO_DESIGNED_LIFE :{BLACK}Progettato nel: {GOLD}{NUM}{BLACK} Vita: {GOLD}{COMMA} anni
-STR_PURCHASE_INFO_RELIABILITY :{BLACK}Max. Affidabilità : {GOLD}{COMMA}%
+STR_PURCHASE_INFO_RELIABILITY :{BLACK}Affidabilità massima: {GOLD}{COMMA}%
STR_PURCHASE_INFO_COST :{BLACK}Costo: {GOLD}{CURRENCY}
STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Peso: {GOLD}{WEIGHT_S} ({WEIGHT_S})
STR_PURCHASE_INFO_COST_SPEED :{BLACK}Costo: {GOLD}{CURRENCY}{BLACK} Velocità : {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Capienza: {GOLD}{COMMA} passeggeri, {COMMA} sacchi postali
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Potenza Vagone: {GOLD}+{POWER}{BLACK} Peso: {GOLD}+{WEIGHT_S}
-STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Modificabile a: {GOLD}
-STR_PURCHASE_INFO_ALL_TYPES :Tutti i tipi di merci
-STR_PURCHASE_INFO_ALL_BUT :Tutti meno {GOLD}
-STR_PURCHASE_INFO_MAX_TE :{BLACK}Sforzo Trazione Max: {GOLD}{FORCE}
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}Capacità : {GOLD}{COMMA} passeggeri, {COMMA} sacchi postali
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}Vagoni alimentati: {GOLD}+{POWER}{BLACK} Peso: {GOLD}+{WEIGHT_S}
+STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Riadattabile per: {GOLD}
+STR_PURCHASE_INFO_ALL_TYPES :Tutti i tipi di carico
+STR_PURCHASE_INFO_ALL_BUT :Tutto tranne {GOLD}
+STR_PURCHASE_INFO_MAX_TE :{BLACK}Trazione massima: {GOLD}{FORCE}
########### String for New Landscape Generator
STR_GENERATE :{WHITE}Genera
-STR_RANDOM :{BLACK}Randomizza
-STR_RANDOM_HELP :{BLACK}Cambia il seme casuale usato per la generazione del terreno.
+STR_RANDOM :{BLACK}Scegli a caso
+STR_RANDOM_HELP :{BLACK}Cambia il seme casuale usato per la generazione del terreno
STR_WORLD_GENERATION_CAPTION :{WHITE}Generazione mondo
-STR_RANDOM_SEED :{BLACK}Seme Casuale:
-STR_RANDOM_SEED_HELP :{BLACK}Clicca per inserire un seme casuale
+STR_RANDOM_SEED :{BLACK}Seme casuale:
+STR_RANDOM_SEED_HELP :{BLACK}Fare clic per introdurre un seme casuale
STR_LAND_GENERATOR :{BLACK}Generatore terreno:
STR_TREE_PLACER :{BLACK}Algoritmo alberi:
-STR_HEIGHTMAP_ROTATION :{BLACK}Rotazione Heightmap:
-STR_TERRAIN_TYPE :{BLACK}Tipo terreno:
-STR_QUANTITY_OF_SEA_LAKES :{BLACK}Livello mare:
+STR_HEIGHTMAP_ROTATION :{BLACK}Rotazione heightmap:
+STR_TERRAIN_TYPE :{BLACK}Tipo di terreno:
+STR_QUANTITY_OF_SEA_LAKES :{BLACK}Livello del mare:
STR_SMOOTHNESS :{BLACK}Levigatezza:
-STR_SNOW_LINE_HEIGHT :{BLACK}Altezza nevi perenni:
+STR_SNOW_LINE_HEIGHT :{BLACK}Altezza nevi:
STR_DATE :{BLACK}Data:
-STR_NUMBER_OF_TOWNS :{BLACK}Num. di città :
-STR_NUMBER_OF_INDUSTRIES :{BLACK}Num. di industrie:
+STR_NUMBER_OF_TOWNS :{BLACK}Numero città :
+STR_NUMBER_OF_INDUSTRIES :{BLACK}Numero industrie:
STR_GENERATE_DATE :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP :{BLACK}Sposta su di uno l'altezza delle nevi perenni
-STR_SNOW_LINE_DOWN :{BLACK}Sposta giù di uno l'altezza delle nevi perenni
+STR_SNOW_LINE_UP :{BLACK}Sposta in su di uno l'altezza delle nevi perenni
+STR_SNOW_LINE_DOWN :{BLACK}Sposta in giù di uno l'altezza delle nevi perenni
STR_SNOW_LINE_QUERY_CAPT :{WHITE}Cambia l'altezza delle nevi perenni
-STR_START_DATE_QUERY_CAPT :{WHITE}Cambia l'anno di partenza
+STR_START_DATE_QUERY_CAPT :{WHITE}Cambia l'anno di inizio
STR_HEIGHTMAP_SCALE_WARNING_CAPTION :{WHITE}Avviso scala
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE :{YELLOW}Ridimensionare di molto la mappa sorgente non è consigliabile. Continuo con la generazione?
+STR_HEIGHTMAP_SCALE_WARNING_MESSAGE :{YELLOW}Ridimensionare di molto l'heightmap sorgente non è consigliabile. Continuare con la generazione?
STR_SNOW_LINE_HEIGHT_NUM :{NUM}
-STR_HEIGHTMAP_NAME :{BLACK}Nome Heightmap:
+STR_HEIGHTMAP_NAME :{BLACK}Nome heightmap:
STR_HEIGHTMAP_SIZE :{BLACK}Dim.: {ORANGE}{NUM} x {NUM}
-STR_GENERATION_WORLD :{WHITE}Generazione del mondo..
-STR_GENERATION_ABORT :{BLACK}Abortisci
-STR_GENERATION_ABORT_CAPTION :{WHITE}Abortisci Generazione Mondo
-STR_GENERATION_ABORT_MESSAGE :{YELLOW}Vuoi veramente abortire la generazione?
-STR_PROGRESS :{WHITE}{NUM}% completo
+STR_GENERATION_WORLD :{WHITE}Generazione del mondo...
+STR_GENERATION_ABORT :{BLACK}Interrompi
+STR_GENERATION_ABORT_CAPTION :{WHITE}Interromi generazione mondo
+STR_GENERATION_ABORT_MESSAGE :{YELLOW}Si è sicuri di voler interrompere la generazione?
+STR_PROGRESS :{WHITE}{NUM}% completato
STR_GENERATION_PROGRESS :{BLACK}{NUM} / {NUM}
STR_WORLD_GENERATION :{BLACK}Generazione mondo
STR_TREE_GENERATION :{BLACK}Generazione alberi
-STR_UNMOVABLE_GENERATION :{BLACK}Generazione oggetti non spostabili
-STR_CLEARING_TILES :{BLACK}Generazione aree brulle e rocciose
-STR_SETTINGUP_GAME :{BLACK}Settaggio del gioco
-STR_PREPARING_TILELOOP :{BLACK}Loop generazione tile del terreno
-STR_PREPARING_GAME :{BLACK}Preparazione del gioco
-STR_DIFFICULTY_TO_CUSTOM :{WHITE}Questa azione cambia il livello di difficolta a custom
-STR_SE_FLAT_WORLD :{WHITE}Terreno piatto
-STR_SE_FLAT_WORLD_TIP :{BLACK}Genera un terreno piatto
-STR_SE_RANDOM_LAND :{WHITE}Terreno casuale
+STR_UNMOVABLE_GENERATION :{BLACK}Generazione oggetti inamovibili
+STR_CLEARING_TILES :{BLACK}Generazione di aree brulle e rocciose
+STR_SETTINGUP_GAME :{BLACK}Impostazione partita
+STR_PREPARING_TILELOOP :{BLACK}Ciclo generazione riquadri del terreno
+STR_PREPARING_GAME :{BLACK}Preparazione della partita
+STR_DIFFICULTY_TO_CUSTOM :{WHITE}Questa azione ha cambiato il livello di difficolta in 'Personalizzata'
+STR_SE_FLAT_WORLD :{WHITE}Pianeggiante
+STR_SE_FLAT_WORLD_TIP :{BLACK}Genera un terreno pianeggiante
+STR_SE_RANDOM_LAND :{WHITE}Casuale
STR_SE_NEW_WORLD :{BLACK}Crea nuovo scenario
-STR_SE_CAPTION :{WHITE}Tipo Scenario
-STR_FLAT_WORLD_HEIGHT_DOWN :{BLACK}Sposta giù di uno l'altezza del terreno
-STR_FLAT_WORLD_HEIGHT_UP :{BLACK}Sposta su di uno l'altezza del terreno
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT :{WHITE}Cambia l'altezza del terreno
-STR_FLAT_WORLD_HEIGHT :{BLACK}Altezza del terreno:
+STR_SE_CAPTION :{WHITE}Tipo di scenario
+STR_FLAT_WORLD_HEIGHT_DOWN :{BLACK}Sposta in giù di uno l'altezza del terreno pianeggiante
+STR_FLAT_WORLD_HEIGHT_UP :{BLACK}Sposta in su di uno l'altezza del terreno pianeggiante
+STR_FLAT_WORLD_HEIGHT_QUERY_CAPT :{WHITE}Cambia l'altezza del terreno pianeggiante
+STR_FLAT_WORLD_HEIGHT :{BLACK}Altezza terreno pianeggiante:
STR_FLAT_WORLD_HEIGHT_NUM :{NUM}
STR_SMALLMAP_CENTER :{BLACK}Centra la minimappa sulla posizione corrente
@@ -3156,7 +3144,7 @@
STR_SMALL_AIRPORTS :{BLACK}Aeroporti piccoli
STR_LARGE_AIRPORTS :{BLACK}Aeroporti grandi
-STR_HUB_AIRPORTS :{BLACK}Aeroporti Hub
+STR_HUB_AIRPORTS :{BLACK}Hub aeroportuali
STR_HELIPORTS :{BLACK}Eliporti
############ Tooltip measurment
@@ -3173,7 +3161,7 @@
########
-STR_FEEDER_CARGO_VALUE :{BLACK}Crediti Trasferiti: {LTBLUE}{CURRENCY}
+STR_FEEDER_CARGO_VALUE :{BLACK}Crediti di trasferimento: {LTBLUE}{CURRENCY}
STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...questa è una strada di proprietà della cittÃ
STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...strada rivolta nella direzione sbagliata
--- a/src/lang/japanese.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/japanese.txt Wed Jun 13 11:00:24 2007 +0000
@@ -802,7 +802,7 @@
STR_02DE_MAP_OF_WORLD :世界ã®åœ°å›³
STR_EXTRA_VIEW_PORT :特別ビューア
STR_SIGN_LIST :標示ã®ãƒªã‚¹ãƒˆ
-STR_TRANSPARENCY_OPTIONS :é€æ˜Žæ€§ã®è¨å®š
+STR_TRANSPARENCY_OPTIONS :åŠé€æ˜Žè¨å®š
STR_02DF_TOWN_DIRECTORY :市町æ‘ã®ãƒªã‚¹ãƒˆ
STR_TOWN_POPULATION :{BLACK}世界人å£ï¼š{COMMA}人
STR_EXTRA_VIEW_PORT_TITLE :{WHITE}ビューア {COMMA}
@@ -2914,6 +2914,7 @@
STR_NEWGRF_ERROR_INVALID_PARAMETER :{STRING}ã®ãƒ‘ラメータãŒä¸æ£ï¼šãƒ‘ラメータ　{STRING}（{NUM}）
STR_NEWGRF_ERROR_LOAD_BEFORE :{1:STRING}ã‚’èªã¿è¾¼ã‚€å‰ã€{0:STRING}ã‚’èªã¿è¾¼ã¾ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。
STR_NEWGRF_ERROR_LOAD_AFTER :{STRING}ã¯{STRING}ã®èªã¿è¾¼ã¿å¾Œã®ã¿ã«èªã¿è¾¼ã‚ã¾ã™ã€‚
+STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE :訳ã—ã«ãƒ‡ã‚¶ã‚¤ãƒ³ã•ã‚ŒãŸGRFファイル
STR_NEWGRF_ADD :{BLACK}追åŠ
STR_NEWGRF_ADD_TIP :{BLACK}NewGRFファイルをリストã«è¿½åŠ ã—ã¾ã™
@@ -3011,6 +3012,10 @@
STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}自動交æ›ã«ã‚ˆã£ã¦åˆ—車ã®é•·ã•ãŒé•·ããªã‚‹å ´åˆã¯ã€åˆ—車ã®é•·ã•ã‚’ä¿å®ˆã™ã‚‹ã«ã¯å®¢è»Šï¼è²¨è»Šã‚’å–り除ãã“ã¨ãŒã§ãã¾ã™ã€‚列車ã®å…ˆé ã‹ã‚‰é–‹å§‹ã—ã¾ã™ã€‚
STR_REPLACE_ENGINE_WAGON_SELECT :{BLACK}交æ›ï¼š{ORANGE}{SKIP}{SKIP}{STRING}
STR_REPLACE_ENGINE_WAGON_SELECT_HELP :{BLACK}実験的機能{}機関車ï¼è²¨è»Šã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«åˆ‡ã‚Šæ›¿ãˆã¾ã™ã€‚{}貨車交æ›ã¯æ–°è²¨è»ŠãŒæ—§è²¨è»Šã¨åŒæ§˜ã®è²¨ç‰©ç¨®é¡žã«å†è£…å‚™ã§ãã‚‹ã¨ãã®ã¿ã«è¡Œã„ã¾ã™ã€‚自動交æ›ä¸ã«å„貨車を検査ã—ã¾ã™ã€‚
+STR_RAIL_VEHICLE_NOT_AVAILABLE :{WHITE}車を買ãˆã¾ã›ã‚“
+STR_ROAD_VEHICLE_NOT_AVAILABLE :{WHITE}車を買ãˆã¾ã›ã‚“
+STR_SHIP_NOT_AVAILABLE :{WHITE}船を買ãˆã¾ã›ã‚“
+STR_AIRCRAFT_NOT_AVAILABLE :{WHITE}飛行機を買ãˆã¾ã›ã‚“
STR_ENGINES :機関車
STR_WAGONS :貨車
@@ -3146,11 +3151,12 @@
########
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...町有ã®é“è·¯ã ã‹ã‚‰ã§ã™
-STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...é“è·¯ã®é…ç½®ã«åˆã‚ã›ã¾ã›ã‚“
+STR_FEEDER_CARGO_VALUE :{BLACK}振り替ãˆã‚¯ãƒ¬ã‚¸ãƒƒãƒˆ: {LTBLUE}{CURRENCY}
+STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...ã“ã‚Œã¯ç”ºã®é“ã§ã™ã€‚
+STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...é“ã®æ–¹å‘ã¯é•ã„ã§ã™ã€‚
-STR_TRANSPARENCY_TOOLB :{WHITE}é€æ˜Žæ€§ã®è¨å®š
-STR_TRANSPARENT_SIGNS_DESC :{BLACK}駅åã®é€æ˜Žæ€§ã‚’å…¥ï¼åˆ‡
+STR_TRANSPARENCY_TOOLB :{WHITE}åŠé€æ˜Žè¨å®š
+STR_TRANSPARENT_SIGNS_DESC :{BLACK} 駅ã®ã‚µã‚¤ãƒ³ã«ã¯åŠé€æ˜Žã‚’スイッãƒ
STR_TRANSPARENT_TREES_DESC :{BLACK}木ã®é€æ˜Žæ€§ã‚’å…¥ï¼åˆ‡
STR_TRANSPARENT_HOUSES_DESC :{BLACK}市町æ‘ã®å»ºç‰©ã®é€æ˜Žæ€§ã‚’å…¥ï¼åˆ‡
STR_TRANSPARENT_INDUSTRIES_DESC :{BLACK}å·¥æ¥ã®é€æ˜Žæ€§ã‚’å…¥ï¼åˆ‡
--- a/src/lang/korean.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/korean.txt Wed Jun 13 11:00:24 2007 +0000
@@ -752,6 +752,7 @@
STR_02A1_SMALL :{BLACK}소형
STR_02A2_MEDIUM :{BLACK}중형
STR_02A3_LARGE :{BLACK}대형
+STR_SCENARIO_EDITOR_CITY :{BLACK}ë„ì‹œ
STR_02A4_SELECT_TOWN_SIZE :{BLACK}ë„ì‹œ í¬ê¸° ì„ íƒ
STR_02A5_TOWN_SIZE :{YELLOW}ë„ì‹œ í¬ê¸°:
@@ -1136,6 +1137,15 @@
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :오른쪽
STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}윈ë„ìš° ìžë™ ê²°í•©(ê°€ê¹Œì´ ì˜®ê¸°ë©´ ìžì„처럼 붙는 기능) : {ORANGE}{STRING} 픽셀
STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}윈ë„ìš° ìžë™ ê²°í•© : {ORANGE}사용불가
+STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}ë§ˆì„ ì„±ìž¥ ì†ë„: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :ì—†ìŒ
+STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :ëŠë¦¼
+STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :보통
+STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :ë¹ ë¦„
+STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :매우 ë¹ ë¦„
+STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}2ë°° ë¹ ë¥´ê²Œ 성장하는 마ì„ì˜ ë¹„ìœ¨: {ORANGE}1 대 {STRING}
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}2ë°° ë¹ ë¥´ê²Œ 성장하는 마ì„ì˜ ë¹„ìœ¨: {ORANGE}ì—†ìŒ
+STR_CONFIG_PATCHES_CITY_SIZE_MULTIPLIER :{LTBLUE}ì´ˆê¸°ì˜ ë„ì‹œ í¬ê¸° 배수: {ORANGE}{STRING}
STR_CONFIG_PATCHES_GUI :{BLACK}ì¸í„°íŽ˜ì´ìŠ¤
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}건설
--- a/src/lang/romanian.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/romanian.txt Wed Jun 13 11:00:24 2007 +0000
@@ -1135,6 +1135,14 @@
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :dreapta
STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Distanta de 'snap' pentru ferestre: {ORANGE}{STRING} px
STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}Distanta de 'snap' pentru ferestre: {ORANGE}dezactivata
+STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}Viteza de dezvoltare a orasului: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :Deloc
+STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :Lenta
+STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :Normala
+STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :Rapida
+STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :Foarte rapida
+STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}Proportia oraselor care se vor dezvolta de doua ori mai repede: {ORANGE}1 in {STRING}
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}Proportia oraselor care se vor dezvolta de doua ori mai repede: {ORANGE}None
STR_CONFIG_PATCHES_GUI :{BLACK}Interfatã
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}Constructie
--- a/src/lang/russian.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/russian.txt Wed Jun 13 11:00:24 2007 +0000
@@ -1137,6 +1137,14 @@
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :Ñправа
STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Ð Ð°Ð´Ð¸ÑƒÑ Ð¿Ñ€Ð¸Ð»Ð¸Ð¿Ð°Ð½Ð¸Ñ Ð¾ÐºÐ¾Ð½: {ORANGE}{STRING}
STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}Ð Ð°Ð´Ð¸ÑƒÑ Ð¿Ñ€Ð¸Ð»Ð¸Ð¿Ð°Ð½Ð¸Ñ Ð¾ÐºÐ¾Ð½: {ORANGE}отключено
+STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}СкороÑÑ‚ÑŒ роÑта городов: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :нет
+STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :медленнаÑ
+STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :обычнаÑ
+STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :быÑтраÑ
+STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :очень быÑтраÑ
+STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}Соотношение городов, которые раÑтут вдвое быÑтрее: {ORANGE}1 из {STRING}
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}Соотношение городов, которые раÑтут вдвое быÑтрее: {ORANGE}Выкл.
STR_CONFIG_PATCHES_GUI :{BLACK}ИнтерфейÑ
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}СтроительÑтво
--- a/src/lang/slovak.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/slovak.txt Wed Jun 13 11:00:24 2007 +0000
@@ -1199,6 +1199,14 @@
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :Napravo
STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Vzdialenost pre prichytenie okna: {ORANGE}{STRING} bodov
STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}Vzdialenost pre prichytenie okna: {ORANGE}vypnute
+STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}Rozvoj miest: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :Žiadny
+STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :Pomalý
+STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :Normálny
+STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :Rýchly
+STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :Velmi rýchly
+STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}Pomer miest, ktoré budú rást 2x rýchlejšie: {ORANGE}1 v {STRING}
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}Pomer miest, ktoré budú rást 2x rýchlejšie: {ORANGE}Žiadny
STR_CONFIG_PATCHES_GUI :{BLACK}Rozhranie
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}Vystavba
--- a/src/lang/slovenian.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/slovenian.txt Wed Jun 13 11:00:24 2007 +0000
@@ -1177,6 +1177,14 @@
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :Desno
STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Radij lepljenja oken: {ORANGE}{STRING} px
STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}Radij lepljenja oken: {ORANGE}onemogoÄeno
+STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}Hitrost rasti mesta: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :Brez
+STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :PoÄasi
+STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :Normalno
+STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :Hitro
+STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :Zelo hitro
+STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}Razmerje mest, ki bodo rastla z dvakratno hitrostjo: {ORANGE}1 v {STRING}
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}Razmerje mest, ki bodo rastla z dvakratno hitrostjo: {ORANGE}Brez
STR_CONFIG_PATCHES_GUI :{BLACK}Vmesnik
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}Gradnja
--- a/src/lang/spanish.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/spanish.txt Wed Jun 13 11:00:24 2007 +0000
@@ -1136,6 +1136,14 @@
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :Derecha
STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Radio de snap de ventana: {ORANGE}{STRING} px
STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}Radio de snap de ventana: {ORANGE}desactivado
+STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}Velocidad crecimiento ciudad: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :Ninguna
+STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :Lenta
+STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :Normal
+STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :Rápida
+STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :Muy rápida
+STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}Proporción de ciudades que crecerán el doble de rápido: {ORANGE}1 de {STRING}
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}Proporción de ciudades que crecerán el doble de rápido: {ORANGE}Ninguna
STR_CONFIG_PATCHES_GUI :{BLACK}Interfaz
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}Construcción
--- a/src/lang/swedish.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/swedish.txt Wed Jun 13 11:00:24 2007 +0000
@@ -751,6 +751,7 @@
STR_02A1_SMALL :{BLACK}Liten
STR_02A2_MEDIUM :{BLACK}Mellan
STR_02A3_LARGE :{BLACK}Stor
+STR_SCENARIO_EDITOR_CITY :{BLACK}Stad
STR_02A4_SELECT_TOWN_SIZE :{BLACK}Välj stadsstorlek
STR_02A5_TOWN_SIZE :{YELLOW}Stadsstorlek:
@@ -802,6 +803,7 @@
STR_02DE_MAP_OF_WORLD :Världskarta
STR_EXTRA_VIEW_PORT :Nytt vyfönster
STR_SIGN_LIST :Skyltlista
+STR_TRANSPARENCY_OPTIONS :Genomskinlighetsinställningar
STR_02DF_TOWN_DIRECTORY :Stadslista
STR_TOWN_POPULATION :{BLACK}Världsbefolkning: {COMMA}
STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Vyfönster {COMMA}
@@ -1134,6 +1136,15 @@
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :Höger
STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Fönstersnäppsradie: {ORANGE}{STRING} px
STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}Fönstersnäppsradie: {ORANGE}avaktiverad
+STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}Stadens tillväxthastighet: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :Ingen
+STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :LÃ¥ngsamt
+STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :Normalt
+STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :Snabbt
+STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :Väldigt snabbt
+STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}Andel av städerna som kommer växa dubbelt så fort: {ORANGE}1 av {STRING}
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}Andel av städerna som kommer växa dubbelt så fort: {ORANGE}Inga
+STR_CONFIG_PATCHES_CITY_SIZE_MULTIPLIER :{LTBLUE}Initial stadsstorleks multiplikator: {ORANGE}{STRING}
STR_CONFIG_PATCHES_GUI :{BLACK}Gränssnitt
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}Konstruktion
@@ -1678,7 +1689,7 @@
STR_204D_INITIATE_A_SMALL_LOCAL :{WHITE}{STRING}{}{YELLOW} Starta en liten lokal reklamkampanj, för att attrahera fler passagerare och gods till dina tranporttjänster.{} Kostnad: {CURRENCY}
STR_204E_INITIATE_A_MEDIUM_LOCAL :{WHITE}{STRING}{}{YELLOW} Starta en mellanstor lokal reklamkampanj, för att attrahera fler passagerare och gods till dina tranporttjänster.{} Kostnad: {CURRENCY}
STR_204F_INITIATE_A_LARGE_LOCAL :{WHITE}{STRING}{}{YELLOW} Starta en stor lokal reklamkampanj, för att attrahera fler passagerare och gods till dina tranporttjänster.{} Kostnad: {CURRENCY}
-STR_2050_FUND_THE_RECONSTRUCTION :{WHITE}{STRING}{}{YELLOW} Bekosta ombyggnad av stadens vägnätverk. Orsakar ansenlig splittring för vägtrafik upp till 6 månader.{} Kostnad: {CURRENCY}
+STR_2050_FUND_THE_RECONSTRUCTION :{WHITE}{STRING}{}{YELLOW} Bekosta ombyggnad av stadens vägnätverk. Orsakar ansenliga störningar för vägtrafik i upp till 6 månader.{} Kostnad: {CURRENCY}
STR_2051_BUILD_A_STATUE_IN_HONOR :{WHITE}{STRING}{}{YELLOW} Bygg en staty i ditt företags ära.{} Kostnad: {CURRENCY}
STR_2052_FUND_THE_CONSTRUCTION_OF :{WHITE}{STRING}{}{YELLOW} Bekosta uppbyggnad av nya kommersiella byggnader i staden.{} Kostnad: {CURRENCY}
STR_2053_BUY_1_YEAR_S_EXCLUSIVE :{WHITE}{STRING}{}{YELLOW} Köp 1 års exklusiv transporträttighet i staden. Stadens myndigheter kommer bara tillåta passagerare och gods till användning för ditt företags stationer.{} Kostnad: {CURRENCY}
@@ -3011,6 +3022,10 @@
STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Gör så att automatiskt utbytning behåller ett tågs längd genom att ta bort vagnar (med början längst fram) om utbytandet av loket skulle göra tåget längre.
STR_REPLACE_ENGINE_WAGON_SELECT :{BLACK}Ersätter: {ORANGE}{SKIP}{SKIP}{STRING}
STR_REPLACE_ENGINE_WAGON_SELECT_HELP :{BLACK} EXPERIMENTIELL FEATURE {}Välj mellan lok och vagn ersättnings-fönster.{}Vagns-ersättning kommer endast ske om den nya vagnen kan bli omrustad till att bära samma typ av last som den gamla. Detta kollas för varje vagn när den faktiska ersättningen sker
+STR_RAIL_VEHICLE_NOT_AVAILABLE :{WHITE}Fordonet är ej tillgängligt
+STR_ROAD_VEHICLE_NOT_AVAILABLE :{WHITE}Fordonet är ej tillgängligt
+STR_SHIP_NOT_AVAILABLE :{WHITE}Fartyget är ej tillgängligt
+STR_AIRCRAFT_NOT_AVAILABLE :{WHITE}Flygplanet är ej tillgängligt
STR_ENGINES :Lok
STR_WAGONS :Vagnar
@@ -3147,3 +3162,14 @@
########
STR_FEEDER_CARGO_VALUE :{BLACK}Överföringingskredit: {LTBLUE}{CURRENCY}
+STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...detta är en stadsägd väg
+STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...vägen pekar i fel riktning
+
+STR_TRANSPARENCY_TOOLB :{WHITE}Genomskinlighetsinställningar
+STR_TRANSPARENT_SIGNS_DESC :{BLACK}Växla genomskinlighet för stationsskyltar
+STR_TRANSPARENT_TREES_DESC :{BLACK}Växla genomskinlighet för träd
+STR_TRANSPARENT_HOUSES_DESC :{BLACK}Växla genomskinlighet för byggnader
+STR_TRANSPARENT_INDUSTRIES_DESC :{BLACK}Växla genomskinlighet för industrier
+STR_TRANSPARENT_BUILDINGS_DESC :{BLACK}Växla genomskinlighet för byggnader såsom stationer, depåer, riktmärken eller kedjelinje
+STR_TRANSPARENT_BRIDGES_DESC :{BLACK}Växla genomskinlighet för industrier
+STR_TRANSPARENT_STRUCTURES_DESC :{BLACK}Växla genomskinlighet för byggnader såsom fyrar och antenner, kanske i framtiden även ögongodis
--- a/src/lang/traditional_chinese.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/traditional_chinese.txt Wed Jun 13 11:00:24 2007 +0000
@@ -12,12 +12,12 @@
STR_0005 :{RED}{CURRENCY64}
STR_EMPTY :
STR_0007_FLAT_LAND_REQUIRED :{WHITE}需è¦å¹³åœ°
-STR_0008_WAITING :{BLACK}ç‰å€™: {WHITE}{STRING}
+STR_0008_WAITING :{BLACK}ç‰å€™ï¼š{WHITE}{STRING}
STR_0009 :{WHITE}{CARGO}
STR_000A_EN_ROUTE_FROM :{WHITE}{CARGO}{YELLOW} (轉é‹è‡ª
STR_000B :{YELLOW}{STATION})
-STR_000C_ACCEPTS :{BLACK}接å—: {WHITE}
-STR_000D_ACCEPTS :{BLACK}接å—: {GOLD}
+STR_000C_ACCEPTS :{BLACK}接å—：{WHITE}
+STR_000D_ACCEPTS :{BLACK}接å—：{GOLD}
STR_000E :
STR_000F_PASSENGERS :乘客
STR_0010_COAL :ç…¤ç‚
@@ -37,7 +37,7 @@
STR_001E_FOOD :食物
STR_001F_PAPER :ç´™
STR_0020_GOLD :金塊
-STR_0021_WATER :食水
+STR_0021_WATER :飲用水
STR_0022_WHEAT :å°éº¥
STR_0023_RUBBER :æ©¡è†
STR_0024_SUGAR :ç ‚ç³–
@@ -66,10 +66,10 @@
STR_003B_MAIZE :玉蜀é»
STR_003C_FRUIT :水果
STR_003D_DIAMOND :鑽石
-STR_003E_FOOD :食物
+STR_003E_FOOD :食å“
STR_003F_PAPER :紙張
STR_0040_GOLD :金塊
-STR_0041_WATER :食水
+STR_0041_WATER :飲用水
STR_0042_WHEAT :å°éº¥
STR_0043_RUBBER :æ©¡è†
STR_0044_SUGAR :ç ‚ç³–
@@ -225,11 +225,11 @@
STR_0101_PRINTING_WORKS :{BLACK}{TINYFONT}å°åˆ·å»
STR_0102_OIL_WELLS :{BLACK}{TINYFONT}油井
STR_0103_IRON_ORE_MINE :{BLACK}{TINYFONT}éµç¤¦
-STR_0104_STEEL_MILL :{BLACK}{TINYFONT}鋼å»
+STR_0104_STEEL_MILL :{BLACK}{TINYFONT}煉鋼å»
STR_0105_BANK :{BLACK}{TINYFONT}銀行
STR_0106_PAPER_MILL :{BLACK}{TINYFONT}é€ ç´™å»
STR_0107_GOLD_MINE :{BLACK}{TINYFONT}金礦
-STR_0108_FOOD_PROCESSING_PLANT :{BLACK}{TINYFONT}é£Ÿç‰©åŠ å·¥å»
+STR_0108_FOOD_PROCESSING_PLANT :{BLACK}{TINYFONT}食å“åŠ å·¥å»
STR_0109_DIAMOND_MINE :{BLACK}{TINYFONT}鑽石礦
STR_010A_COPPER_ORE_MINE :{BLACK}{TINYFONT}銅礦
STR_010B_FRUIT_PLANTATION :{BLACK}{TINYFONT}水果莊園
@@ -287,9 +287,9 @@
STR_013D_INFORMATION :{BLACK}資訊
STR_013E_CAPACITIES :{BLACK}載é‡
STR_013E_TOTAL_CARGO :{BLACK}總貨物é‡
-STR_013F_CAPACITY :{BLACK}總載é‡: {LTBLUE}{CARGO}
-STR_CAPACITY_MULT :{BLACK}載é‡: {LTBLUE}{CARGO} (x{NUM})
-STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}æ¤åˆ—車的總載é‡:
+STR_013F_CAPACITY :{BLACK}載é‡ï¼š{LTBLUE}{CARGO}
+STR_CAPACITY_MULT :{BLACK}載é‡ï¼š{LTBLUE}{CARGO} (x{NUM})
+STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}æ¤åˆ—車的總載é‡ï¼š
STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}é–‹æ–°éŠæˆ²
@@ -304,7 +304,7 @@
STR_512 :512
STR_1024 :1024
STR_2048 :2048
-STR_MAPSIZE :{BLACK}版圖大å°:
+STR_MAPSIZE :{BLACK}版圖大å°ï¼š
STR_BY :{BLACK}*
STR_0148_GAME_OPTIONS :{BLACK}éŠæˆ²é¸é …
@@ -346,9 +346,9 @@
STR_UNITS_FORCE_SI :{COMMA} kN
############ range for menu starts
-STR_0154_OPERATING_PROFIT_GRAPH :營é‹åˆ©ç›Šåœ–表
+STR_0154_OPERATING_PROFIT_GRAPH :營é‹å ±è¡¨
STR_0155_INCOME_GRAPH :收入圖表
-STR_0156_DELIVERED_CARGO_GRAPH :å·²é‹è¼‰é‡åœ–表
+STR_0156_DELIVERED_CARGO_GRAPH :é‹è¼‰å ±è¡¨
STR_0157_PERFORMANCE_HISTORY_GRAPH :æ¥ç¸¾æ·å²åœ–表
STR_0158_COMPANY_VALUE_GRAPH :å…¬å¸å¸‚值圖表
STR_0159_CARGO_PAYMENT_RATES :貨物收費圖表
@@ -430,22 +430,22 @@
STR_0170 :{TINYFONT}{STRING}-
STR_0171_PAUSE_GAME :{BLACK}æš«åœéŠæˆ²
STR_0172_SAVE_GAME_ABANDON_GAME :{BLACK}儲å˜éŠæˆ², 於棄éŠæˆ², 離開
-STR_0173_DISPLAY_LIST_OF_COMPANY :{BLACK}顯示公å¸å„車站列表
+STR_0173_DISPLAY_LIST_OF_COMPANY :{BLACK}列出å„å…¬å¸è»Šç«™æ¸…å–®
STR_0174_DISPLAY_MAP :{BLACK}顯示地圖
-STR_0175_DISPLAY_MAP_TOWN_DIRECTORY :{BLACK}顯示地圖和市鎮目錄
-STR_0176_DISPLAY_TOWN_DIRECTORY :{BLACK}顯示市鎮目錄
+STR_0175_DISPLAY_MAP_TOWN_DIRECTORY :{BLACK}顯示地圖和市鎮清冊
+STR_0176_DISPLAY_TOWN_DIRECTORY :{BLACK}顯示市鎮清冊
STR_0177_DISPLAY_COMPANY_FINANCES :{BLACK}顯示公å¸è²¡å‹™è³‡è¨Š
STR_0178_DISPLAY_COMPANY_GENERAL :{BLACK}顯示公å¸ä¸€èˆ¬è³‡è¨Š
STR_0179_DISPLAY_GRAPHS :{BLACK}顯示圖表
STR_017A_DISPLAY_COMPANY_LEAGUE :{BLACK}顯示公å¸æŽ’行榜
STR_017B_DISPLAY_LIST_OF_COMPANY :{BLACK}顯示公å¸æ“有的列車
-STR_017C_DISPLAY_LIST_OF_COMPANY :{BLACK}顯示公å¸æ“有的巴士與貨車
+STR_017C_DISPLAY_LIST_OF_COMPANY :{BLACK}顯示公å¸æ“有的公車/貨車
STR_017D_DISPLAY_LIST_OF_COMPANY :{BLACK}顯示公å¸æ“有的輪船
STR_017E_DISPLAY_LIST_OF_COMPANY :{BLACK}顯示公å¸æ“有的飛機
STR_017F_ZOOM_THE_VIEW_IN :{BLACK}拉近視域
STR_0180_ZOOM_THE_VIEW_OUT :{BLACK}拉é 視域
-STR_0181_BUILD_RAILROAD_TRACK :{BLACK}鋪è¨è·¯è»Œ
-STR_0182_BUILD_ROADS :{BLACK}鋪è¨é“è·¯
+STR_0181_BUILD_RAILROAD_TRACK :{BLACK}興建路軌è¨æ–½
+STR_0182_BUILD_ROADS :{BLACK}興建é“è·¯è¨æ–½
STR_0183_BUILD_SHIP_DOCKS :{BLACK}興建碼é è¨æ–½
STR_0184_BUILD_AIRPORTS :{BLACK}èˆˆå»ºæ©Ÿå ´è¨æ–½
STR_0185_PLANT_TREES_PLACE_SIGNS :{BLACK}æ¤æ¨¹/置放標示
@@ -471,7 +471,7 @@
STR_0195_SHOW_VEGETATION_ON_MAP :{BLACK}於地圖上顯示è‰æœ¨
STR_0196_SHOW_LAND_OWNERS_ON_MAP :{BLACK}於地圖上顯示土地æ“有人
STR_0197_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}於地圖上開關市鎮å稱
-STR_0198_PROFIT_THIS_YEAR_LAST_YEAR :{TINYFONT}{BLACK}本年利潤: {CURRENCY} (去年利潤: {CURRENCY})
+STR_0198_PROFIT_THIS_YEAR_LAST_YEAR :{TINYFONT}{BLACK}本年利潤：{CURRENCY} (去年利潤：{CURRENCY})
############ range for service numbers starts
STR_AGE :{COMMA} å¹´ ({COMMA})
@@ -486,11 +486,11 @@
STR_01A1_IS_GETTING_VERY_OLD :{WHITE}{STRING} {COMMA}使用年é™å·²éŽ
STR_01A2_IS_GETTING_VERY_OLD_AND :{WHITE}{STRING} {COMMA}使用年é™å·²éŽå¿…é ˆæ›¿æ›
STR_01A3_LAND_AREA_INFORMATION :{WHITE}土地資訊
-STR_01A4_COST_TO_CLEAR_N_A :{BLACK}清拆æˆæœ¬: {LTBLUE}ä¸é©ç”¨
-STR_01A5_COST_TO_CLEAR :{BLACK}清拆æˆæœ¬: {LTBLUE}{CURRENCY}
+STR_01A4_COST_TO_CLEAR_N_A :{BLACK}整地花費：{LTBLUE}ä¸é©ç”¨
+STR_01A5_COST_TO_CLEAR :{BLACK}整地花費：{LTBLUE}{CURRENCY}
STR_01A6_N_A :ä¸é©ç”¨
-STR_01A7_OWNER :{BLACK}æ“有人: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY :{BLACK}地方政府: {LTBLUE}{STRING}
+STR_01A7_OWNER :{BLACK}æ“有人：{LTBLUE}{STRING}
+STR_01A8_LOCAL_AUTHORITY :{BLACK}地方政府：{LTBLUE}{STRING}
STR_01A9_NONE :ç„¡
STR_01AA_NAME :{BLACK}å稱
STR_01AB :{BLACK}{TINYFONT}{STRING}
@@ -531,7 +531,7 @@
STR_01CB :{TINYFONT}{COMMA}
-STR_01CE_CARGO_ACCEPTED :{BLACK}接收貨物: {LTBLUE}
+STR_01CE_CARGO_ACCEPTED :{BLACK}接收貨物：{LTBLUE}
STR_01D1_8 :({COMMA}/8 {STRING})
STR_01D2_JAZZ_JUKEBOX :{WHITE}爵士樂唱盤
@@ -586,7 +586,7 @@
STR_MESSAGE_HISTORY_MENU :訊æ¯ç´€éŒ„
STR_0203_SHOW_LAST_MESSAGE_NEWS :{BLACK}展示「上一次訊æ¯æˆ–æ–°èžå ±å‘Šã€ã€ã€Œé¡¯ç¤ºè¨Šæ¯ã€é¸é …
STR_0204_MESSAGE_OPTIONS :{WHITE}訊æ¯é¸é …
-STR_0205_MESSAGE_TYPES :{BLACK}訊æ¯ç¨®é¡ž:
+STR_0205_MESSAGE_TYPES :{BLACK}訊æ¯ç¨®é¡žï¼š
STR_0206_ARRIVAL_OF_FIRST_VEHICLE :{YELLOW}首個交通工具已到é”玩家的車站
STR_0207_ARRIVAL_OF_FIRST_VEHICLE :{YELLOW}首個交通工具已到é”競çˆå°æ‰‹çš„車站
STR_0208_ACCIDENTS_DISASTERS :{YELLOW}æ„外 / ç½é›£
@@ -598,7 +598,7 @@
STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}接收貨物的改動
STR_020E_SUBSIDIES :{YELLOW}資助
STR_020F_GENERAL_INFORMATION :{YELLOW}一般資訊
-STR_MESSAGES_ALL :{YELLOW}將所有訊æ¯è¨ç‚º: 關閉 / æ¦‚è¦ / 完整
+STR_MESSAGES_ALL :{YELLOW}將所有訊æ¯è¨ç‚ºï¼šé—œé–‰ / æ¦‚è¦ / 完整
STR_MESSAGE_SOUND :{YELLOW}摘è¦è¨Šæ¯ç™¼å‡ºè²éŸ³æ示
STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO :{WHITE}...與上一個目的地相è·å¤ªé
STR_0211_TOP_COMPANIES_WHO_REACHED :{BIGFONT}{BLACK}å…¬å¸å·²é”到 {NUM}{}({STRING} ç‰ç´š)
@@ -752,7 +752,7 @@
STR_02A2_MEDIUM :{BLACK}ä¸åž‹
STR_02A3_LARGE :{BLACK}大型
STR_02A4_SELECT_TOWN_SIZE :{BLACK}é¸æ“‡å¸‚鎮大å°
-STR_02A5_TOWN_SIZE :{YELLOW}市鎮大å°:
+STR_02A5_TOWN_SIZE :{YELLOW}市鎮大å°ï¼š
STR_02B6 :{STRING} - {STRING}
STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS :{BLACK}顯示最近的訊æ¯æˆ–æ–°èž
@@ -804,7 +804,7 @@
STR_SIGN_LIST :標誌清單
STR_TRANSPARENCY_OPTIONS :é€æ˜Žåº¦é¸é …
STR_02DF_TOWN_DIRECTORY :市鎮索引
-STR_TOWN_POPULATION :{BLACK}世界人å£: {COMMA}
+STR_TOWN_POPULATION :{BLACK}世界人å£ï¼š{COMMA}
STR_EXTRA_VIEW_PORT_TITLE :{WHITE}視野 {COMMA}
STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}將視窗視野移到主視野
STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}將這個視窗的視野ä½ç½®ç§»åˆ°ä¸»è¦–野的ä½ç½®
@@ -814,9 +814,9 @@
STR_02E0_CURRENCY_UNITS :{BLACK}貨幣單ä½
STR_02E1 :{BLACK}{SKIP}{STRING}
STR_02E2_CURRENCY_UNITS_SELECTION :{BLACK}é¸æ“‡è²¨å¹£å–®ä½
-STR_MEASURING_UNITS :{BLACK}é‡åº¦å–®ä½
+STR_MEASURING_UNITS :{BLACK}度é‡å–®ä½
STR_02E4 :{BLACK}{SKIP}{SKIP}{STRING}
-STR_MEASURING_UNITS_SELECTION :{BLACK}é‡åº¦å–®ä½
+STR_MEASURING_UNITS_SELECTION :{BLACK}度é‡å–®ä½
STR_02E6_ROAD_VEHICLES :{BLACK}公車/貨車
STR_02E7 :{BLACK}{SKIP}{SKIP}{SKIP}{STRING}
STR_02E8_SELECT_SIDE_OF_ROAD_FOR :{BLACK}é¸æ“‡è»Šè¼›åœ¨è·¯ä¸Šçš„行駛ä½ç½®
@@ -900,7 +900,7 @@
############ end of townname region
STR_CURR_GBP :英鎊 (£)
-STR_CURR_USD :å…ƒ ($)
+STR_CURR_USD :美元 ($)
STR_CURR_EUR :æå…ƒ (€)
STR_CURR_YEN :日圓 (¥)
STR_CURR_ATS :奧地利先令 (ATS)
@@ -960,8 +960,8 @@
STR_MONTH_NOV :å一月
STR_MONTH_DEC :å二月
-STR_HEADING_FOR_STATION :{LTBLUE}目的地: {STATION}
-STR_HEADING_FOR_STATION_VEL :{LTBLUE}目的地: {STATION}, {VELOCITY}
+STR_HEADING_FOR_STATION :{LTBLUE}目的地：{STATION}
+STR_HEADING_FOR_STATION_VEL :{LTBLUE}目的地：{STATION}，{VELOCITY}
STR_NO_ORDERS :{LTBLUE}沒有指令
STR_NO_ORDERS_VEL :{LTBLUE}沒有指令, {VELOCITY}
@@ -1016,125 +1016,133 @@
STR_CONFIG_PATCHES_OFF :關
STR_CONFIG_PATCHES_ON :é–‹
-STR_CONFIG_PATCHES_VEHICLESPEED :{LTBLUE}於狀態列顯示速度: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES :{LTBLUE}於斜å¡å’Œå²¸é‚Šèˆˆå»º: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_CATCHMENT :{LTBLUE}真實大å°çš„收集範åœ: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE :{LTBLUE}å¯ç§»é™¤æ›´åŸŽéŽ®æ“有的é“路，橋樑ç‰: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}æ高列車長度é™åˆ¶: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}çœŸå¯¦çš„åˆ—è»ŠåŠ é€Ÿ: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}ç¦æ¢åˆ—車直角轉å‘: {ORANGE}{STRING} {LTBLUE} (requires NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}åˆä½µå»ºåœ¨ä¸€èµ·çš„車站: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}å…¶ä¸ä¸€ç¨®è²¨ç‰©æ»¿è¼‰ï¼Œåˆ—車å³å¯é›¢é–‹è»Šç«™: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}使用改善éŽçš„載貨演算法: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}é€æ¥è¼‰è²¨: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INFLATION :{LTBLUE}通脹: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS :{LTBLUE}有需求æ‰å‘車站供貨: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES :{LTBLUE}æ高橋樑長度é™åˆ¶: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT :{LTBLUE}å¯ä»¥ä¸‹ã€Œåˆ°ç¶ä¿®å» ã€æŒ‡ä»¤: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDXTRAIND :{LTBLUE}å¯ä»¥èˆˆå»ºåŽŸæ料工æ¥: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MULTIPINDTOWN :{LTBLUE}æ¯å€‹å¸‚鎮å¯æ“有多個åŒé¡žåž‹å·¥æ¥: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE :{LTBLUE}åŒé¡žåž‹å·¥æ¥èˆˆå»ºè·é›¢ä¸å—é™åˆ¶: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE :{LTBLUE}æ°¸é 於狀態列顯示長日期: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE :{LTBLUE}於駕駛者的一邊顯示訊號燈: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES :{LTBLUE}於年末顯示財政視窗: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP :{LTBLUE}TTDPatch 兼容ä¸åœç«™è™•ç†: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE :{LTBLUE}車輛排隊 (é‡å效應): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL :{LTBLUE}æ»‘é¼ åœ¨è¦–çª—é‚Šç·£æ™‚ç§»å‹•è¦–çª—: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE :{LTBLUE}å¯ä»¥å‘地方政府行賄: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}ä¸è¦å‰‡å½¢ç‹€è»Šç«™: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL :{LTBLUE}新路徑æœå°‹æ¼”算法 (NPF, 覆蓋 NTP): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}貨物é‡é‡ç³»æ•¸ï¼Œä»¥æ¨¡æ“¬è¼ƒé‡åˆ—車: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD :{LTBLUE}å¯åœ¨éŽ®å…§èˆˆå»ºè·¯é‚Šè»Šç«™: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED :{LTBLUE}於狀態列顯示速度：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_BUILDONSLOPES :{LTBLUE}於斜å¡å’Œå²¸é‚Šèˆˆå»ºï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_CATCHMENT :{LTBLUE}真實大å°çš„收集範åœï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_EXTRADYNAMITE :{LTBLUE}å¯ç§»é™¤æ›´åŸŽéŽ®æ“有的é“路，橋樑ç‰ï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}æ高列車長度é™åˆ¶ï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}çœŸå¯¦çš„åˆ—è»ŠåŠ é€Ÿï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}ç¦æ¢åˆ—車直角轉å‘：{ORANGE}{STRING} {LTBLUE} (需è¦å•Ÿç”¨ NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}åˆä½µå»ºåœ¨ä¸€èµ·çš„車站：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}å…¶ä¸ä¸€ç¨®è²¨ç‰©æ»¿è¼‰ï¼Œåˆ—車å³å¯é›¢é–‹è»Šç«™ï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}使用改善éŽçš„載貨演算法：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}é€æ¥è¼‰è²¨ï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_INFLATION :{LTBLUE}通貨膨脹：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_SELECTGOODS :{LTBLUE}有需求æ‰å‘車站供貨：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_LONGBRIDGES :{LTBLUE}æ高橋樑長度é™åˆ¶ï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_GOTODEPOT :{LTBLUE}å¯ä»¥ä¸‹ã€Œåˆ°ç¶ä¿®å» ã€æŒ‡ä»¤ï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_BUILDXTRAIND :{LTBLUE}å¯ä»¥èˆˆå»ºåŽŸç‰©æ–™å·¥æ¥ï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_MULTIPINDTOWN :{LTBLUE}æ¯å€‹å¸‚鎮å¯æ“有多個åŒé¡žåž‹å·¥æ¥ï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_SAMEINDCLOSE :{LTBLUE}åŒé¡žåž‹å·¥æ¥èˆˆå»ºè·é›¢ä¸å—é™åˆ¶ï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_LONGDATE :{LTBLUE}æ°¸é 於狀態列顯示長日期：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_SIGNALSIDE :{LTBLUE}於駕駛者的一邊顯示訊號燈：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_SHOWFINANCES :{LTBLUE}於年末顯示財政視窗：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_NEW_NONSTOP :{LTBLUE}與 TTDPatch 相容之ä¸åœç«™è™•ç†ï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE :{LTBLUE}車輛排隊 (é‡å效應)：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTOSCROLL :{LTBLUE}æ»‘é¼ åœ¨è¦–çª—é‚Šç·£æ™‚ç§»å‹•è¦–çª—ï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_BRIBE :{LTBLUE}å¯ä»¥å‘地方政府行賄：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}ä¸è¦å‰‡å½¢ç‹€è»Šç«™ï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL :{LTBLUE}新路徑æœå°‹æ¼”算法 (NPF 將覆蓋 NTP)：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}貨物é‡é‡ç³»æ•¸ï¼Œä»¥æ¨¡æ“¬è¼ƒé‡åˆ—車：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD :{LTBLUE}å¯åœ¨éŽ®å…§èˆˆå»ºè·¯é‚Šè»Šç«™ï¼š{ORANGE}{STRING}
-STR_CONFIG_PATCHES_SMALL_AIRPORTS :{LTBLUE}æ°¸é å¯ä»¥èˆˆå»ºå°åž‹æ©Ÿå ´: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMALL_AIRPORTS :{LTBLUE}æ°¸é å¯ä»¥èˆˆå»ºå°åž‹æ©Ÿå ´ï¼š{ORANGE}{STRING}
-STR_CONFIG_PATCHES_WARN_LOST_TRAIN :{LTBLUE}列車迷路è¦å‘Š: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ORDER_REVIEW :{LTBLUE}覆查é‹è¼¸å·¥å…·æŒ‡ä»¤: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_LOST_TRAIN :{LTBLUE}列車迷路è¦å‘Šï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW :{LTBLUE}覆查é‹è¼¸å·¥å…·æŒ‡ä»¤ï¼š{ORANGE}{STRING}
STR_CONFIG_PATCHES_ORDER_REVIEW_OFF :å¦
STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT :是, ä¸éŽé™¤åœä¸‹ä¾†çš„é‹è¼¸å·¥å…·ä»¥å¤–
STR_CONFIG_PATCHES_ORDER_REVIEW_ON :所有é‹è¼¸å·¥å…·
-STR_CONFIG_PATCHES_WARN_INCOME_LESS :{LTBLUE}於列車盈利虧æ時發出è¦å‘Š: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES :{LTBLUE}é‹è¼¸å·¥å…·æ°¸é ä¸æœƒéŽæœŸ: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS :{LTBLUE}於列車盈利虧æ時發出è¦å‘Šï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES :{LTBLUE}é‹è¼¸å·¥å…·æ°¸é ä¸æœƒéŽæœŸï¼š{ORANGE}{STRING}
STR_CONFIG_PATCHES_AUTORENEW_VEHICLE :{LTBLUE}é‹è¼¸å·¥å…·è‡ªå‹•ç¿»æ–°
STR_CONFIG_PATCHES_AUTORENEW_MONTHS :{LTBLUE}當é‹å…·åœ¨ä½¿ç”¨å¹´é™ {ORANGE}{STRING}{LTBLUE} 個月å‰/後自動更新
-STR_CONFIG_PATCHES_AUTORENEW_MONEY :{LTBLUE}自動翻新最低費用: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ERRMSG_DURATION :{LTBLUE}錯誤訊æ¯é¡¯ç¤ºæ™‚é–“: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_POPULATION_IN_LABEL :{LTBLUE}於標籤顯示市鎮人å£: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_INVISIBLE_TREES :{LTBLUE}é¸æ“‡åŠé€æ˜Žå»ºç¯‰ç‰©æ™‚將樹木隱è—: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONEY :{LTBLUE}自動翻新最低費用：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_ERRMSG_DURATION :{LTBLUE}錯誤訊æ¯é¡¯ç¤ºæ™‚間：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL :{LTBLUE}於標籤顯示市鎮人å£ï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_INVISIBLE_TREES :{LTBLUE}é¸æ“‡åŠé€æ˜Žå»ºç¯‰ç‰©æ™‚將樹木隱è—：{ORANGE}{STRING}
-STR_CONFIG_PATCHES_LAND_GENERATOR :{LTBLUE}地形產生器: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LAND_GENERATOR :{LTBLUE}地形產生器：{ORANGE}{STRING}
STR_CONFIG_PATCHES_LAND_GENERATOR_ORIGINAL :原版
STR_CONFIG_PATCHES_LAND_GENERATOR_TERRA_GENESIS :TerraGenesis
STR_CONFIG_PATCHES_OIL_REF_EDGE_DISTANCE :{LTBLUE}ç…‰æ²¹å» èˆ‡ç‰ˆåœ–é‚Šç·£æœ€å¤§è·é›¢ {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT :{LTBLUE}雪線高度: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN :{LTBLUE}地形ä¸å¹³åº¦ (åªé©ç”¨æ–¼ TerraGenesis) : {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT :{LTBLUE}雪線高度：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN :{LTBLUE}地形ä¸å¹³åº¦ (åªé©ç”¨æ–¼ TerraGenesis)：{ORANGE}{STRING}
STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH :éžå¸¸å¹³æ»‘
STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_SMOOTH :平滑
STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_ROUGH :高低ä¸å¹³
STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_ROUGH :éžå¸¸ç²—ç³™
-STR_CONFIG_PATCHES_TREE_PLACER :{LTBLUE}樹木分佈演算法: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TREE_PLACER :{LTBLUE}樹木分佈演算法：{ORANGE}{STRING}
STR_CONFIG_PATCHES_TREE_PLACER_NONE :沒有
STR_CONFIG_PATCHES_TREE_PLACER_ORIGINAL :原版
STR_CONFIG_PATCHES_TREE_PLACER_IMPROVED :改進版
-STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION :{LTBLUE}高度圖旋轉: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION :{LTBLUE}高度圖旋轉：{ORANGE}{STRING}
STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE :逆時é‡
STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_CLOCKWISE :é †æ™‚é‡
-STR_CONFIG_PATCHES_SE_FLAT_WORLD_HEIGHT :{LTBLUE}å¹³é¢ç‰ˆåœ–高度: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SE_FLAT_WORLD_HEIGHT :{LTBLUE}å¹³é¢ç‰ˆåœ–高度：{ORANGE}{STRING}
-STR_CONFIG_PATCHES_STATION_SPREAD :{LTBLUE}車站最長長度: {ORANGE}{STRING} {RED}注æ„: éŽé«˜æœƒä»¤æ•ˆèƒ½ä¸‹é™
-STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}ç›´å‡æ©Ÿæ–¼ç›´å‡æ©Ÿå°è‡ªå‹•ç¶ä¿®: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}地形工具列與路軌/é“è·¯/碼é 建è¨/æ©Ÿå ´å»ºè¨åˆä½µ: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REVERSE_SCROLLING :{LTBLUE}倒轉滾動棒方å‘: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MEASURE_TOOLTIP :{LTBLUE}使用æŸäº›å»ºè¨å·¥å…·æ™‚顯示é‡åº¦æ示: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LIVERIES :{LTBLUE}顯示公å¸æ¨™è¨˜: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_STATION_SPREAD :{LTBLUE}車站最長延展範åœï¼š{ORANGE}{STRING} {RED}注æ„：éŽé«˜æœƒä½¿æ•ˆèƒ½ä¸‹é™
+STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}ç›´å‡æ©Ÿæ–¼ç›´å‡æ©Ÿå°è‡ªå‹•ç¶ä¿®ï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}地形工具列與路軌/é“è·¯/碼é 建è¨/æ©Ÿå ´å»ºè¨åˆä½µï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_REVERSE_SCROLLING :{LTBLUE}倒轉滾動棒方å‘：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_MEASURE_TOOLTIP :{LTBLUE}使用æŸäº›å»ºè¨å·¥å…·æ™‚顯示é‡åº¦æ示：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_LIVERIES :{LTBLUE}顯示公å¸æ¨™è¨˜ï¼š{ORANGE}{STRING}
STR_CONFIG_PATCHES_LIVERIES_NONE :ä¸é¡¯ç¤º
STR_CONFIG_PATCHES_LIVERIES_OWN :自己的公å¸
STR_CONFIG_PATCHES_LIVERIES_ALL :所有公å¸
-STR_CONFIG_PATCHES_PREFER_TEAMCHAT :{LTBLUE}按 <ENTER> éµèˆ‡å°éšŠäº¤è«‡: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_PREFER_TEAMCHAT :{LTBLUE}按 <ENTER> éµèˆ‡å°éšŠäº¤è«‡ï¼š{ORANGE}{STRING}
STR_CONFIG_PATCHES_SCROLLWHEEL_SCROLLING :{LTBLUE}æ»‘é¼ æ»¾è¼ªä½œç”¨ï¼š {ORANGE}{STRING}
STR_CONFIG_PATCHES_SCROLLWHEEL_ZOOM :放大地圖
STR_CONFIG_PATCHES_SCROLLWHEEL_SCROLL :æ²å‹•åœ°åœ–
STR_CONFIG_PATCHES_SCROLLWHEEL_OFF :關閉
STR_CONFIG_PATCHES_SCROLLWHEEL_MULTIPLIER :{LTBLUE}滾輪地圖æ²å‹•é€Ÿåº¦ï¼š {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_TRAINS :{LTBLUE}æ¯ä½çŽ©å®¶å¯æ“有列車數目: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH :{LTBLUE}æ¯ä½çŽ©å®¶å¯æ“有車輛數目: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT :{LTBLUE}æ¯ä½çŽ©å®¶å¯æ“有飛機數目: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS :{LTBLUE}æ¯ä½çŽ©å®¶å¯æ“有輪船數目: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS :{LTBLUE}電腦ä¸å¯æ“有列車: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH :{LTBLUE}電腦ä¸å¯æ“有路é¢è»Šè¼›: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT :{LTBLUE}電腦ä¸å¯æ“有飛機: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS :{LTBLUE}電腦ä¸å¯æ“有飛機: {ORANGE}{STRING}
-
-STR_CONFIG_PATCHES_AINEW_ACTIVE :{LTBLUE}使用新人工智能 (開發ä¸): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_IN_MULTIPLAYER :{LTBLUE}å¯æ–¼é€£ç·šéŠæˆ²åŠ 入電腦å°æ‰‹ (測試階段): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS :{LTBLUE}æ¯ä½çŽ©å®¶å¯æ“有列車數目：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_ROADVEH :{LTBLUE}æ¯ä½çŽ©å®¶å¯æ“有車輛數目：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT :{LTBLUE}æ¯ä½çŽ©å®¶å¯æ“有飛機數目：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_SHIPS :{LTBLUE}æ¯ä½çŽ©å®¶å¯æ“有船舶數目：{ORANGE}{STRING}
-STR_CONFIG_PATCHES_SERVINT_TRAINS :{LTBLUE}列車é è¨æª¢ä¿®é »çŽ‡: {ORANGE}{STRING} æ—¥/%
-STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED :{LTBLUE}列車é è¨æª¢ä¿®é »çŽ‡: {ORANGE}關閉
-STR_CONFIG_PATCHES_SERVINT_ROADVEH :{LTBLUE}è·¯é¢è»Šè¼›é è¨æª¢ä¿®é »çŽ‡: {ORANGE}{STRING} æ—¥/%
-STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED :{LTBLUE}è·¯é¢è»Šè¼›é è¨æª¢ä¿®é »çŽ‡: {ORANGE}關閉
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT :{LTBLUE}飛機é è¨æª¢ä¿®é »çŽ‡: {ORANGE}{STRING} æ—¥/%
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED :{LTBLUE}飛機é è¨æª¢ä¿®é »çŽ‡: {ORANGE}關閉
-STR_CONFIG_PATCHES_SERVINT_SHIPS :{LTBLUE}船隻é è¨æª¢ä¿®é »çŽ‡: {ORANGE}{STRING} æ—¥/%
-STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED :{LTBLUE}船隻é è¨æª¢ä¿®é »çŽ‡: {ORANGE}關閉
-STR_CONFIG_PATCHES_NOSERVICE :{LTBLUE}當故障關閉時ä¸ä½œå®šæœŸæª¢æŸ¥ç¶ä¿®: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_WAGONSPEEDLIMITS :{LTBLUE}車å¡é€Ÿåº¦é™åˆ¶: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_DISABLE_ELRAILS :{LTBLUE}電氣化éµè·¯: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS :{LTBLUE}電腦ä¸å¯æ“有列車：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH :{LTBLUE}電腦ä¸å¯æ“有路é¢è»Šè¼›ï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT :{LTBLUE}電腦ä¸å¯æ“有飛機：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS :{LTBLUE}電腦ä¸å¯æ“有飛機：{ORANGE}{STRING}
-STR_CONFIG_PATCHES_COLORED_NEWS_YEAR :{LTBLUE}彩色新èžå‡ºç¾æ–¼: {ORANGE}{STRING} å¹´
-STR_CONFIG_PATCHES_STARTING_YEAR :{LTBLUE}開始時間: {ORANGE}{STRING} 年
-STR_CONFIG_PATCHES_ENDING_YEAR :{LTBLUE}終çµéŠæˆ²å¹´ä»½: {ORANGE}{STRING} å¹´
+STR_CONFIG_PATCHES_AINEW_ACTIVE :{LTBLUE}使用新人工智能 (開發階段)：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_IN_MULTIPLAYER :{LTBLUE}å¯æ–¼é€£ç·šéŠæˆ²åŠ 入電腦å°æ‰‹ (測試階段)：{ORANGE}{STRING}
+
+STR_CONFIG_PATCHES_SERVINT_TRAINS :{LTBLUE}列車é è¨æª¢ä¿®é »çŽ‡ï¼š{ORANGE}{STRING} æ—¥/%
+STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED :{LTBLUE}列車é è¨æª¢ä¿®é »çŽ‡ï¼š{ORANGE}關閉
+STR_CONFIG_PATCHES_SERVINT_ROADVEH :{LTBLUE}è·¯é¢è»Šè¼›é è¨æª¢ä¿®é »çŽ‡ï¼š{ORANGE}{STRING} æ—¥/%
+STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED :{LTBLUE}è·¯é¢è»Šè¼›é è¨æª¢ä¿®é »çŽ‡ï¼š{ORANGE}關閉
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT :{LTBLUE}飛機é è¨æª¢ä¿®é »çŽ‡ï¼š{ORANGE}{STRING} æ—¥/%
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED :{LTBLUE}飛機é è¨æª¢ä¿®é »çŽ‡ï¼š{ORANGE}關閉
+STR_CONFIG_PATCHES_SERVINT_SHIPS :{LTBLUE}船隻é è¨æª¢ä¿®é »çŽ‡ï¼š{ORANGE}{STRING} æ—¥/%
+STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED :{LTBLUE}船隻é è¨æª¢ä¿®é »çŽ‡ï¼š{ORANGE}關閉
+STR_CONFIG_PATCHES_NOSERVICE :{LTBLUE}當故障關閉時ä¸ä½œå®šæœŸæª¢æŸ¥ç¶ä¿®ï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_WAGONSPEEDLIMITS :{LTBLUE}載具速度é™åˆ¶ï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_DISABLE_ELRAILS :{LTBLUE}電氣化éµè·¯ï¼š{ORANGE}{STRING}
+
+STR_CONFIG_PATCHES_COLORED_NEWS_YEAR :{LTBLUE}å½©è‰²å ±ç´™å‡ºç¾æ–¼ï¼š{ORANGE}{STRING} å¹´
+STR_CONFIG_PATCHES_STARTING_YEAR :{LTBLUE}開始時間：{ORANGE}{STRING} 年
+STR_CONFIG_PATCHES_ENDING_YEAR :{LTBLUE}終çµéŠæˆ²å¹´ä»½ï¼š{ORANGE}{STRING} å¹´
STR_CONFIG_PATCHES_SMOOTH_ECONOMY :{LTBLUE}å¹³æ»‘ç¶“æ¿Ÿæ¨¡å¼ (更多而å°çš„變化)
STR_CONFIG_PATCHES_ALLOW_SHARES :{LTBLUE}å¯ä»¥å¾žå°æ‰‹è³¼å…¥è‚¡ä»½
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY :{LTBLUE}拖放時訊號燈之間è·é›¢: {ORANGE}{STRING} æ ¼
-STR_CONFIG_PATCHES_SEMAPHORE_BUILD_BEFORE_DATE :{LTBLUE}於日期å‰è‡ªå‹•å»ºç«‹èˆŠå¼è™ŸèªŒè‡‚: {ORANGE}{STRING}å¹´
-STR_CONFIG_PATCHES_TOOLBAR_POS :{LTBLUE}主工具列ä½ç½®: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY :{LTBLUE}拖放時訊號燈之間è·é›¢ï¼š{ORANGE}{STRING} æ ¼
+STR_CONFIG_PATCHES_SEMAPHORE_BUILD_BEFORE_DATE :{LTBLUE}於日期å‰è‡ªå‹•å»ºç«‹èˆŠå¼è™ŸèªŒè‡‚：{ORANGE}{STRING}å¹´
+STR_CONFIG_PATCHES_TOOLBAR_POS :{LTBLUE}主工具列ä½ç½®ï¼š{ORANGE}{STRING}
STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT :å·¦
STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER :ä¸
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :å³
-STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}視窗自動é»è²¼ç¯„åœ: {ORANGE}{STRING} åƒç´
-STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}視窗自動é»è²¼ç¯„åœ: {ORANGE}關閉
+STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}視窗自動é»è²¼ç¯„åœï¼š{ORANGE}{STRING} åƒç´
+STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}視窗自動é»è²¼ç¯„åœï¼š{ORANGE}關閉
+STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}城市增長速度： {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :ä¸æœƒå¢žé•·
+STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :æ…¢
+STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :æ£å¸¸
+STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :å¿«
+STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :éžå¸¸å¿«
+STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}é›™å€é€Ÿå¢žé•·åŸŽå¸‚比例： {ORANGE}{STRING} 分之一
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}é›™å€é€Ÿå¢žé•·åŸŽå¸‚比例： {ORANGE}沒有
STR_CONFIG_PATCHES_GUI :{BLACK}介é¢
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}建築
@@ -1149,9 +1157,9 @@
STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}改變è¨å®šå€¼
STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}以下é è¨æª¢ä¿®æœŸèˆ‡æ€é¸é …ç›®ä¸ç›¸å®¹! åˆæ³•è¨å®šç‚º 5-90% 或 30-800 æ—¥
-STR_CONFIG_PATCHES_YAPF_SHIPS :{LTBLUE}船隻使用新的尋路系統(YAPF): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_YAPF_ROAD :{LTBLUE}車輛使用新的尋路系統: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_YAPF_RAIL :{LTBLUE}列車使用新的尋路系統: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_YAPF_SHIPS :{LTBLUE}船隻使用新的尋路系統(YAPF)：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_YAPF_ROAD :{LTBLUE}車輛使用新的尋路系統(YAPF)：{ORANGE}{STRING}
+STR_CONFIG_PATCHES_YAPF_RAIL :{LTBLUE}列車使用新的尋路系統：{ORANGE}{STRING}
STR_TEMPERATE_LANDSCAPE :溫帶
STR_SUB_ARCTIC_LANDSCAPE :亞北極帶
@@ -1161,21 +1169,21 @@
STR_CHEATS :{WHITE}作弊
STR_CHEATS_TIP :{BLACK}被勾é¸çš„é …ç›®è¡¨ç¤ºä½ ä¹‹å‰ç”¨éŽé€™å€‹ä½œå¼Š
STR_CHEATS_WARNING :{BLACK}注æ„! ä½ è¦èƒŒå›ä½ çš„å°æ‰‹å–”! ä½ è¦è¨˜ä½é€™ç¨®è¡Œç‚ºæœƒè¢«ä¸€è¼©å記著的。
-STR_CHEAT_MONEY :{LTBLUE}å¢žåŠ é‡‘éŒ¢: {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER :{LTBLUE}控制玩家: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}神奇剷泥車 (å¯ä»¥ç§»é™¤å·¥æ¥ç‰å¹³æ™‚拆ä¸æŽ‰çš„æ±è¥¿): {ORANGE}{STRING}
-STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}隧é“å¯ä»¥äº’相穿éŽ: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}於暫åœæ¨¡å¼å»ºè¨: {ORANGE}{STRING}
-STR_CHEAT_NO_JETCRASH :{LTBLUE}噴射客機ä¸æœƒæ–¼å°åž‹æ©Ÿå ´ç¶“常墜æ¯: {ORANGE} {STRING}
-STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}改變氣候: {ORANGE} {STRING}
-STR_CHEAT_CHANGE_DATE :{LTBLUE}改變日期: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD :{LTBLUE}å¯æ”¹è®Šç”¢é‡: {ORANGE}{STRING}
+STR_CHEAT_MONEY :{LTBLUE}å¢žåŠ é‡‘éŒ¢ï¼š{CURRENCY64}
+STR_CHEAT_CHANGE_PLAYER :{LTBLUE}控制玩家：{ORANGE}{COMMA}
+STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}神奇剷泥車 (å¯ä»¥ç§»é™¤å·¥æ¥ç‰å¹³æ™‚拆ä¸æŽ‰çš„æ±è¥¿)：{ORANGE}{STRING}
+STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}隧é“å¯ä»¥äº’相穿éŽï¼š{ORANGE}{STRING}
+STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}於暫åœæ¨¡å¼å»ºè¨ï¼š{ORANGE}{STRING}
+STR_CHEAT_NO_JETCRASH :{LTBLUE}噴射客機ä¸æœƒç¶“常於å°åž‹æ©Ÿå ´å¢œæ¯ï¼š{ORANGE} {STRING}
+STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}改變氣候：{ORANGE} {STRING}
+STR_CHEAT_CHANGE_DATE :{LTBLUE}改變日期：{ORANGE} {DATE_SHORT}
+STR_CHEAT_SETUP_PROD :{LTBLUE}å¯æ”¹è®Šç”¢é‡ï¼š{ORANGE}{STRING}
-STR_HEADING_FOR_WAYPOINT :{LTBLUE}目的地: {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}目的地: {WAYPOINT}, {VELOCITY}
+STR_HEADING_FOR_WAYPOINT :{LTBLUE}目的地：{WAYPOINT}
+STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}目的地：{WAYPOINT}，{VELOCITY}
STR_GO_TO_WAYPOINT :經 {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT :經 {WAYPOINT}，ä¸åœç«™
+STR_GO_NON_STOP_TO_WAYPOINT :經 {WAYPOINT}，ä¸é€”ä¸åœ
STR_WAYPOINTNAME_CITY :路標 {TOWN}
STR_WAYPOINTNAME_CITY_SERIAL :路標 {TOWN} #{COMMA}
@@ -1223,7 +1231,7 @@
STR_BUOY_IS_IN_USE :{WHITE}...浮標æ£è¢«ä½¿ç”¨!
-STR_LANDINFO_COORDS :{BLACK}座標: {LTBLUE}{NUM}x{NUM} ({STRING})
+STR_LANDINFO_COORDS :{BLACK}座標：{LTBLUE}{NUM}x{NUM} ({STRING})
STR_CANT_REMOVE_PART_OF_STATION :{WHITE}ä¸èƒ½ç§»é™¤è»Šç«™éƒ¨ä»½...
STR_CANT_CONVERT_RAIL :{WHITE}無法轉æ›è»Œé“種類...
@@ -1274,20 +1282,20 @@
STR_RAIL_SELECT_TYPE_OF_CARGO_FOR :{BLACK}é¸æ“‡è¦é‹è¼¸çš„酬載種類
STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED :{BLACK}æ”¹é€ åˆ—è»Šä»¥é‹è¼¸é¸å®šçš„酬載
STR_RAIL_CAN_T_REFIT_VEHICLE :{WHITE}ç„¡æ³•æ”¹é€ åˆ—è»Š...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT :{LTBLUE}ç¶è·é–“隔以百分比計算: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT :{LTBLUE}ç¶è·é–“隔以百分比計算：{ORANGE}{STRING}
STR_CONFIG_GAME_PRODUCTION :{WHITE}修改產é‡
TEMP_AI_IN_PROGRESS :{WHITE}æ¡è¿Žä½¿ç”¨æ£åœ¨é–‹ç™¼çš„æ–° AI。如果有任何å•é¡Œï¼Œæ¡è¿Žæ“·å–ç•«é¢æ”¾ä¸Šè¨Žè«–å€é€šçŸ¥é–‹ç™¼åœ˜éšŠã€‚
-TEMP_AI_ACTIVATED :{WHITE}è¦å‘Š: 這個新 AI 還在早期測試Warning: this new AI is still alpha! Currently, only trucks and busses work!
-TEMP_AI_MULTIPLAYER :{WHITE}è¦å‘Š: æ–° AI 實作ä»åœ¨æ¸¬è©¦éšŽæ®µã€‚如有任何å•é¡Œï¼Œè«‹é›»éƒµè‡³ truelight@openttd.org。
+TEMP_AI_ACTIVATED :{WHITE}è¦å‘Š: 這個新 AI 還在開發階段，目å‰åƒ…於汽車上實作ï¼
+TEMP_AI_MULTIPLAYER :{WHITE}è¦å‘Š: æ–° AI 實作ä»åœ¨é–‹ç™¼éšŽæ®µã€‚如有任何å•é¡Œï¼Œè«‹ E-Mail 至 truelight@openttd.org。
############ network gui strings
STR_NETWORK_MULTIPLAYER :{WHITE}連線éŠæˆ²
-STR_NETWORK_PLAYER_NAME :{BLACK}玩家å稱:
+STR_NETWORK_PLAYER_NAME :{BLACK}玩家å稱：
STR_NETWORK_ENTER_NAME_TIP :{BLACK}這是其他玩家辨èªæ‚¨çš„å稱
-STR_NETWORK_CONNECTION :{BLACK}連線:
+STR_NETWORK_CONNECTION :{BLACK}連線：
STR_NETWORK_CONNECTION_TIP :{BLACK}é¸æ“‡ Internet 或å€åŸŸç¶²è·¯ (LAN) éŠæˆ²
STR_NETWORK_START_SERVER :{BLACK}起動伺æœå™¨
@@ -1309,14 +1317,14 @@
STR_NETWORK_CLIENTS_CAPTION_TIP :{BLACK}線上客戶端 / 客戶端上é™{}ç·šä¸Šå…¬å¸ / å…¬å¸ä¸Šé™
STR_NETWORK_GAME_INFO :{SILVER}éŠæˆ²è³‡è¨Š
STR_ORANGE :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS :{SILVER}客戶端: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE :{SILVER}語言: {WHITE}{STRING}
-STR_NETWORK_TILESET :{SILVER}圖片組: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE :{SILVER}地圖大å°: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION :{SILVER}伺æœå™¨ç‰ˆæœ¬: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS :{SILVER}伺æœå™¨ä½å€: {WHITE}{STRING} : {NUM}
-STR_NETWORK_START_DATE :{SILVER}開始日期: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE :{SILVER}ç›®å‰æ—¥æœŸ: {WHITE}{DATE_SHORT}
+STR_NETWORK_CLIENTS :{SILVER}客戶端：{WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_LANGUAGE :{SILVER}語言：{WHITE}{STRING}
+STR_NETWORK_TILESET :{SILVER}ç¶²æ ¼çµ„ï¼š{WHITE}{STRING}
+STR_NETWORK_MAP_SIZE :{SILVER}地圖大å°ï¼š{WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_VERSION :{SILVER}伺æœå™¨ç‰ˆæœ¬ï¼š{WHITE}{STRING}
+STR_NETWORK_SERVER_ADDRESS :{SILVER}伺æœå™¨ä½å€ï¼š{WHITE}{STRING} : {NUM}
+STR_NETWORK_START_DATE :{SILVER}開始日期：{WHITE}{DATE_SHORT}
+STR_NETWORK_CURRENT_DATE :{SILVER}ç›®å‰æ—¥æœŸï¼š{WHITE}{DATE_SHORT}
STR_NETWORK_PASSWORD :{SILVER}å—密碼ä¿è·ï¼
STR_NETWORK_SERVER_OFFLINE :{SILVER}伺æœå™¨é›¢ç·š
STR_NETWORK_SERVER_FULL :{SILVER}伺æœå™¨å·²æ»¿
@@ -1328,13 +1336,13 @@
STR_NETWORK_START_GAME_WINDOW :{WHITE}開始新的多人éŠæˆ²
-STR_NETWORK_NEW_GAME_NAME :{BLACK}éŠæˆ²å稱:
+STR_NETWORK_NEW_GAME_NAME :{BLACK}éŠæˆ²å稱：
STR_NETWORK_NEW_GAME_NAME_TIP :{BLACK}éŠæˆ²å稱會顯示在其他玩家é¸æ“‡éŠæˆ²çš„é¸å–®å†…
STR_NETWORK_SET_PASSWORD :{BLACK}è¨å®šå¯†ç¢¼
STR_NETWORK_PASSWORD_TIP :{BLACK}如果您ä¸æƒ³è®“大眾連線的話，å¯ä»¥ç”¨å¯†ç¢¼ä¿è·éŠæˆ²
-STR_NETWORK_SELECT_MAP :{BLACK}é¸æ“‡åœ°åœ–:
+STR_NETWORK_SELECT_MAP :{BLACK}é¸æ“‡åœ°åœ–：
STR_NETWORK_SELECT_MAP_TIP :{BLACK}您想玩哪個地圖？
-STR_NETWORK_NUMBER_OF_CLIENTS :{BLACK}客戶端上é™:
+STR_NETWORK_NUMBER_OF_CLIENTS :{BLACK}客戶端上é™ï¼š
STR_NETWORK_NUMBER_OF_CLIENTS_TIP :{BLACK}é¸æ“‡é€£ç·šäººæ•¸ä¸Šé™ã€‚未必æ¯å€‹åé¡éƒ½éœ€é€£ç·š
STR_NETWORK_COMBO1 :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
STR_NETWORK_LAN :局域網絡(LAN)
@@ -1353,13 +1361,13 @@
STR_NETWORK_8_PLAYERS :8 ä½çŽ©å®¶
STR_NETWORK_9_PLAYERS :9 ä½çŽ©å®¶
STR_NETWORK_10_PLAYERS :10 ä½çŽ©å®¶
-STR_NETWORK_NUMBER_OF_COMPANIES :{BLACK}å…¬å¸ä¸Šé™:
+STR_NETWORK_NUMBER_OF_COMPANIES :{BLACK}å…¬å¸ä¸Šé™ï¼š
STR_NETWORK_NUMBER_OF_COMPANIES_TIP :{BLACK}é™åˆ¶ä¼ºæœå™¨å¯ä»¥å»ºç«‹çš„å…¬å¸æ•¸
STR_NETWORK_COMBO3 :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_NUMBER_OF_SPECTATORS :{BLACK}觀看者上é™:
+STR_NETWORK_NUMBER_OF_SPECTATORS :{BLACK}觀看者上é™ï¼š
STR_NETWORK_NUMBER_OF_SPECTATORS_TIP :{BLACK}é™åˆ¶å¯åŠ 入的觀察者數é‡
STR_NETWORK_COMBO4 :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_LANGUAGE_SPOKEN :{BLACK}所用的語言:
+STR_NETWORK_LANGUAGE_SPOKEN :{BLACK}所用的語言：
STR_NETWORK_LANGUAGE_TIP :{BLACK}讓其他人知é“這個伺æœå™¨ä½¿ç”¨çš„交談語言
STR_NETWORK_COMBO5 :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
STR_NETWORK_START_GAME :{BLACK}開始éŠæˆ²
@@ -1376,7 +1384,7 @@
STR_NETWORK_GAME_LOBBY :{WHITE}連線éŠæˆ²å¤§å»³
-STR_NETWORK_PREPARE_TO_JOIN :{BLACK}æº–å‚™åŠ å…¥: {ORANGE}{STRING}
+STR_NETWORK_PREPARE_TO_JOIN :{BLACK}æº–å‚™åŠ å…¥ï¼š{ORANGE}{STRING}
STR_NETWORK_COMPANY_LIST_TIP :{BLACK}列出éŠæˆ²å†…所有公å¸ã€‚您å¯ä»¥åŠ å…¥ç¾æœ‰å…¬å¸ï¼Œè‹¥é‚„有公å¸ç©ºä½çš„話，也å¯å‰µç«‹æ–°å…¬å¸ã€‚
STR_NETWORK_NEW_COMPANY :{BLACK}æ–°å…¬å¸
STR_NETWORK_NEW_COMPANY_TIP :{BLACK}建立新公å¸
@@ -1389,16 +1397,16 @@
STR_NETWORK_COMPANY_INFO :{SILVER}å…¬å¸è³‡è¨Š
-STR_NETWORK_COMPANY_NAME :{SILVER}å…¬å¸å稱: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR :{SILVER}æˆç«‹æ–¼: {WHITE}{NUM}
-STR_NETWORK_VALUE :{SILVER}å…¬å¸åƒ¹å€¼: {WHITE}{CURRENCY64}
-STR_NETWORK_CURRENT_BALANCE :{SILVER}ç›®å‰é¤˜é¡: {WHITE}{CURRENCY64}
-STR_NETWORK_LAST_YEARS_INCOME :{SILVER}去年收入: {WHITE}{CURRENCY64}
-STR_NETWORK_PERFORMANCE :{SILVER}效率: {WHITE}{NUM}
+STR_NETWORK_COMPANY_NAME :{SILVER}å…¬å¸å稱：{WHITE}{STRING}
+STR_NETWORK_INAUGURATION_YEAR :{SILVER}æˆç«‹æ–¼ï¼š{WHITE}{NUM}
+STR_NETWORK_VALUE :{SILVER}å…¬å¸å¸‚值：{WHITE}{CURRENCY64}
+STR_NETWORK_CURRENT_BALANCE :{SILVER}ç›®å‰é¤˜é¡ï¼š{WHITE}{CURRENCY64}
+STR_NETWORK_LAST_YEARS_INCOME :{SILVER}去年收入：{WHITE}{CURRENCY64}
+STR_NETWORK_PERFORMANCE :{SILVER}效率：{WHITE}{NUM}
-STR_NETWORK_VEHICLES :{SILVER}é‹å…·: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS :{SILVER}車站: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS :{SILVER}玩家: {WHITE}{STRING}
+STR_NETWORK_VEHICLES :{SILVER}é‹å…·ï¼š{WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS :{SILVER}站點：{WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_PLAYERS :{SILVER}玩家：{WHITE}{STRING}
STR_NETWORK_CONNECTING :{WHITE}æ£åœ¨é€£ç·š...
@@ -1462,14 +1470,14 @@
STR_NETWORK_CLIENT_JOINED :åŠ å…¥éŠæˆ²
STR_NETWORK_GIVE_MONEY :給了您的公å¸ä¸€äº›éŒ¢ ({CURRENCY})
STR_NETWORK_GAVE_MONEY_AWAY :您給了 {STRING} 一些錢 ({CURRENCY})
-STR_NETWORK_CHAT_COMPANY_CAPTION :[團隊] :
-STR_NETWORK_CHAT_COMPANY :[團隊] {STRING}: {GRAY}{STRING}
-STR_NETWORK_CHAT_TO_COMPANY :[團隊] 給 {STRING}: {GRAY}{STRING}
-STR_NETWORK_CHAT_CLIENT_CAPTION :[ç§äºº] :
-STR_NETWORK_CHAT_CLIENT :[ç§äºº] {STRING}: {GRAY}{STRING}
-STR_NETWORK_CHAT_TO_CLIENT :[ç§äºº] 給 {STRING}: {GRAY}{STRING}
-STR_NETWORK_CHAT_ALL_CAPTION :[全員] :
-STR_NETWORK_CHAT_ALL :[全員] {STRING}: {GRAY}{STRING}
+STR_NETWORK_CHAT_COMPANY_CAPTION :[團隊]：
+STR_NETWORK_CHAT_COMPANY :[團隊] {STRING}：{GRAY}{STRING}
+STR_NETWORK_CHAT_TO_COMPANY :[團隊] 給 {STRING}：{GRAY}{STRING}
+STR_NETWORK_CHAT_CLIENT_CAPTION :[ç§äºº]：
+STR_NETWORK_CHAT_CLIENT :[ç§äºº] {STRING}：{GRAY}{STRING}
+STR_NETWORK_CHAT_TO_CLIENT :[ç§äºº] 給 {STRING}：{GRAY}{STRING}
+STR_NETWORK_CHAT_ALL_CAPTION :[全員] ：
+STR_NETWORK_CHAT_ALL :[全員] {STRING}：{GRAY}{STRING}
STR_NETWORK_NAME_CHANGE :將自己的å稱改為
STR_NETWORK_SERVER_SHUTDOWN :{WHITE} 伺æœå™¨é—œé–‰é€£ç·š
STR_NETWORK_SERVER_REBOOT :{WHITE} 伺æœå™¨æ£åœ¨é‡æ–°å•Ÿå‹•...{}è«‹ç¨å€™...
@@ -1491,8 +1499,8 @@
############ end network gui strings
-STR_CONFIG_PATCHES_MAP_X :{LTBLUE}地圖 X 軸大å°: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAP_Y :{LTBLUE}地圖 Y 軸大å°: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_X :{LTBLUE}地圖 X 軸大å°ï¼š{ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAP_Y :{LTBLUE}地圖 Y 軸大å°ï¼š{ORANGE}{STRING}
##### PNG-MAP-Loader
@@ -1506,14 +1514,14 @@
STR_BMPMAP_ERR_IMAGE_TYPE :{WHITE}...無法轉æ›å½±åƒæ ¼å¼
##id 0x0800
-STR_0800_COST :{TINYFONT}{RED}花費: {CURRENCY}
-STR_0801_COST :{RED}花費: {CURRENCY}
-STR_0802_INCOME :{TINYFONT}{GREEN}收入: {CURRENCY}
-STR_0803_INCOME :{GREEN}收入: {CURRENCY}
-STR_FEEDER_TINY :{TINYFONT}{YELLOW}轉é‹: {CURRENCY}
-STR_FEEDER :{YELLOW}轉é‹: {CURRENCY}
+STR_0800_COST :{TINYFONT}{RED}花費：{CURRENCY}
+STR_0801_COST :{RED}花費：{CURRENCY}
+STR_0802_INCOME :{TINYFONT}{GREEN}收入：{CURRENCY}
+STR_0803_INCOME :{GREEN}收入：{CURRENCY}
+STR_FEEDER_TINY :{TINYFONT}{YELLOW}轉é‹ï¼š{CURRENCY}
+STR_FEEDER :{YELLOW}轉é‹ï¼š{CURRENCY}
STR_0805_ESTIMATED_COST :{WHITE}é 估花費 {CURRENCY}
-STR_0807_ESTIMATED_INCOME :{WHITE}é 估收入: {CURRENCY}
+STR_0807_ESTIMATED_INCOME :{WHITE}é 估收入：{CURRENCY}
STR_0808_CAN_T_RAISE_LAND_HERE :{WHITE}無法æ昇土地...
STR_0809_CAN_T_LOWER_LAND_HERE :{WHITE}無法é™ä½ŽåœŸåœ°...
STR_080A_ROCKS :石é
@@ -1605,15 +1613,15 @@
STR_2002 :{TINYFONT}{BLACK}{STRING}
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}å¿…é ˆå…ˆæ‘§æ¯€å»ºç¯‰
STR_2005 :{WHITE}{TOWN}
-STR_2006_POPULATION :{BLACK}人å£: {ORANGE}{COMMA}{BLACK} 房屋: {ORANGE}{COMMA}
+STR_2006_POPULATION :{BLACK}人å£ï¼š{ORANGE}{COMMA}{BLACK} 房屋：{ORANGE}{COMMA}
STR_2007_RENAME_TOWN :修改城鎮å稱
STR_2008_CAN_T_RENAME_TOWN :{WHITE}無法修改城鎮å稱...
STR_2009_LOCAL_AUTHORITY_REFUSES :{WHITE}{TOWN} 城鎮當局ä¸åŒæ„
STR_200A_TOWN_NAMES_CLICK_ON_NAME :{BLACK}城鎮å稱 - 點é¸å稱å¯å°‡åŸŽéŽ®ç½®æ–¼ç•«é¢ä¸å¤®
STR_200B_CENTER_THE_MAIN_VIEW_ON :{BLACK}將主視野移到城鎮ä½ç½®
STR_200C_CHANGE_TOWN_NAME :{BLACK}修改城鎮å稱
-STR_200D_PASSENGERS_LAST_MONTH_MAX :{BLACK}上月乘客: {ORANGE}{COMMA}{BLACK} 最多: {ORANGE}{COMMA}
-STR_200E_MAIL_LAST_MONTH_MAX :{BLACK}上月郵件: {ORANGE}{COMMA}{BLACK} 最多: {ORANGE}{COMMA}
+STR_200D_PASSENGERS_LAST_MONTH_MAX :{BLACK}上月乘客：{ORANGE}{COMMA}{BLACK} 最多：{ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX :{BLACK}上月郵件：{ORANGE}{COMMA}{BLACK} 最多：{ORANGE}{COMMA}
STR_200F_TALL_OFFICE_BLOCK :摩天辦公大樓
STR_2010_OFFICE_BLOCK :辦公大樓
STR_2011_SMALL_BLOCK_OF_FLATS :平房
@@ -1634,19 +1642,19 @@
STR_2020_LOCAL_AUTHORITY :{BLACK}地方政府
STR_2021_SHOW_INFORMATION_ON_LOCAL :{BLACK}顯示地方政府資訊
STR_2022_LOCAL_AUTHORITY :{WHITE}{TOWN} 地方政府
-STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}é‹è¼¸å…¬å¸è©•æ¯”:
-STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2023_TRANSPORT_COMPANY_RATINGS :{BLACK}é‹è¼¸å…¬å¸è©•æ¯”：
+STR_2024 :{YELLOW}{COMPANY}{PLAYERNAME}：{ORANGE}{STRING}
STR_2025_SUBSIDIES :{WHITE}補助
-STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}æ供補助的é‹è¼¸æœå‹™:
+STR_2026_SUBSIDIES_ON_OFFER_FOR :{BLACK}æ供補助的é‹è¼¸æœå‹™ï¼š
STR_2027_FROM_TO :{ORANGE}å°‡ {STRING} 從 {STRING} é‹åˆ° {STRING}
STR_2028_BY :{YELLOW} (在 {DATE_SHORT} 之å‰)
STR_202A_NONE :{ORANGE}ç„¡
-STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}å·²ç²è£œåŠ©çš„æœå‹™:
+STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}å·²ç²è£œåŠ©çš„æœå‹™ï¼š
STR_202C_FROM_TO :{ORANGE}å°‡ {STRING} 從 {STATION} é‹åˆ° {STATION}{YELLOW} ({COMPANY}
STR_202D_UNTIL :{YELLOW}, 補助到 {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}補助éŽæœŸ:{}{}å°‡ {STRING} 從 {STRING} é‹åˆ° {STRING} 從æ¤ä¸å†æ供補助。
-STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}補助çµæŸ:{}{}å°‡ {STRING} 從 {STATION} é‹åˆ° {STATION} ä¸å†æ供補助。
-STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}æ供補助:{}{}首先將 {STRING} 從 {STRING} é‹åˆ° {STRING} çš„å…¬å¸å°‡å¾—到å€åŸŸç•¶å±€è£œåŠ©ä¸€å¹´ï¼
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}補助éŽæœŸï¼š{}{}å°‡ {STRING} 從 {STRING} é‹åˆ° {STRING} 從æ¤ä¸å†æ供補助。
+STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}補助çµæŸï¼š{}{}å°‡ {STRING} 從 {STATION} é‹åˆ° {STATION} å°‡ä¸å†æ供補助。
+STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}æ供補助：{}{}首先將 {STRING} 從 {STRING} é‹åˆ° {STRING} çš„å…¬å¸å°‡å¾—到å€åŸŸç•¶å±€è£œåŠ©ä¸€å¹´ï¼
STR_2031_SERVICE_SUBSIDY_AWARDED :{BLACK}{BIGFONT}{COMPANY} ç²å¾—補助ï¼{}{}å°‡ {STRING} 從 {STATION} é‹åˆ° {STATION} çš„æœå‹™å¯åœ¨å¾€å¾Œä¸€å¹´å¾—到é¡å¤– 50% çš„é‹è²»è£œåŠ©ï¼
STR_2032_SERVICE_SUBSIDY_AWARDED :{BLACK}{BIGFONT}{COMPANY} ç²å¾—補助ï¼{}{}å°‡ {STRING} 從 {STATION} é‹åˆ° {STATION} çš„æœå‹™å¯åœ¨å¾€å¾Œä¸€å¹´æ”¶åˆ°é›™å€é‹è²»ï¼
STR_2033_SERVICE_SUBSIDY_AWARDED :{BLACK}{BIGFONT}{COMPANY} ç²å¾—補助ï¼{}{}å°‡ {STRING} 從 {STATION} é‹åˆ° {STATION} çš„æœå‹™å¯åœ¨å¾€å¾Œä¸€å¹´æ”¶åˆ°ä¸‰å€é‹è²»ï¼
@@ -1658,7 +1666,7 @@
STR_2039_TALL_OFFICE_BLOCK :摩天辦公大樓
STR_203A_SHOPS_AND_OFFICES :店舖與辦公室
STR_203B_SHOPS_AND_OFFICES :店舖與辦公室
-STR_203C_THEATER :åŠ‡å ´
+STR_203C_THEATER :劇院
STR_203D_STADIUM :體育館
STR_203E_OFFICES :辦公室
STR_203F_HOUSES :房èˆ
@@ -1667,7 +1675,7 @@
STR_2042_DO_IT :{BLACK}辦ç†
STR_2043_LIST_OF_THINGS_TO_DO_AT :{BLACK}在這個城鎮辦ç†å·¥ä½œ - é¸æ“‡å„工作å¯çœ‹åˆ°èªªæ˜Ž
STR_2044_CARRY_OUT_THE_HIGHLIGHTED :{BLACK}辦ç†é¸å®šçš„工作
-STR_2045_ACTIONS_AVAILABLE :{BLACK}å¯è¾¦ç†çš„工作:
+STR_2045_ACTIONS_AVAILABLE :{BLACK}å¯è¾¦ç†çš„工作：
STR_2046_SMALL_ADVERTISING_CAMPAIGN :å°åž‹å»£å‘Šæ´»å‹•
STR_2047_MEDIUM_ADVERTISING_CAMPAIGN :ä¸åž‹å»£å‘Šæ´»å‹•
STR_2048_LARGE_ADVERTISING_CAMPAIGN :大型廣告活動
@@ -1676,14 +1684,14 @@
STR_204B_FUND_NEW_BUILDINGS :出資新建築物
STR_204C_BUY_EXCLUSIVE_TRANSPORT :購買專屬é‹è¼¸æ¬Š
STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY :å‘地方當局行賄
-STR_204D_INITIATE_A_SMALL_LOCAL :{WHITE}{STRING}{}{YELLOW} 開始進行å°åž‹å€åŸŸå»£å‘Šæ´»å‹•ï¼Œç‚ºæ‚¨çš„é‹è¼¸æœå‹™å¸å¼•æ›´å¤šä¹˜å®¢èˆ‡è²¨ç‰©ã€‚{} 花費: {CURRENCY}
-STR_204E_INITIATE_A_MEDIUM_LOCAL :{WHITE}{STRING}{}{YELLOW} 開始進行ä¸åž‹å€åŸŸå»£å‘Šæ´»å‹•ï¼Œç‚ºæ‚¨çš„é‹è¼¸æœå‹™å¸å¼•æ›´å¤šä¹˜å®¢èˆ‡è²¨ç‰©ã€‚{} 花費: {CURRENCY}
-STR_204F_INITIATE_A_LARGE_LOCAL :{WHITE}{STRING}{}{YELLOW} 開始進行大型å€åŸŸå»£å‘Šæ´»å‹•ï¼Œç‚ºæ‚¨çš„é‹è¼¸æœå‹™å¸å¼•æ›´å¤šä¹˜å®¢èˆ‡è²¨ç‰©ã€‚{} 花費: {CURRENCY}
-STR_2050_FUND_THE_RECONSTRUCTION :{WHITE}{STRING}{}{YELLOW} 出資é‡å»ºåŸŽå…§é“路網。將å°å¾€å¾Œå…個月的é“è·¯é‹è¼¸é€ æˆå¯è§€çš„è¡æ“Šã€‚{} 花費: {CURRENCY}
-STR_2051_BUILD_A_STATUE_IN_HONOR :{WHITE}{STRING}{}{YELLOW} å»ºé€ é›•åƒç´€å¿µæ‚¨çš„å…¬å¸ã€‚{} 花費: {CURRENCY}
-STR_2052_FUND_THE_CONSTRUCTION_OF :{WHITE}{STRING}{}{YELLOW} å‡ºè³‡åœ¨åŸŽå…§å»ºé€ æ–°çš„å•†æ¥å»ºç¯‰ã€‚{} 費用: {CURRENCY}
-STR_2053_BUY_1_YEAR_S_EXCLUSIVE :{WHITE}{STRING}{}{YELLOW} 在城內購買一年的專屬é‹è¼¸æ¬Šã€‚å€åŸŸç•¶å±€å°‡åªè®“乘客與貨物使用您的é‹è¼¸æœå‹™ã€‚{} 費用: {CURRENCY}
-STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC :{WHITE}{STRING}{}{YELLOW} 冒著被抓到å—嚴懲的風險，å‘地方當局行賄以æ高評價{} 費用: {CURRENCY}
+STR_204D_INITIATE_A_SMALL_LOCAL :{WHITE}{STRING}{}{YELLOW} 開始進行å°åž‹å€åŸŸå»£å‘Šæ´»å‹•ï¼Œç‚ºæ‚¨çš„é‹è¼¸æœå‹™å¸å¼•æ›´å¤šä¹˜å®¢èˆ‡è²¨ç‰©ã€‚{} 花費：{CURRENCY}
+STR_204E_INITIATE_A_MEDIUM_LOCAL :{WHITE}{STRING}{}{YELLOW} 開始進行ä¸åž‹å€åŸŸå»£å‘Šæ´»å‹•ï¼Œç‚ºæ‚¨çš„é‹è¼¸æœå‹™å¸å¼•æ›´å¤šä¹˜å®¢èˆ‡è²¨ç‰©ã€‚{} 花費：{CURRENCY}
+STR_204F_INITIATE_A_LARGE_LOCAL :{WHITE}{STRING}{}{YELLOW} 開始進行大型å€åŸŸå»£å‘Šæ´»å‹•ï¼Œç‚ºæ‚¨çš„é‹è¼¸æœå‹™å¸å¼•æ›´å¤šä¹˜å®¢èˆ‡è²¨ç‰©ã€‚{} 花費：{CURRENCY}
+STR_2050_FUND_THE_RECONSTRUCTION :{WHITE}{STRING}{}{YELLOW} 出資é‡å»ºåŸŽå…§é“路網。將å°å¾€å¾Œå…個月的é“è·¯é‹è¼¸é€ æˆå¯è§€çš„è¡æ“Šã€‚{} 花費：{CURRENCY}
+STR_2051_BUILD_A_STATUE_IN_HONOR :{WHITE}{STRING}{}{YELLOW} å»ºé€ é›•åƒç´€å¿µæ‚¨çš„å…¬å¸ã€‚{} 花費：{CURRENCY}
+STR_2052_FUND_THE_CONSTRUCTION_OF :{WHITE}{STRING}{}{YELLOW} å‡ºè³‡åœ¨åŸŽå…§å»ºé€ æ–°çš„å•†æ¥å»ºç¯‰ã€‚{} 費用：{CURRENCY}
+STR_2053_BUY_1_YEAR_S_EXCLUSIVE :{WHITE}{STRING}{}{YELLOW} 在城內購買一年的專屬é‹è¼¸æ¬Šã€‚å€åŸŸç•¶å±€å°‡åªè®“乘客與貨物使用您的é‹è¼¸æœå‹™ã€‚{} 費用：{CURRENCY}
+STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC :{WHITE}{STRING}{}{YELLOW} 冒著被抓到å—嚴懲的風險，å‘地方當局行賄以æ高評價{} 費用：{CURRENCY}
STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING :{BIGFONT}{BLACK}{TOWN} 交通大亂ï¼{}{}{COMPANY} 出資的é“è·¯é‡å»ºè¨ˆåŠƒç‚ºä¹˜è»Šè€…帶來å…個月的惡夢ï¼
STR_2056 :{TINYFONT}{WHITE}{TOWN}
STR_2058_UNDER_CONSTRUCTION :{STRING} (å»ºé€ ä¸)
@@ -1738,7 +1746,7 @@
STR_3031_CAN_T_RENAME_STATION :{WHITE}ä¸èƒ½ä¿®æ”¹è»Šç«™å稱...
STR_3032_RATINGS :{BLACK}評價
STR_3033_ACCEPTS :{BLACK}接å—貨物
-STR_3034_LOCAL_RATING_OF_TRANSPORT :{BLACK}本地å°é‹è¼¸æœå‹™çš„評價:
+STR_3034_LOCAL_RATING_OF_TRANSPORT :{BLACK}本地å°é‹è¼¸æœå‹™çš„評價：
############ range for rating starts
STR_3035_APPALLING :é§äººè½èž
@@ -1751,7 +1759,7 @@
STR_303C_OUTSTANDING :傑出
############ range for rating ends
-STR_303D :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
+STR_303D :{WHITE}{STRING}：{YELLOW}{STRING} ({COMMA}%)
STR_303E_NO_LONGER_ACCEPTS :{WHITE}{STATION} ä¸å†æŽ¥å— {STRING}
STR_303F_NO_LONGER_ACCEPTS_OR :{WHITE}{STATION} ä¸å†æŽ¥å— {STRING} 或 {STRING}
STR_3040_NOW_ACCEPTS :{WHITE}{STATION} ç¾åœ¨æŽ¥å— {STRING}
@@ -1871,17 +1879,17 @@
STR_4826_SUGAR_MINE :糖礦
############ range for requires starts
-STR_4827_REQUIRES :{BLACK}需è¦: {YELLOW}{STRING}
-STR_4828_REQUIRES :{BLACK}需è¦: {YELLOW}{STRING}, {STRING}
-STR_4829_REQUIRES :{BLACK}需è¦: {YELLOW}{STRING}, {STRING}, {STRING}
+STR_4827_REQUIRES :{BLACK}需è¦ï¼š{YELLOW}{STRING}
+STR_4828_REQUIRES :{BLACK}需è¦ï¼š{YELLOW}{STRING}, {STRING}
+STR_4829_REQUIRES :{BLACK}需è¦ï¼š{YELLOW}{STRING}, {STRING}, {STRING}
############ range for requires ends
-STR_482A_PRODUCTION_LAST_MONTH :{BLACK}上月產é‡:
+STR_482A_PRODUCTION_LAST_MONTH :{BLACK}上月產é‡ï¼š
STR_482B_TRANSPORTED :{YELLOW}{CARGO}{BLACK} (é‹é€äº† {COMMA}%)
STR_482C_CENTER_THE_MAIN_VIEW_ON :{BLACK}將主視野帶到工æ¥ä¸Šæ–¹
STR_482D_NEW_UNDER_CONSTRUCTION :{BLACK}{BIGFONT}æ–°çš„ {STRING} æ£åœ¨ {TOWN} é™„è¿‘å»ºé€ ä¸ï¼
STR_482E_NEW_BEING_PLANTED_NEAR :{BLACK}{BIGFONT}æ–°çš„ {STRING} æ£åœ¨ {TOWN} 附近種æ¤ä¸ï¼
-STR_482F_COST :{BLACK}費用: {YELLOW}{CURRENCY}
+STR_482F_COST :{BLACK}費用：{YELLOW}{CURRENCY}
STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY :{WHITE}無法在æ¤æ–°å»ºé€™ç¨®å·¥æ¥...
STR_4831_FOREST_CAN_ONLY_BE_PLANTED :{WHITE}...森林åªèƒ½ç¨®åœ¨é›ªç·šä»¥ä¸Š
STR_4832_ANNOUNCES_IMMINENT_CLOSURE :{BLACK}{BIGFONT}{INDUSTRY} 宣佈立å³é—œé–‰ï¼
@@ -2005,24 +2013,24 @@
############ range for difficulty levels ends
############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS :{LTBLUE}競çˆå°æ‰‹æ•¸ç›®ä¸Šé™: {ORANGE}{COMMA}
-STR_6806_COMPETITOR_START_TIME :{LTBLUE}競çˆå°æ‰‹é–‹å§‹æ™‚é–“: {ORANGE}{STRING}
-STR_6807_NO_OF_TOWNS :{LTBLUE}城鎮數: {ORANGE}{STRING}
-STR_6808_NO_OF_INDUSTRIES :{LTBLUE}å·¥æ¥æ•¸: {ORANGE}{STRING}
-STR_6809_MAXIMUM_INITIAL_LOAN_000 :{LTBLUE}最åˆè²¸æ¬¾ä¸Šé™: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE :{LTBLUE}最åˆåˆ©çŽ‡: {ORANGE}{COMMA}%
-STR_680B_VEHICLE_RUNNING_COSTS :{LTBLUE}é‹å…·ç‡Ÿé‹æ”¯å‡º: {ORANGE}{STRING}
-STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR :{LTBLUE}競çˆå°æ‰‹ç™¼å±•é€Ÿåº¦: {ORANGE}{STRING}
-STR_680D_INTELLIGENCE_OF_COMPETITORS :{LTBLUE}競çˆå°æ‰‹æ™ºå•†: {ORANGE}{STRING}
-STR_680E_VEHICLE_BREAKDOWNS :{LTBLUE}é‹å…·æ•…障率: {ORANGE}{STRING}
-STR_680F_SUBSIDY_MULTIPLIER :{LTBLUE}補助å€çŽ‡: {ORANGE}{STRING}
-STR_6810_COST_OF_CONSTRUCTION :{LTBLUE}建築費用: {ORANGE}{STRING}
-STR_6811_TERRAIN_TYPE :{LTBLUE}地形種類: {ORANGE}{STRING}
-STR_6812_QUANTITY_OF_SEA_LAKES :{LTBLUE}海/湖比率: {ORANGE}{STRING}
-STR_6813_ECONOMY :{LTBLUE}經濟: {ORANGE}{STRING}
-STR_6814_TRAIN_REVERSING :{LTBLUE}列車倒轉: {ORANGE}{STRING}
-STR_6815_DISASTERS :{LTBLUE}ç½é›£: {ORANGE}{STRING}
-STR_16816_CITY_APPROVAL :{LTBLUE}市è°æœƒå°å€åŸŸé‡å»ºçš„態度: {ORANGE}{STRING}
+STR_6805_MAXIMUM_NO_COMPETITORS :{LTBLUE}競çˆå°æ‰‹æ•¸ç›®ä¸Šé™ï¼š{ORANGE}{COMMA}
+STR_6806_COMPETITOR_START_TIME :{LTBLUE}競çˆå°æ‰‹é–‹å§‹æ™‚間：{ORANGE}{STRING}
+STR_6807_NO_OF_TOWNS :{LTBLUE}城鎮數：{ORANGE}{STRING}
+STR_6808_NO_OF_INDUSTRIES :{LTBLUE}å·¥æ¥æ•¸ï¼š{ORANGE}{STRING}
+STR_6809_MAXIMUM_INITIAL_LOAN_000 :{LTBLUE}最åˆè²¸æ¬¾ä¸Šé™ï¼š{ORANGE}{CURRENCY}
+STR_680A_INITIAL_INTEREST_RATE :{LTBLUE}起始利率：{ORANGE}{COMMA}%
+STR_680B_VEHICLE_RUNNING_COSTS :{LTBLUE}é‹å…·ç‡Ÿé‹æ”¯å‡ºï¼š{ORANGE}{STRING}
+STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR :{LTBLUE}競çˆå°æ‰‹ç™¼å±•é€Ÿåº¦ï¼š{ORANGE}{STRING}
+STR_680D_INTELLIGENCE_OF_COMPETITORS :{LTBLUE}競çˆå°æ‰‹æ™ºå•†ï¼š{ORANGE}{STRING}
+STR_680E_VEHICLE_BREAKDOWNS :{LTBLUE}é‹å…·æ•…障率：{ORANGE}{STRING}
+STR_680F_SUBSIDY_MULTIPLIER :{LTBLUE}補助å€çŽ‡ï¼š{ORANGE}{STRING}
+STR_6810_COST_OF_CONSTRUCTION :{LTBLUE}興建費用：{ORANGE}{STRING}
+STR_6811_TERRAIN_TYPE :{LTBLUE}地形種類：{ORANGE}{STRING}
+STR_6812_QUANTITY_OF_SEA_LAKES :{LTBLUE}海/湖比率：{ORANGE}{STRING}
+STR_6813_ECONOMY :{LTBLUE}經濟：{ORANGE}{STRING}
+STR_6814_TRAIN_REVERSING :{LTBLUE}列車倒轉：{ORANGE}{STRING}
+STR_6815_DISASTERS :{LTBLUE}ç½é›£ï¼š{ORANGE}{STRING}
+STR_16816_CITY_APPROVAL :{LTBLUE}市è°æœƒå°å€åŸŸé‡å»ºçš„態度：{ORANGE}{STRING}
############ range for difficulty settings ends
STR_26816_NONE :ç„¡
@@ -2072,7 +2080,7 @@
STR_7002_PLAYER :(玩家 {COMMA})
STR_7004_NEW_FACE :{BLACK}新臉å”
STR_7005_COLOR_SCHEME :{BLACK}é…色
-STR_7006_COLOR_SCHEME :{GOLD}é…色:
+STR_7006_COLOR_SCHEME :{GOLD}é…色：
STR_7007_NEW_COLOR_SCHEME :{WHITE}æ–°é…色
STR_7008_COMPANY_NAME :{BLACK}å…¬å¸å稱
STR_7009_PRESIDENT_NAME :{BLACK}經ç†å§“å
@@ -2098,7 +2106,7 @@
STR_701D_OTHER :{GOLD}其它
STR_701E :{BLACK}-{CURRENCY64}
STR_701F :{BLACK}+{CURRENCY64}
-STR_7020_TOTAL :{WHITE}總計:
+STR_7020_TOTAL :{WHITE}總計：
STR_7021 :{COMPANY}{PLAYERNAME}
STR_7022_INCOME_GRAPH :{WHITE}收入圖
STR_CURRCOMPACT :{CURRCOMPACT64}
@@ -2106,7 +2114,7 @@
STR_7025_OPERATING_PROFIT_GRAPH :{WHITE}營é‹æ益圖
STR_7026_BANK_BALANCE :{WHITE}餘é¡
STR_7027_LOAN :{WHITE}貸款
-STR_MAX_LOAN :{WHITE}貸款上é™: {BLACK}{CURRENCY64}
+STR_MAX_LOAN :{WHITE}貸款上é™:：{BLACK}{CURRENCY64}
STR_7028 :{BLACK}{CURRENCY64}
STR_7029_BORROW :{BLACK}貸款 {SKIP}{SKIP}{SKIP}{SKIP}{CURRENCY}
STR_702A_REPAY :{BLACK}å„Ÿé‚„ {SKIP}{SKIP}{SKIP}{SKIP}{CURRENCY}
@@ -2124,8 +2132,8 @@
STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}å¢žåŠ è²¸æ¬¾
STR_7036_REPAY_PART_OF_LOAN :{BLACK}償還貸款
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(經ç†)
-STR_7038_INAUGURATED :{GOLD}æˆç«‹æ–¼: {WHITE}{NUM}
-STR_7039_VEHICLES :{GOLD}é‹å…·:
+STR_7038_INAUGURATED :{GOLD}æˆç«‹æ–¼ï¼š{WHITE}{NUM}
+STR_7039_VEHICLES :{GOLD}é‹å…·ï¼š
STR_TRAINS :{WHITE}列車 {COMMA} 列
STR_ROAD_VEHICLES :{WHITE}汽車 {COMMA} 輛
STR_AIRCRAFT :{WHITE}{COMMA} 飛機
@@ -2187,7 +2195,7 @@
STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}世界ä¸æ™¯æ°£ï¼{}{}財務專家å°ç¶“æ¿Ÿè•æ¢åšå‡ºæœ€å£žæ‰“ç®—ï¼
STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}景氣回å‡ï¼{}{}湧ç¾çš„訂單讓工æ¥å°ç¶“濟熱絡充滿信心ï¼
STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}切æ›å¤§/å°è¦–窗
-STR_7076_COMPANY_VALUE :{GOLD}å…¬å¸åƒ¹å€¼: {WHITE}{CURRENCY64}
+STR_7076_COMPANY_VALUE :{GOLD}å…¬å¸åƒ¹å€¼ï¼š{WHITE}{CURRENCY64}
STR_7077_BUY_25_SHARE_IN_COMPANY :{BLACK}購買 25% å…¬å¸è‚¡ä»½
STR_7078_SELL_25_SHARE_IN_COMPANY :{BLACK}出售 25% å…¬å¸è‚¡ä»½
STR_7079_BUY_25_SHARE_IN_THIS_COMPANY :{BLACK}購買這間公å¸çš„ 25% 股份
@@ -2499,20 +2507,20 @@
STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}å¸‚æ°‘æ…¶ç¥ . . .{}é¦–è¼›åˆ—è»ŠæŠµé” {STATION}ï¼
STR_8802_DETAILS :{WHITE}{STRING} (詳細資料)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}å‰æ–¹æœ‰åˆ—車
-STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
-STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
+STR_8804 :{SETX 10}{COMMA}：{STRING} {STRING}
+STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}：{STRING} {STRING}
STR_8806_GO_TO :å‰å¾€ {STATION}
STR_8807_GO_TO_TRANSFER :å‰å¾€ {STATION} (轉é‹ï¼Œåƒ…載ä¸å¸)
STR_8808_GO_TO_UNLOAD :å‰å¾€ {STATION} (å¸å®¢è²¨)
STR_8809_GO_TO_TRANSFER_UNLOAD :å‰å¾€ {STATION} (轉é‹ï¼Œå¸å®¢è²¨æ¸…空離站)
-STR_880A_GO_TO_LOAD :å‰å¾€ {STATION} (載貨)
+STR_880A_GO_TO_LOAD :å‰å¾€ {STATION} (滿載)
STR_880B_GO_TO_TRANSFER_LOAD :å‰å¾€ {STATION} (轉é‹ï¼Œç‰å¾…滿載)
STR_880C_GO_NON_STOP_TO :å‰å¾€ {STATION} ä¸åœé /ä¸é€”ä¸åœ
-STR_880D_GO_TO_NON_STOP_TRANSFER :å‰å¾€ {STATION} (轉é‹ï¼Œåƒ…載ä¸å¸) ä¸é€”ä¸åœ
-STR_880E_GO_NON_STOP_TO_UNLOAD :å‰å¾€ {STATION} (å¸å®¢è²¨) ä¸é€”ä¸åœ
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :å‰å¾€ {STATION} (轉é‹ï¼Œå¸å®¢è²¨æ¸…空離站) ä¸é€”ä¸åœ
-STR_8810_GO_NON_STOP_TO_LOAD :å‰å¾€ {STATION} (載貨) ä¸é€”ä¸åœ
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :å‰å¾€ {STATION} (轉é‹ï¼Œç‰å¾…滿載) ä¸é€”ä¸åœ
+STR_880D_GO_TO_NON_STOP_TRANSFER :å‰å¾€ {STATION} (è½‰é‹ [僅載ä¸å¸]) ä¸é€”ä¸åœ
+STR_880E_GO_NON_STOP_TO_UNLOAD :å‰å¾€ {STATION} (å¸è¼‰) ä¸é€”ä¸åœ
+STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :å‰å¾€ {STATION} (è½‰é‹ [å¸è¼‰æ¸…空離站]) ä¸é€”ä¸åœ
+STR_8810_GO_NON_STOP_TO_LOAD :å‰å¾€ {STATION} (滿載) ä¸é€”ä¸åœ
+STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :å‰å¾€ {STATION} (è½‰é‹ [ç‰å¾…滿載]) ä¸é€”ä¸åœ
STR_GO_TO_TRAIN_DEPOT :å‰å¾€ {TOWN} æ©Ÿå»
STR_SERVICE_AT_TRAIN_DEPOT :在 {TOWN} æ©Ÿå» ç¶è·
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :å‰å¾€ {TOWN} æ©Ÿå» ä¸é€”ä¸åœ
@@ -2552,7 +2560,7 @@
STR_8820_RENAME :{BLACK}æ›´å
STR_8823_SKIP :{BLACK}è·³éŽ
STR_8824_DELETE :{BLACK}刪除
-STR_8825_NON_STOP :{BLACK}(ä¸é€”)ä¸åœ
+STR_8825_NON_STOP :{BLACK}ä¸é€”ä¸åœ
STR_8826_GO_TO :{BLACK}å‰å¾€
STR_8827_FULL_LOAD :{BLACK}滿載
STR_8828_UNLOAD :{BLACK}å¸è¼‰
@@ -2564,8 +2572,8 @@
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
STR_SERVICE :{BLACK}ç¶è·
STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}無法購買éµé“車輛...
-STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 購於: {LTBLUE}{NUM}{BLACK} 價值: {LTBLUE}{CURRENCY}
-STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} 價值: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 購於：{LTBLUE}{NUM}{BLACK} 價值：{LTBLUE}{CURRENCY}
+STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} 價值：{LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}æ£åœ¨è£å¸å®¢è²¨
STR_TRAIN_MUST_BE_STOPPED :{WHITE}åˆ—è»Šå¿…é ˆåœåœ¨æ©Ÿå» 内
@@ -2581,8 +2589,8 @@
STR_8839_CAN_T_SELL_RAILROAD_VEHICLE :{WHITE}無法出售éµé“車輛...
STR_883A_UNABLE_TO_FIND_ROUTE_TO :{WHITE}無法找到å‰å¾€é™„è¿‘æ©Ÿå» çš„è·¯å¾‘
STR_883B_CAN_T_STOP_START_TRAIN :{WHITE}無法åœæ¢/啟動列車...
-STR_883C_SERVICING_INTERVAL_DAYS :{BLACK}ç¶è·é–“éš”: {LTBLUE}{COMMA} 天{BLACK} 上次ç¶è·: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT :{BLACK}ç¶è·é–“éš”: {LTBLUE}{COMMA}%{BLACK} 上次ç¶è·: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS :{BLACK}ç¶è·é–“隔：{LTBLUE}{COMMA} 天{BLACK} 上次ç¶è·ï¼š{LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT :{BLACK}ç¶è·é–“隔：{LTBLUE}{COMMA}%{BLACK} 上次ç¶è·ï¼š{LTBLUE}{DATE_LONG}
STR_883D_TRAINS_CLICK_ON_TRAIN_FOR :{BLACK}列車 - 點é¸åˆ—車檢視資訊
STR_883E_BUILD_NEW_TRAINS_REQUIRES :{BLACK}購買新列車 (需è¦éµé“æ©Ÿå» )
STR_883F_TRAINS_CLICK_ON_TRAIN_FOR :{BLACK}列車 - 點é¸åˆ—車檢視資訊，拖放車廂å¯åŠ 掛/解è¯
@@ -2608,18 +2616,18 @@
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}指令清單 - 點é¸æŒ‡ä»¤å¯é¸æ“‡ã€‚æŒ‰ä½ CTRL 點é¸å¯è·³åˆ°è»Šç«™ä½ç½®
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}è·³éŽç›®å‰æŒ‡ä»¤ï¼Œç¹¼çºŒä¸‹å€‹æŒ‡ä»¤
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}刪除é¸å®šæŒ‡ä»¤
-STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}使é¸å®šçš„指令(ä¸é€”)ä¸åœ
+STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}使é¸å®šçš„指令ä¸é€”ä¸åœ
STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}在é¸å®šçš„指令å‰æ’入新指令，或在最後新增指令
STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}讓列車在é¸å®šçš„指令ç‰å¾…載滿
STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}讓列車在é¸å®šçš„指令強制å¸è¼‰
STR_SERVICE_HINT :{BLACK}è·³éŽé€™å€‹æŒ‡ä»¤ï¼Œé™¤éžéœ€è¦ç¶è·
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER :{BLACK}åƒ¹æ ¼: {CURRENCY} é‡é‡: {WEIGHT_S}{}速度: {VELOCITY} 功率: {POWER}{}Running Cost: {CURRENCY}/yr{}Capacity: {CARGO}
+STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER :{BLACK}åƒ¹æ ¼ï¼š{CURRENCY} é‡é‡ï¼š{WEIGHT_S}{}速度：{VELOCITY} 功率：{POWER}{}æ“作æˆæœ¬ï¼š{CURRENCY} / å¹´{}Capacity：{CARGO}
STR_885C_BROKEN_DOWN :{RED}故障
-STR_885D_AGE_RUNNING_COST_YR :{BLACK}使用年數: {LTBLUE}{STRING}{BLACK} 營é‹æ”¯å‡º: {LTBLUE}{CURRENCY}/å¹´
-STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}é‡é‡: {LTBLUE}{WEIGHT_S} {BLACK}功率: {LTBLUE}{POWER}{BLACK} 極速: {LTBLUE}{VELOCITY}
-STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}é‡é‡: {LTBLUE}{WEIGHT_S} {BLACK}功率: {LTBLUE}{POWER}{BLACK} 極速: {LTBLUE}{VELOCITY} {BLACK}最大牽引力: {LTBLUE}{FORCE}
-STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}今年æ益: {LTBLUE}{CURRENCY} (去年: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}å¯é 度: {LTBLUE}{COMMA}% {BLACK}上次ç¶è·å¾Œæ•…障次數: {LTBLUE}{COMMA}
+STR_885D_AGE_RUNNING_COST_YR :{BLACK}使用年數：{LTBLUE}{STRING}{BLACK} 營é‹æ”¯å‡ºï¼š{LTBLUE}{CURRENCY}/å¹´
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}é‡é‡ï¼š{LTBLUE}{WEIGHT_S} {BLACK}功率：{LTBLUE}{POWER}{BLACK} 極速：{LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}é‡é‡ï¼š{LTBLUE}{WEIGHT_S} {BLACK}功率：{LTBLUE}{POWER}{BLACK} 極速：{LTBLUE}{VELOCITY} {BLACK}最大牽引力：{LTBLUE}{FORCE}
+STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}今年æ益：{LTBLUE}{CURRENCY} (去年：{CURRENCY})
+STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}å¯é 度：{LTBLUE}{COMMA}% {BLACK}上次ç¶è·å¾Œæ•…障次數：{LTBLUE}{COMMA}
STR_8861_STOPPED :{RED}åœæ¢
STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL :{WHITE}無法讓列車通éŽéšªé˜»è™ŸèªŒ...
STR_8863_CRASHED :{RED}撞毀ï¼
@@ -2654,12 +2662,12 @@
STR_9007_BUILD_VEHICLE :{BLACK}購買車輛
STR_9009_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}無法購買汽車
STR_900C_DETAILS :{WHITE}{VEHICLE} (詳細資料)
-STR_900D_AGE_RUNNING_COST_YR :{BLACK}使用年數: {LTBLUE}{STRING}{BLACK} 營é‹æ”¯å‡º: {LTBLUE}{CURRENCY}/å¹´
-STR_900E_MAX_SPEED :{BLACK}極速: {LTBLUE}{VELOCITY}
-STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}今年æ益: {LTBLUE}{CURRENCY} (去年: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS :{BLACK}å¯é 度: {LTBLUE}{COMMA}% {BLACK}上次ç¶è·å¾Œæ•…障次數: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 購買於: {LTBLUE}{NUM}{BLACK} 價值: {LTBLUE}{CURRENCY}
-STR_9012_CAPACITY :{BLACK}容é‡: {LTBLUE}{CARGO}
+STR_900D_AGE_RUNNING_COST_YR :{BLACK}使用年數：{LTBLUE}{STRING}{BLACK} 營é‹æ”¯å‡ºï¼š{LTBLUE}{CURRENCY}/å¹´
+STR_900E_MAX_SPEED :{BLACK}極速：{LTBLUE}{VELOCITY}
+STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}今年æ益：{LTBLUE}{CURRENCY} (去年：{CURRENCY})
+STR_9010_RELIABILITY_BREAKDOWNS :{BLACK}å¯é 度：{LTBLUE}{COMMA}% {BLACK}上次ç¶è·å¾Œæ•…障次數：{LTBLUE}{COMMA}
+STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 購買於：{LTBLUE}{NUM}{BLACK} 價值：{LTBLUE}{CURRENCY}
+STR_9012_CAPACITY :{BLACK}容é‡ï¼š{LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}...å¿…é ˆåœåœ¨æ±½è»Šåº«å†…
STR_9014_CAN_T_SELL_ROAD_VEHICLE :{WHITE}無法出售汽車...
STR_9015_CAN_T_STOP_START_ROAD_VEHICLE :{WHITE}無法åœæ¢/起動汽車...
@@ -2684,7 +2692,7 @@
STR_9025_CENTER_MAIN_VIEW_ON_ROAD :{BLACK}將主視野移到車庫ä½ç½®
STR_9026_ROAD_VEHICLE_SELECTION :{BLACK}汽車清單 - 點é¸æ±½è»Šå¯çœ‹åˆ°è©³ç´°è³‡è¨Š
STR_9027_BUILD_THE_HIGHLIGHTED_ROAD :{BLACK}購買é¸å®šçš„汽車
-STR_902A_COST_SPEED_RUNNING_COST :{BLACK}åƒ¹æ ¼: {CURRENCY}{}速度: {VELOCITY}{}營é‹è²»ç”¨: {CURRENCY}/å¹´{}容é‡: {CARGO}
+STR_902A_COST_SPEED_RUNNING_COST :{BLACK}åƒ¹æ ¼ï¼š{CURRENCY}{}速度：{VELOCITY}{}營é‹è²»ç”¨ï¼š{CURRENCY}/å¹´{}容é‡ï¼š{CARGO}
STR_902C_NAME_ROAD_VEHICLE :{WHITE}命å汽車
STR_902D_CAN_T_NAME_ROAD_VEHICLE :{WHITE}無法命å汽車...
@@ -2726,12 +2734,12 @@
STR_980E_SHIP_IN_THE_WAY :{WHITE}å‰æ–¹æœ‰èˆ¹èˆ¶
STR_980F :{WHITE}{VEHICLE}
STR_9811_DETAILS :{WHITE}{VEHICLE} (詳細資料)
-STR_9812_AGE_RUNNING_COST_YR :{BLACK}使用年數: {LTBLUE}{STRING}{BLACK} 營é‹æ”¯å‡º: {LTBLUE}{CURRENCY}/å¹´
-STR_9813_MAX_SPEED :{BLACK}極速: {LTBLUE}{VELOCITY}
-STR_9814_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}今年æ益: {LTBLUE}{CURRENCY} (去年: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS :{BLACK}å¯é 度: {LTBLUE}{COMMA}% {BLACK}上次ç¶è·å¾Œæ•…障次數: {LTBLUE}{COMMA}
-STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 購買於: {LTBLUE}{NUM}{BLACK} 價值: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY :{BLACK}容é‡: {LTBLUE}{CARGO}
+STR_9812_AGE_RUNNING_COST_YR :{BLACK}使用年數：{LTBLUE}{STRING}{BLACK} 營é‹æ”¯å‡ºï¼š{LTBLUE}{CURRENCY}/å¹´
+STR_9813_MAX_SPEED :{BLACK}極速：{LTBLUE}{VELOCITY}
+STR_9814_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}今年æ益：{LTBLUE}{CURRENCY} (去年：{CURRENCY})
+STR_9815_RELIABILITY_BREAKDOWNS :{BLACK}å¯é 度：{LTBLUE}{COMMA}% {BLACK}上次ç¶è·å¾Œæ•…障次數：{LTBLUE}{COMMA}
+STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 購買於：{LTBLUE}{NUM}{BLACK} 價值：{LTBLUE}{CURRENCY}
+STR_9817_CAPACITY :{BLACK}容é‡ï¼š{LTBLUE}{CARGO}
STR_9818_CAN_T_STOP_START_SHIP :{WHITE}無法åœæ¢/起動船舶...
STR_9819_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}無法將船舶é€åˆ°èˆ¹å¡¢...
STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}找ä¸åˆ°é™„近的船塢
@@ -2755,7 +2763,7 @@
STR_9829_CENTER_MAIN_VIEW_ON_SHIP :{BLACK}將主視窗移到船舶ä½ç½®
STR_982A_SEND_SHIP_TO_DEPOT :{BLACK}將船舶é€å¾€èˆ¹å¡¢ã€‚æŒ‰ä½ CTRL 點é¸å‰‡åªåšç¶è·
STR_982B_SHOW_SHIP_DETAILS :{BLACK}顯示船舶詳細資料
-STR_982E_COST_MAX_SPEED_CAPACITY :{BLACK}åƒ¹æ ¼: {CURRENCY} 極速: {VELOCITY}{}容é‡: {CARGO}{}營é‹æ”¯å‡º: {CURRENCY}/å¹´
+STR_982E_COST_MAX_SPEED_CAPACITY :{BLACK}åƒ¹æ ¼ï¼š{CURRENCY} 極速：{VELOCITY}{}容é‡ï¼š{CARGO}{}營é‹æ”¯å‡ºï¼š{CURRENCY}/å¹´
STR_982F_NAME_SHIP :{BLACK}命å船舶
STR_9831_NAME_SHIP :{WHITE}命å船舶
@@ -2772,8 +2780,8 @@
STR_983C_REFIT_SHIP :{BLACK}改è£èˆ¹èˆ¶
STR_983D_SELECT_TYPE_OF_CARGO_FOR :{BLACK}é¸æ“‡è¦è®“船舶é‹è¼¸çš„酬載種類
STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED :{BLACK}改è£èˆ¹èˆ¶ä»¥é‹è¼¸é¸å®šçš„酬載
-STR_983F_SELECT_CARGO_TYPE_TO_CARRY :{GOLD}é¸æ“‡è¦é‹è¼¸çš„酬載種類:
-STR_9840_NEW_CAPACITY_COST_OF_REFIT :{BLACK}新容é‡: {GOLD}{CARGO}{}{BLACK}改è£è²»ç”¨: {GOLD}{CURRENCY}
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY :{GOLD}é¸æ“‡è¦é‹è¼¸çš„酬載種類：
+STR_9840_NEW_CAPACITY_COST_OF_REFIT :{BLACK}新容é‡ï¼š{GOLD}{CARGO}{}{BLACK}改è£è²»ç”¨ï¼š{GOLD}{CURRENCY}
STR_9841_CAN_T_REFIT_SHIP :{WHITE}無法改è£èˆ¹èˆ¶...
STR_9842_REFITTABLE :(å¯æ”¹è£)
STR_GO_TO_SHIP_DEPOT :å‰å¾€ {TOWN} 船塢
@@ -2794,11 +2802,11 @@
STR_A00A :{WHITE}{VEHICLE}
STR_A00B_ORDERS :{WHITE}{VEHICLE} (指令)
STR_A00C_DETAILS :{WHITE}{VEHICLE} (詳細資料)
-STR_A00D_AGE_RUNNING_COST_YR :{BLACK}使用年數: {LTBLUE}{STRING}{BLACK} 營é‹æ”¯å‡º: {LTBLUE}{CURRENCY}/å¹´
-STR_A00E_MAX_SPEED :{BLACK}極速: {LTBLUE}{VELOCITY}
-STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}今年æ益: {LTBLUE}{CURRENCY} (去年: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS :{BLACK}å¯é 度: {LTBLUE}{COMMA}% {BLACK}上次ç¶è·å¾Œæ•…障次數: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 購買於: {LTBLUE}{NUM}{BLACK} 價值: {LTBLUE}{CURRENCY}
+STR_A00D_AGE_RUNNING_COST_YR :{BLACK}使用年數：{LTBLUE}{STRING}{BLACK} 營é‹æ”¯å‡ºï¼š{LTBLUE}{CURRENCY}/å¹´
+STR_A00E_MAX_SPEED :{BLACK}極速：{LTBLUE}{VELOCITY}
+STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}今年æ益：{LTBLUE}{CURRENCY} (去年：{CURRENCY})
+STR_A010_RELIABILITY_BREAKDOWNS :{BLACK}å¯é 度：{LTBLUE}{COMMA}% {BLACK}上次ç¶è·å¾Œæ•…障次數：{LTBLUE}{COMMA}
+STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} 購買於：{LTBLUE}{NUM}{BLACK} 價值：{LTBLUE}{CURRENCY}
STR_A012_CAN_T_SEND_AIRCRAFT_TO :{WHITE}無法將飛機é€å›žæ©Ÿæ£š...
STR_HEADING_FOR_HANGAR :{ORANGE}æ£å‰å¾€ {STATION} 機棚
STR_HEADING_FOR_HANGAR_VEL :{ORANGE}æ£å‰å¾€ {STATION} 機棚, {VELOCITY}
@@ -2808,8 +2816,8 @@
STR_A015_AIRCRAFT_IN_THE_WAY :{WHITE}å‰æ–¹æœ‰é£›æ©Ÿ
STR_A016_CAN_T_STOP_START_AIRCRAFT :{WHITE}無法åœæ¢/起動飛機...
STR_A017_AIRCRAFT_IS_IN_FLIGHT :{WHITE}飛機æ£åœ¨é£›è¡Œä¸
-STR_A019_CAPACITY :{BLACK}容é‡: {LTBLUE}{CARGO}, {CARGO}
-STR_A01A_CAPACITY :{BLACK}容é‡: {LTBLUE}{CARGO}
+STR_A019_CAPACITY :{BLACK}容é‡ï¼š{LTBLUE}{CARGO}, {CARGO}
+STR_A01A_CAPACITY :{BLACK}容é‡ï¼š{LTBLUE}{CARGO}
STR_A01B_AIRCRAFT_MUST_BE_STOPPED :{WHITE}é£›æ©Ÿå¿…é ˆåœåœ¨æ©Ÿæ£šå†…
STR_A01C_CAN_T_SELL_AIRCRAFT :{WHITE}無法出售飛機...
STR_A01D_AIRPORT_CONSTRUCTION :å»ºé€ æ©Ÿå ´
@@ -2827,7 +2835,7 @@
STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT :{BLACK}將主視野帶到飛機ä½ç½®
STR_A02A_SEND_AIRCRAFT_TO_HANGAR :{BLACK}將飛機é€åˆ°æ©Ÿæ£šã€‚æŒ‰ä½ CTRL 點é¸å‰‡åªåšç¶è·
STR_A02B_SHOW_AIRCRAFT_DETAILS :{BLACK}顯示飛機詳細資料
-STR_A02E_COST_MAX_SPEED_CAPACITY :{BLACK}åƒ¹æ ¼: {CURRENCY} 極速: {VELOCITY}{}容é‡: 乘客 {COMMA} å，郵件 {COMMA} 袋{}營é‹æ”¯å‡º: {CURRENCY}/å¹´
+STR_A02E_COST_MAX_SPEED_CAPACITY :{BLACK}åƒ¹æ ¼ï¼š{CURRENCY} 極速：{VELOCITY}{}容é‡ï¼šä¹˜å®¢ {COMMA} å，郵件 {COMMA} 袋{}營é‹æ”¯å‡ºï¼š{CURRENCY}/å¹´
STR_A030_NAME_AIRCRAFT :{WHITE}命å飛機
STR_A031_CAN_T_NAME_AIRCRAFT :{WHITE}無法命å飛機
@@ -2845,11 +2853,11 @@
STR_A03D_REFIT_AIRCRAFT :{BLACK}改è£é£›æ©Ÿ
STR_A03E_SELECT_TYPE_OF_CARGO_FOR :{BLACK}é¸æ“‡è¦è®“飛機é‹é€çš„酬載
STR_A03F_REFIT_AIRCRAFT_TO_CARRY :{BLACK}改è£é£›æ©Ÿä»¥é‹é€é¸å®šçš„酬載
-STR_A040_SELECT_CARGO_TYPE_TO_CARRY :{GOLD}é¸æ“‡è¦é‹é€çš„酬載種類:
-STR_A041_NEW_CAPACITY_COST_OF_REFIT :{BLACK}新容é‡: {GOLD}{STRING}{}{BLACK}改è£è²»ç”¨: {GOLD}{CURRENCY}
+STR_A040_SELECT_CARGO_TYPE_TO_CARRY :{GOLD}é¸æ“‡è¦é‹é€çš„酬載種類：
+STR_A041_NEW_CAPACITY_COST_OF_REFIT :{BLACK}新容é‡ï¼š{GOLD}{STRING}{}{BLACK}改è£è²»ç”¨ï¼š{GOLD}{CURRENCY}
STR_A042_CAN_T_REFIT_AIRCRAFT :{WHITE}無法改è£é£›æ©Ÿ...
STR_GO_TO_AIRPORT_HANGAR :å‰å¾€ {STATION} 機棚
-SERVICE_AT_AIRPORT_HANGAR :在{STATION}飛機庫進行ç¶ä¿®
+SERVICE_AT_AIRPORT_HANGAR :在{STATION}機棚進行檢修
##id 0xB000
STR_B000_ZEPPELIN_DISASTER_AT :{BLACK}{BIGFONT}{STATION} 發生飛船ç½é›£ï¼
@@ -2862,7 +2870,7 @@
STR_BRIBE_FAILED :{WHITE}您嘗試行賄的舉動
STR_BRIBE_FAILED_2 :{WHITE}已經被調查員發ç¾
-STR_BUILD_DATE :{BLACK}建於: {LTBLUE}{DATE_LONG}
+STR_BUILD_DATE :{BLACK}建於：{LTBLUE}{DATE_LONG}
STR_PERFORMANCE_DETAIL :{WHITE}詳細效率評比
STR_PERFORMANCE_DETAIL_KEY :{BLACK}詳細資料
@@ -2871,16 +2879,16 @@
STR_PERFORMANCE_DETAIL_PERCENT :{WHITE}{NUM}%
SET_PERFORMANCE_DETAIL_INT :{BLACK}{NUM}
############ Those following lines need to be in this order!!
-STR_PERFORMANCE_DETAIL_VEHICLES :{BLACK}é‹å…·:
-STR_PERFORMANCE_DETAIL_STATIONS :{BLACK}車站:
-STR_PERFORMANCE_DETAIL_MIN_PROFIT :{BLACK}最低æ益:
-STR_PERFORMANCE_DETAIL_MIN_INCOME :{BLACK}最低收入:
-STR_PERFORMANCE_DETAIL_MAX_INCOME :{BLACK}最高收入:
-STR_PERFORMANCE_DETAIL_DELIVERED :{BLACK}é‹é€äº†:
-STR_PERFORMANCE_DETAIL_CARGO :{BLACK}酬載:
-STR_PERFORMANCE_DETAIL_MONEY :{BLACK}錢:
-STR_PERFORMANCE_DETAIL_LOAN :{BLACK}貸款:
-STR_PERFORMANCE_DETAIL_TOTAL :{BLACK}總計:
+STR_PERFORMANCE_DETAIL_VEHICLES :{BLACK}é‹å…·ï¼š
+STR_PERFORMANCE_DETAIL_STATIONS :{BLACK}站點：
+STR_PERFORMANCE_DETAIL_MIN_PROFIT :{BLACK}最低æ益：
+STR_PERFORMANCE_DETAIL_MIN_INCOME :{BLACK}最低收入：
+STR_PERFORMANCE_DETAIL_MAX_INCOME :{BLACK}最高收入：
+STR_PERFORMANCE_DETAIL_DELIVERED :{BLACK}å·²é‹é€ï¼š
+STR_PERFORMANCE_DETAIL_CARGO :{BLACK}酬載：
+STR_PERFORMANCE_DETAIL_MONEY :{BLACK}資金：
+STR_PERFORMANCE_DETAIL_LOAN :{BLACK}貸款：
+STR_PERFORMANCE_DETAIL_TOTAL :{BLACK}總計：
############ End of order list
STR_PERFORMANCE_DETAIL_VEHICLES_TIP :{BLACK}é‹å…·æ•¸é‡ï¼›é€™åŒ…å«æ±½è»Šã€éµé“ã€èˆ¹èˆ¶èˆ‡é£›æ©Ÿ
STR_PERFORMANCE_DETAIL_STATIONS_TIP :{BLACK}車站部分的數é‡ã€‚æ¯éƒ¨ä»½è»Šç«™ (ç«è»Šç«™ï¼Œå…¬è»Šç«™ï¼Œæ©Ÿå ´) 都算在内，就算連在一起亦然
@@ -2899,19 +2907,19 @@
STR_NEWGRF_SET_PARAMETERS :{BLACK}è¨å®šåƒæ•¸
STR_NEWGRF_TIP :{BLACK}列出所有您安è£çš„ NewGRF 組。點é¸ä»¥ä¿®æ”¹è¨å®š
STR_NEWGRF_NO_FILES_INSTALLED :{BLACK}ç›®å‰æ²’æœ‰å®‰è£ NewGRF 檔ï¼è«‹åƒè€ƒèªªæ˜Žæ–‡ä»¶é—œæ–¼å®‰è£æ–°åœ–片的部份
-STR_NEWGRF_FILENAME :{BLACK}檔å: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID :{BLACK}GRF 編號: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM :{BLACK}MD5 雜湊值: {SILVER}{STRING}
+STR_NEWGRF_FILENAME :{BLACK}檔å：{SILVER}{STRING}
+STR_NEWGRF_GRF_ID :{BLACK}GRF 編號：{SILVER}{STRING}
+STR_NEWGRF_MD5SUM :{BLACK}MD5 雜湊值：{SILVER}{STRING}
STR_NEWGRF_CONFIRMATION_TEXT :{YELLOW}您æ£æº–備修改進行ä¸çš„éŠæˆ²ï¼›é€™å¯èƒ½ä½¿ OpenTTD 當掉。{}您絕å°ç¢ºå®šè¦é€™éº¼åšå—Žï¼Ÿ
STR_NEWGRF_ERROR_MSG_INFO :{SILVER}{STRING}
-STR_NEWGRF_ERROR_MSG_WARNING :{RED}è¦å‘Š: {SILVER}{STRING}
-STR_NEWGRF_ERROR_MSG_ERROR :{RED}錯誤: {SILVER}{STRING}
-STR_NEWGRF_ERROR_MSG_FATAL :{RED}åš´é‡éŒ¯èª¤: {SILVER}{STRING}
+STR_NEWGRF_ERROR_MSG_WARNING :{RED}è¦å‘Šï¼š{SILVER}{STRING}
+STR_NEWGRF_ERROR_MSG_ERROR :{RED}錯誤：{SILVER}{STRING}
+STR_NEWGRF_ERROR_MSG_FATAL :{RED}åš´é‡éŒ¯èª¤ï¼š{SILVER}{STRING}
STR_NEWGRF_ERROR_VERSION_NUMBER :已知 {STRING} è·Ÿ TTDPatch 版本ä¸åˆã€‚
STR_NEWGRF_ERROR_DOS_OR_WINDOWS :{STRING} åªé©åˆç”¨æ–¼ TTD 版本 {STRING}
STR_NEWGRF_ERROR_UNSET_SWITCH :{STRING} å¿…é ˆè·Ÿ {STRING} 一起使用
-STR_NEWGRF_ERROR_INVALID_PARAMETER : {STRING} çš„åƒæ•¸ç„¡æ•ˆ: {STRING} ({NUM})
+STR_NEWGRF_ERROR_INVALID_PARAMETER : {STRING} çš„åƒæ•¸ç„¡æ•ˆï¼š{STRING} ({NUM})
STR_NEWGRF_ERROR_LOAD_BEFORE :è¼‰å…¥å‰ {1:STRING} å¿…é ˆå…ˆè¼‰å…¥ {0:STRING}。
STR_NEWGRF_ERROR_LOAD_AFTER :{STRING} å¿…é ˆåœ¨ {STRING} 之後載入。
STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE :GRF 檔案翻è¯å¾Œå‡ºç¾éŒ¯èª¤
@@ -2925,7 +2933,7 @@
STR_NEWGRF_MOVEDOWN :{BLACK}下移
STR_NEWGRF_MOVEDOWN_TIP :{BLACK}å°‡é¸å®šçš„ NewGRF 檔案往清單下方移動
STR_NEWGRF_FILE_TIP :{BLACK}列出已安è£çš„ NewGRF 檔案。點é¸æª”案以修改è¨å®šã€‚
-STR_NEWGRF_PARAMETER :{BLACK}åƒæ•¸: {SILVER}{STRING}
+STR_NEWGRF_PARAMETER :{BLACK}åƒæ•¸ï¼š{SILVER}{STRING}
STR_NEWGRF_PARAMETER_QUERY :{BLACK}輸入 NewGRF åƒæ•¸
STR_NEWGRF_NO_INFO :{BLACK}沒有相關資訊
@@ -2934,7 +2942,7 @@
STR_NEWGRF_ADD_FILE_TIP :{BLACK}å°‡é¸å®šçš„ NewGRF åŠ å…¥ç›®å‰é…ç½®
STR_NEWGRF_RESCAN_FILES :{BLACK}é‡æ–°æŽƒæ檔案
STR_NEWGRF_RESCAN_FILES_TIP :{BLACK}æ›´æ–°å¯ç”¨çš„ NewGRF 檔案清單
-STR_NEWGRF_DUPLICATE_GRFID :{WHITE}無法新增檔案: GRF ID é‡è¤‡
+STR_NEWGRF_DUPLICATE_GRFID :{WHITE}無法新增檔案：GRF ID é‡è¤‡
STR_NEWGRF_NOT_FOUND :{RED}找ä¸åˆ°ç¬¦åˆçš„檔案
STR_NEWGRF_DISABLED :{RED}關閉
@@ -2945,13 +2953,13 @@
STR_NEWGRF_NOT_FOUND_WARNING :{WHITE}找ä¸åˆ°è¼‰å…¥éŠæˆ²æ‰€éœ€çš„ GRF 檔案
STR_CURRENCY_WINDOW :{WHITE}自訂幣值
-STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}匯率: {ORANGE}{CURRENCY} = £ {COMMA}
-STR_CURRENCY_SEPARATOR :{LTBLUE}分隔符號:
-STR_CURRENCY_PREFIX :{LTBLUE}å‰ç½®:
-STR_CURRENCY_SUFFIX :{LTBLUE}後置:
-STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}改用æå…ƒ: {ORANGE}{NUM}
-STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}改用æå…ƒ: {ORANGE}æ°¸ä¸æ”¹ç”¨
-STR_CURRENCY_PREVIEW :{LTBLUE}é 覽: {ORANGE}{CURRENCY}
+STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}匯率：{ORANGE}{CURRENCY} = £ {COMMA}
+STR_CURRENCY_SEPARATOR :{LTBLUE}分隔符號：
+STR_CURRENCY_PREFIX :{LTBLUE}å‰ç½®ï¼š
+STR_CURRENCY_SUFFIX :{LTBLUE}後置：
+STR_CURRENCY_SWITCH_TO_EURO :{LTBLUE}改用æ元：{ORANGE}{NUM}
+STR_CURRENCY_SWITCH_TO_EURO_NEVER :{LTBLUE}改用æ元：{ORANGE}æ°¸ä¸æ”¹ç”¨
+STR_CURRENCY_PREVIEW :{LTBLUE}é 覽：{ORANGE}{CURRENCY}
STR_CURRENCY_CHANGE_PARAMETER :{BLACK}變更自訂幣值åƒæ•¸
STR_TRAIN :{BLACK}{TRAIN}
@@ -3008,9 +3016,9 @@
STR_REPLACE_HELP_RAILTYPE :{BLACK}é¸æ“‡æ‚¨è¦å–代車é 的軌é“é¡žåž‹
STR_REPLACE_HELP_REPLACE_INFO_TAB :{BLACK}顯示左方的車é è¦æ›¿æ›æˆå“ªç¨®è»Šé
STR_REPLACE_HELP :{BLACK}這讓您å¯åœ¨åˆ—è»Šé€²å…¥æ©Ÿå» çš„æ™‚å€™ï¼Œç”¨ä¸€ç¨®è»Šé å–代å¦ä¸€ç¨®è»Šé
-STR_REPLACE_REMOVE_WAGON :{BLACK}移除車廂: {ORANGE}{SKIP}{STRING}
+STR_REPLACE_REMOVE_WAGON :{BLACK}移除載具：{ORANGE}{SKIP}{STRING}
STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}如果替æ›å¾Œçš„車廂較長的話，讓自動替æ›åŠŸèƒ½ç§»é™¤è»Šå»‚ (從é 開始) 以便ç¶æŒåˆ—車長度。
-STR_REPLACE_ENGINE_WAGON_SELECT :{BLACK}å–代: {ORANGE}{SKIP}{SKIP}{STRING}
+STR_REPLACE_ENGINE_WAGON_SELECT :{BLACK}å–代：{ORANGE}{SKIP}{SKIP}{STRING}
STR_REPLACE_ENGINE_WAGON_SELECT_HELP :{BLACK} 實驗功能 {}在車é 與車廂å–代畫é¢ä¹‹é–“切æ›ã€‚{}車廂å–代åªæœ‰åœ¨æ–°è»Šå»‚能改è£é‹é€èˆŠè»Šå»‚酬載的時候æ‰æœƒåŸ·è¡Œã€‚æ¯å€‹è»Šå»‚都會進行一次檢查。
STR_RAIL_VEHICLE_NOT_AVAILABLE :{WHITE}載具已經åœç”¢
STR_ROAD_VEHICLE_NOT_AVAILABLE :{WHITE}車輛已經åœç”¢
@@ -3049,22 +3057,22 @@
STR_TINY_BLACK :{BLACK}{TINYFONT}{COMMA}
-STR_PURCHASE_INFO_COST_WEIGHT :{BLACK}åƒ¹æ ¼: {GOLD}{CURRENCY}{BLACK} é‡é‡: {GOLD}{WEIGHT_S}
-STR_PURCHASE_INFO_SPEED_POWER :{BLACK}速度: {GOLD}{VELOCITY}{BLACK} 功率: {GOLD}{POWER}
-STR_PURCHASE_INFO_SPEED :{BLACK}速度: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_RUNNINGCOST :{BLACK}營é‹æ”¯å‡º: {GOLD}{CURRENCY}/å¹´
-STR_PURCHASE_INFO_CAPACITY :{BLACK}容é‡: {GOLD}{CARGO} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE :{BLACK}è¨è¨ˆå¹´ä»½: {GOLD}{NUM}{BLACK} 壽命: {GOLD}{COMMA} å¹´
-STR_PURCHASE_INFO_RELIABILITY :{BLACK}最大å¯é 度: {GOLD}{COMMA}%
-STR_PURCHASE_INFO_COST :{BLACK}åƒ¹æ ¼: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}é‡é‡: {GOLD}{WEIGHT_S} ({WEIGHT_S})
-STR_PURCHASE_INFO_COST_SPEED :{BLACK}åƒ¹æ ¼: {GOLD}{CURRENCY}{BLACK} 速度: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}容é‡: {GOLD}乘客 {COMMA} 人, 郵件 {COMMA} 袋
-STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}動力車廂: {GOLD}+{POWER}{BLACK} é‡é‡: {GOLD}+{WEIGHT_S}
-STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}å¯æ”¹é€ æˆ: {GOLD}
+STR_PURCHASE_INFO_COST_WEIGHT :{BLACK}åƒ¹æ ¼ï¼š{GOLD}{CURRENCY}{BLACK} é‡é‡ï¼š{GOLD}{WEIGHT_S}
+STR_PURCHASE_INFO_SPEED_POWER :{BLACK}速度：{GOLD}{VELOCITY}{BLACK} 功率：{GOLD}{POWER}
+STR_PURCHASE_INFO_SPEED :{BLACK}速度：{GOLD}{VELOCITY}
+STR_PURCHASE_INFO_RUNNINGCOST :{BLACK}營é‹æ”¯å‡ºï¼š{GOLD}{CURRENCY} / å¹´
+STR_PURCHASE_INFO_CAPACITY :{BLACK}容é‡ï¼š{GOLD}{CARGO} {STRING}
+STR_PURCHASE_INFO_DESIGNED_LIFE :{BLACK}è¨è¨ˆå¹´ä»½ï¼š{GOLD}{NUM}{BLACK} 使用年é™ï¼š{GOLD}{COMMA} å¹´
+STR_PURCHASE_INFO_RELIABILITY :{BLACK}最大å¯é 度：{GOLD}{COMMA}%
+STR_PURCHASE_INFO_COST :{BLACK}åƒ¹æ ¼ï¼š{GOLD}{CURRENCY}
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}é‡é‡ï¼š{GOLD}{WEIGHT_S} ({WEIGHT_S})
+STR_PURCHASE_INFO_COST_SPEED :{BLACK}åƒ¹æ ¼ï¼š{GOLD}{CURRENCY}{BLACK} 速度：{GOLD}{VELOCITY}
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY :{BLACK}容é‡ï¼š{GOLD}乘客 {COMMA} 人，郵件 {COMMA} 袋
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT :{BLACK}動力車廂：{GOLD}+{POWER}{BLACK} é‡é‡ï¼š{GOLD}+{WEIGHT_S}
+STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}å¯æ”¹è£æˆï¼š{GOLD}
STR_PURCHASE_INFO_ALL_TYPES :所有酬載類型
STR_PURCHASE_INFO_ALL_BUT :{GOLD} 以外皆å¯
-STR_PURCHASE_INFO_MAX_TE :{BLACK}最大牽引力: {GOLD}{FORCE}
+STR_PURCHASE_INFO_MAX_TE :{BLACK}最大牽引力：{GOLD}{FORCE}
########### String for New Landscape Generator
@@ -3072,18 +3080,18 @@
STR_RANDOM :{BLACK}亂數化
STR_RANDOM_HELP :{BLACK}改變產生地形的亂數種å
STR_WORLD_GENERATION_CAPTION :{WHITE}產生世界
-STR_RANDOM_SEED :{BLACK}亂數種å:
+STR_RANDOM_SEED :{BLACK}亂數種å：
STR_RANDOM_SEED_HELP :{BLACK}點é¸å¯è¼¸å…¥äº‚數種å
STR_LAND_GENERATOR :{BLACK}地形產生器
-STR_TREE_PLACER :{BLACK}æ¤æ¨¹æ¼”算法:
-STR_HEIGHTMAP_ROTATION :{BLACK}高度圖旋轉:
-STR_TERRAIN_TYPE :{BLACK}地形種類:
-STR_QUANTITY_OF_SEA_LAKES :{BLACK}æµ·å¹³é¢:
-STR_SMOOTHNESS :{BLACK}平滑度:
-STR_SNOW_LINE_HEIGHT :{BLACK}雪線高度:
-STR_DATE :{BLACK}日期:
-STR_NUMBER_OF_TOWNS :{BLACK}城鎮數é‡:
-STR_NUMBER_OF_INDUSTRIES :{BLACK}å·¥æ¥æ•¸é‡:
+STR_TREE_PLACER :{BLACK}æ¤æ¨¹æ¼”算法：
+STR_HEIGHTMAP_ROTATION :{BLACK}高度圖旋轉：
+STR_TERRAIN_TYPE :{BLACK}地形種類：
+STR_QUANTITY_OF_SEA_LAKES :{BLACK}æµ·å¹³é¢ï¼š
+STR_SMOOTHNESS :{BLACK}平滑度：
+STR_SNOW_LINE_HEIGHT :{BLACK}雪線高度：
+STR_DATE :{BLACK}日期：
+STR_NUMBER_OF_TOWNS :{BLACK}城鎮數é‡ï¼š
+STR_NUMBER_OF_INDUSTRIES :{BLACK}å·¥æ¥æ•¸é‡ï¼š
STR_GENERATE_DATE :{BLACK}{DATE_LONG}
STR_SNOW_LINE_UP :{BLACK}å°‡é›ªç·šé«˜åº¦ä¸Šç§»ä¸€æ ¼
STR_SNOW_LINE_DOWN :{BLACK}å°‡é›ªç·šé«˜åº¦ä¸‹ç§»ä¸€æ ¼
@@ -3092,8 +3100,8 @@
STR_HEIGHTMAP_SCALE_WARNING_CAPTION :{WHITE}縮放è¦å‘Š
STR_HEIGHTMAP_SCALE_WARNING_MESSAGE :{YELLOW}ä¸å»ºè°éŽåº¦ç¸®æ”¾åœ°åœ–。繼續產生？
STR_SNOW_LINE_HEIGHT_NUM :{NUM}
-STR_HEIGHTMAP_NAME :{BLACK}高度圖å稱:
-STR_HEIGHTMAP_SIZE :{BLACK}大å°: {ORANGE}{NUM} x {NUM}
+STR_HEIGHTMAP_NAME :{BLACK}高度圖å稱：
+STR_HEIGHTMAP_SIZE :{BLACK}大å°ï¼š{ORANGE}{NUM} x {NUM}
STR_GENERATION_WORLD :{WHITE}æ£åœ¨ç”¢ç”Ÿä¸–ç•Œ...
STR_GENERATION_ABORT :{BLACK}放棄
STR_GENERATION_ABORT_CAPTION :{WHITE}放棄產生地形
@@ -3116,7 +3124,7 @@
STR_FLAT_WORLD_HEIGHT_DOWN :{BLACK}將平地高度下移一層
STR_FLAT_WORLD_HEIGHT_UP :{BLACK}å°‡å¹³åœ°é«˜åº¦ä¸Šç§»ä¸€æ ¼
STR_FLAT_WORLD_HEIGHT_QUERY_CAPT :{WHITE}修改平地高度
-STR_FLAT_WORLD_HEIGHT :{BLACK}平地高度:
+STR_FLAT_WORLD_HEIGHT :{BLACK}平地高度：
STR_FLAT_WORLD_HEIGHT_NUM :{NUM}
STR_SMALLMAP_CENTER :{BLACK}å°‡å°åœ°åœ–移到目å‰åœ°é»žä½ç½®
@@ -3139,10 +3147,10 @@
############ Tooltip measurment
-STR_MEASURE_LENGTH :{BLACK}長度: {NUM}
-STR_MEASURE_AREA :{BLACK}å€åŸŸ: {NUM} x {NUM}
-STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}長度: {NUM}{}高度差: {NUM} m
-STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}å€åŸŸ: {NUM} x {NUM}{}高度差: {NUM} m
+STR_MEASURE_LENGTH :{BLACK}長度：{NUM}
+STR_MEASURE_AREA :{BLACK}å€åŸŸï¼š{NUM} x {NUM}
+STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}長度：{NUM}{}高度差：{NUM} m
+STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}å€åŸŸï¼š{NUM} x {NUM}{}高度差：{NUM} m
############ Date formatting
STR_DATE_TINY :{STRING}-{STRING}-{NUM}
@@ -3151,7 +3159,7 @@
########
-STR_FEEDER_CARGO_VALUE :{BLACK}轉é‹é€²å¸³: {LTBLUE}{CURRENCY}
+STR_FEEDER_CARGO_VALUE :{BLACK}轉é‹é€²å¸³ï¼š{LTBLUE}{CURRENCY}
STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...æ¤è·¯æ®µç‚ºå¸‚鎮所有
STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...æ¤è·¯é¢å‘錯誤的方å‘
--- a/src/lang/ukrainian.txt Tue Jun 12 11:56:35 2007 +0000
+++ b/src/lang/ukrainian.txt Wed Jun 13 11:00:24 2007 +0000
@@ -1261,6 +1261,14 @@
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :Праворуч
STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Ð Ð°Ð´Ñ–ÑƒÑ Ð¿Ñ€Ð¸Ð»Ð¸Ð¿Ð°Ð½Ð½Ñ Ð²Ñ–ÐºÐ¾Ð½: {ORANGE}{STRING} пікÑ.
STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}ÐŸÑ€Ð¸Ð»Ð¸Ð¿Ð°Ð½Ð½Ñ Ð²Ñ–ÐºÐ¾Ð½ {ORANGE}вимкнено
+STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}ШвидкіÑÑ‚ÑŒ роÑту міÑта: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :не роÑте
+STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :повільна
+STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :нормальна
+STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :швидка
+STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :дуже швидка
+STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}КількіÑÑ‚ÑŒ міÑÑ‚, Ñкі будуть роÑти вдвічі швидше: {ORANGE}1 з {STRING}
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}КількіÑÑ‚ÑŒ міÑÑ‚, Ñкі будуть роÑти вдвічі швидше: {ORANGE}нема
STR_CONFIG_PATCHES_GUI :{BLACK}ВиглÑд
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}Споруди
--- a/src/main_gui.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/main_gui.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -51,7 +51,7 @@
static byte _terraform_size = 1;
RailType _last_built_railtype;
-static int _scengen_town_size = 2; // depress medium-sized towns per default
+static int _scengen_town_size = 1; // depress medium-sized towns per default
extern void GenerateIndustries();
extern bool GenerateTowns();
@@ -1247,7 +1247,8 @@
/** Callback function for the scenario editor 'reset landscape' confirmation window
- * @param yes_clicked boolean value, true when yes was clicked, false otherwise */
+ * @param w Window unused
+ * @param confirmed boolean value, true when yes was clicked, false otherwise */
static void ResetLandscapeConfirmationCallback(Window *w, bool confirmed)
{
if (confirmed) {
@@ -1405,7 +1406,9 @@
static void PlaceProc_Town(TileIndex tile)
{
- DoCommandP(tile, _scengen_town_size, 0, CcBuildTown, CMD_BUILD_TOWN | CMD_MSG(STR_0236_CAN_T_BUILD_TOWN_HERE));
+ uint32 size = min(_scengen_town_size, (int)TSM_CITY);
+ uint32 mode = _scengen_town_size > TSM_CITY ? TSM_CITY : TSM_FIXED;
+ DoCommandP(tile, size, mode, CcBuildTown, CMD_BUILD_TOWN | CMD_MSG(STR_0236_CAN_T_BUILD_TOWN_HERE));
}
@@ -1413,13 +1416,14 @@
{ WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_NONE, 7, 11, 147, 0, 13, STR_0233_TOWN_GENERATION, STR_018C_WINDOW_TITLE_DRAG_THIS},
{ WWT_STICKYBOX, RESIZE_NONE, 7, 148, 159, 0, 13, 0x0, STR_STICKY_BUTTON},
-{ WWT_PANEL, RESIZE_NONE, 7, 0, 159, 14, 81, 0x0, STR_NULL},
+{ WWT_PANEL, RESIZE_NONE, 7, 0, 159, 14, 94, 0x0, STR_NULL},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 157, 16, 27, STR_0234_NEW_TOWN, STR_0235_CONSTRUCT_NEW_TOWN},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 157, 29, 40, STR_023D_RANDOM_TOWN, STR_023E_BUILD_TOWN_IN_RANDOM_LOCATION},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 157, 42, 53, STR_MANY_RANDOM_TOWNS, STR_RANDOM_TOWNS_TIP},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 53, 68, 79, STR_02A1_SMALL, STR_02A4_SELECT_TOWN_SIZE},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 54, 105, 68, 79, STR_02A2_MEDIUM, STR_02A4_SELECT_TOWN_SIZE},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 106, 157, 68, 79, STR_02A3_LARGE, STR_02A4_SELECT_TOWN_SIZE},
+{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 157, 81, 92, STR_SCENARIO_EDITOR_CITY, STR_02A4_SELECT_TOWN_SIZE},
{ WWT_LABEL, RESIZE_NONE, 7, 0, 147, 54, 67, STR_02A5_TOWN_SIZE, STR_NULL},
{ WIDGETS_END},
};
@@ -1432,7 +1436,7 @@
break;
case WE_CREATE:
- LowerWindowWidget(w, (_scengen_town_size - 1)+ 7);
+ LowerWindowWidget(w, _scengen_town_size + 7);
break;
case WE_CLICK:
@@ -1442,10 +1446,12 @@
break;
case 5: {// random town
Town *t;
+ uint size = min(_scengen_town_size, (int)TSM_CITY);
+ TownSizeMode mode = _scengen_town_size > TSM_CITY ? TSM_CITY : TSM_FIXED;
HandleButtonClick(w, 5);
_generating_world = true;
- t = CreateRandomTown(20, _scengen_town_size);
+ t = CreateRandomTown(20, mode, size);
_generating_world = false;
if (t == NULL) {
@@ -1465,10 +1471,10 @@
break;
}
- case 7: case 8: case 9:
- RaiseWindowWidget(w, (_scengen_town_size - 1) + 7);
- _scengen_town_size = (e->we.click.widget - 7) + 1;
- LowerWindowWidget(w, (_scengen_town_size - 1) + 7);
+ case 7: case 8: case 9: case 10:
+ RaiseWindowWidget(w, _scengen_town_size + 7);
+ _scengen_town_size = e->we.click.widget - 7;
+ LowerWindowWidget(w, _scengen_town_size + 7);
SetWindowDirty(w);
break;
}
@@ -1484,14 +1490,14 @@
break;
case WE_ABORT_PLACE_OBJ:
RaiseWindowButtons(w);
- LowerWindowWidget(w, (_scengen_town_size - 1) + 7);
+ LowerWindowWidget(w, _scengen_town_size + 7);
SetWindowDirty(w);
break;
}
}
static const WindowDesc _scen_edit_town_gen_desc = {
- WDP_AUTO, WDP_AUTO, 160, 82,
+ WDP_AUTO, WDP_AUTO, 160, 95,
WC_SCEN_TOWN_GEN, WC_NONE,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
_scen_edit_town_gen_widgets,
--- a/src/misc/array.hpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/misc/array.hpp Wed Jun 13 11:00:24 2007 +0000
@@ -1,5 +1,7 @@
/* $Id$ */
+/** @file array.hpp */
+
#ifndef ARRAY_HPP
#define ARRAY_HPP
--- a/src/misc/autocopyptr.hpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/misc/autocopyptr.hpp Wed Jun 13 11:00:24 2007 +0000
@@ -1,5 +1,7 @@
/* $Id$ */
+/** @file autocopyptr.hpp */
+
#ifndef AUTOCOPYPTR_HPP
#define AUTOCOPYPTR_HPP
--- a/src/misc/autoptr.hpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/misc/autoptr.hpp Wed Jun 13 11:00:24 2007 +0000
@@ -1,5 +1,7 @@
/* $Id$ */
+/** @file autoptr.hpp */
+
#ifndef AUTOPTR_HPP
#define AUTOPTR_HPP
--- a/src/misc/binaryheap.hpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/misc/binaryheap.hpp Wed Jun 13 11:00:24 2007 +0000
@@ -1,5 +1,7 @@
/* $Id$ */
+/** @file binaryheap.hpp */
+
#ifndef BINARYHEAP_HPP
#define BINARYHEAP_HPP
--- a/src/misc/blob.hpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/misc/blob.hpp Wed Jun 13 11:00:24 2007 +0000
@@ -1,5 +1,7 @@
/* $Id$ */
+/** @file blob.hpp */
+
#ifndef BLOB_HPP
#define BLOB_HPP
--- a/src/misc/countedptr.hpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/misc/countedptr.hpp Wed Jun 13 11:00:24 2007 +0000
@@ -1,5 +1,7 @@
/* $Id$ */
+/** @file countedptr.hpp */
+
#ifndef COUNTEDPTR_HPP
#define COUNTEDPTR_HPP
--- a/src/misc/crc32.hpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/misc/crc32.hpp Wed Jun 13 11:00:24 2007 +0000
@@ -1,5 +1,7 @@
/* $Id$ */
+/** @file crc32.hpp */
+
#ifndef CRC32_HPP
#define CRC32_HPP
--- a/src/misc/fixedsizearray.hpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/misc/fixedsizearray.hpp Wed Jun 13 11:00:24 2007 +0000
@@ -1,5 +1,7 @@
/* $Id$ */
+/** @file fixedsizearray.hpp */
+
#ifndef FIXEDSIZEARRAY_HPP
#define FIXEDSIZEARRAY_HPP
--- a/src/misc/hashtable.hpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/misc/hashtable.hpp Wed Jun 13 11:00:24 2007 +0000
@@ -1,5 +1,7 @@
/* $Id$ */
+/** @file hashtable.hpp */
+
#ifndef HASHTABLE_HPP
#define HASHTABLE_HPP
@@ -97,7 +99,7 @@
}
};
-/** @class CHashTableT<Titem, Thash_bits> - simple hash table
+/** class CHashTableT<Titem, Thash_bits> - simple hash table
* of pointers allocated elsewhere.
*
* Supports: Add/Find/Remove of Titems.
--- a/src/misc_cmd.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/misc_cmd.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -20,6 +20,7 @@
/** Change the player's face.
* @param tile unused
+ * @param flags operation to perform
* @param p1 unused
* @param p2 face bitmasked
*/
@@ -38,6 +39,7 @@
/** Change the player's company-colour
* @param tile unused
+ * @param flags operation to perform
* @param p1 bitstuffed:
* p1 bits 0-7 scheme to set
* p1 bits 8-9 set in use state or first/second colour
@@ -117,6 +119,7 @@
/** Increase the loan of your company.
* @param tile unused
+ * @param flags operation to perform
* @param p1 unused
* @param p2 when set, loans the maximum amount in one go (press CTRL)
*/
@@ -146,6 +149,7 @@
/** Decrease the loan of your company.
* @param tile unused
+ * @param flags operation to perform
* @param p1 unused
* @param p2 when set, pays back the maximum loan permitting money (press CTRL)
*/
@@ -186,6 +190,7 @@
/** Change the name of the company.
* @param tile unused
+ * @param flags operation to perform
* @param p1 unused
* @param p2 unused
*/
@@ -213,6 +218,7 @@
/** Change the name of the president.
* @param tile unused
+ * @param flags operation to perform
* @param p1 unused
* @param p2 unused
*/
@@ -251,6 +257,7 @@
* the game is unpaused. A counter is used instead of a boolean value
* to have more control over the game when saving/loading, etc.
* @param tile unused
+ * @param flags operation to perform
* @param p1 0 = decrease pause counter; 1 = increase pause counter
* @param p2 unused
*/
@@ -269,6 +276,7 @@
* This is normally only enabled in offline mode, but if there is a debug
* build, you can cheat (to test).
* @param tile unused
+ * @param flags operation to perform
* @param p1 the amount of money to receive (if negative), or spend (if positive)
* @param p2 unused
*/
@@ -286,6 +294,7 @@
* players if you have paid off your loan (either explicitely, or implicitely
* given the fact that you have more money than loan).
* @param tile unused
+ * @param flags operation to perform
* @param p1 the amount of money to transfer; max 20.000.000
* @param p2 the player to transfer the money to
*/
@@ -317,6 +326,7 @@
* in file 'settings_gui.c' _game_setting_info[]; we'll just trust the server it knows
* what to do and does this correctly
* @param tile unused
+ * @param flags operation to perform
* @param p1 the difficulty setting being changed. If it is -1, the difficulty level
* itself is changed. The new value is inside p2
* @param p2 new value for a difficulty setting or difficulty level
--- a/src/misc_gui.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/misc_gui.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -677,9 +677,10 @@
}
/** Shows a tooltip
-* @param str String to be displayed
-* @param params (optional) up to 5 pieces of additional information that may be
-* added to a tooltip; currently only supports parameters of {NUM} (integer) */
+ * @param str String to be displayed
+ * @param paramcount number of params to deal with
+ * @param params (optional) up to 5 pieces of additional information that may be
+ * added to a tooltip; currently only supports parameters of {NUM} (integer) */
void GuiShowTooltipsWithArgs(StringID str, uint paramcount, const uint32 params[])
{
char buffer[512];
@@ -824,8 +825,8 @@
/**
* Delete a character from a textbuffer, either with 'Delete' or 'Backspace'
* The character is delete from the position the caret is at
- * @param tb @Textbuf type to be changed
- * @param delmode Type of deletion, either @WKC_BACKSPACE or @WKC_DELETE
+ * @param tb Textbuf type to be changed
+ * @param delmode Type of deletion, either WKC_BACKSPACE or WKC_DELETE
* @return Return true on successfull change of Textbuf, or false otherwise
*/
bool DeleteTextBufferChar(Textbuf *tb, int delmode)
@@ -843,7 +844,7 @@
/**
* Delete every character in the textbuffer
- * @param tb @Textbuf buffer to be emptied
+ * @param tb Textbuf buffer to be emptied
*/
void DeleteTextBufferAll(Textbuf *tb)
{
@@ -856,7 +857,7 @@
* Insert a character to a textbuffer. If maxwidth of the Textbuf is zero,
* we don't care about the visual-length but only about the physical
* length of the string
- * @param tb @Textbuf type to be changed
+ * @param tb Textbuf type to be changed
* @param key Character to be inserted
* @return Return true on successfull change of Textbuf, or false otherwise
*/
@@ -880,8 +881,8 @@
/**
* Handle text navigation with arrow keys left/right.
* This defines where the caret will blink and the next characer interaction will occur
- * @param tb @Textbuf type where navigation occurs
- * @param navmode Direction in which navigation occurs @WKC_LEFT, @WKC_RIGHT, @WKC_END, @WKC_HOME
+ * @param tb Textbuf type where navigation occurs
+ * @param navmode Direction in which navigation occurs WKC_LEFT, WKC_RIGHT, WKC_END, WKC_HOME
* @return Return true on successfull change of Textbuf, or false otherwise
*/
bool MoveTextBufferPos(Textbuf *tb, int navmode)
@@ -924,7 +925,7 @@
/**
* Initialize the textbuffer by supplying it the buffer to write into
* and the maximum length of this buffer
- * @param tb @Textbuf type which is getting initialized
+ * @param tb Textbuf type which is getting initialized
* @param buf the buffer that will be holding the data for input
* @param maxlength maximum length in characters of this buffer
* @param maxwidth maximum length in pixels of this buffer. If reached, buffer
@@ -940,10 +941,10 @@
}
/**
- * Update @Textbuf type with its actual physical character and screenlength
+ * Update Textbuf type with its actual physical character and screenlength
* Get the count of characters in the string as well as the width in pixels.
* Useful when copying in a larger amount of text at once
- * @param tb @Textbuf type which length is calculated
+ * @param tb Textbuf type which length is calculated
*/
void UpdateTextBufferSize(Textbuf *tb)
{
@@ -1271,8 +1272,7 @@
* @param message string that will be shown for the window
* @param parent pointer to parent window, if this pointer is NULL the parent becomes
* the main window WC_MAIN_WINDOW
- * @param x,y coordinates to show the window at
- * @param yes_no_callback callback function called when window is closed through any button */
+ * @param callback callback function pointer to set in the window descriptor*/
void ShowQuery(StringID caption, StringID message, Window *parent, void (*callback)(Window*, bool))
{
Window *w = AllocateWindowDesc(&_query_desc);
@@ -1722,6 +1722,7 @@
/**
* @param p1 -1 or +1 (down/up)
+ * @param p2 unused
*/
static int32 ClickChangeClimateCheat(int32 p1, int32 p2)
{
@@ -1735,6 +1736,7 @@
extern void EnginesMonthlyLoop();
/**
+ * @param p1 unused
* @param p2 1 (increase) or -1 (decrease)
*/
static int32 ClickChangeDateCheat(int32 p1, int32 p2)
--- a/src/music/bemidi.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/music/bemidi.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -1,5 +1,7 @@
/* $Id$ */
+/** @file bemidi.cpp */
+
#include "../stdafx.h"
#include "../openttd.h"
#include "bemidi.h"
--- a/src/music/dmusic.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/music/dmusic.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -1,5 +1,7 @@
/* $Id$ */
+/** @file dmusic.cpp */
+
#ifdef WIN32_ENABLE_DIRECTMUSIC_SUPPORT
#include "../stdafx.h"
@@ -14,13 +16,13 @@
#include <dmusicf.h>
-// the performance object controls manipulation of the segments
+/** the performance object controls manipulation of the segments */
static IDirectMusicPerformance* performance = NULL;
-// the loader object can load many types of DMusic related files
+/** the loader object can load many types of DMusic related files */
static IDirectMusicLoader* loader = NULL;
-// the segment object is where the MIDI data is stored for playback
+/** the segment object is where the MIDI data is stored for playback */
static IDirectMusicSegment* segment = NULL;
static bool seeking = false;
@@ -54,12 +56,12 @@
return "ole32.dll load failed";
}
- // Initialize COM
+ /* Initialize COM */
if (FAILED(proc.CoInitialize(NULL))) {
return "COM initialization failed";
}
- // create the performance object
+ /* create the performance object */
if (FAILED(proc.CoCreateInstance(
CLSID_DirectMusicPerformance,
NULL,
@@ -71,7 +73,7 @@
return "Failed to create the performance object";
}
- // initialize it
+ /* initialize it */
if (FAILED(performance->Init(NULL, NULL, NULL))) {
performance->Release();
performance = NULL;
@@ -79,7 +81,7 @@
return "Failed to initialize performance object";
}
- // choose default Windows synth
+ /* choose default Windows synth */
if (FAILED(performance->AddPort(NULL))) {
performance->CloseDown();
performance->Release();
@@ -88,7 +90,7 @@
return "AddPort failed";
}
- // create the loader object; this will be used to load the MIDI file
+ /* create the loader object; this will be used to load the MIDI file */
if (FAILED(proc.CoCreateInstance(
CLSID_DirectMusicLoader,
NULL,
@@ -136,7 +138,7 @@
static void DMusicMidiPlaySong(const char* filename)
{
- // set up the loader object info
+ /* set up the loader object info */
DMUS_OBJECTDESC obj_desc;
ZeroMemory(&obj_desc, sizeof(obj_desc));
obj_desc.dwSize = sizeof(obj_desc);
@@ -148,13 +150,13 @@
obj_desc.wszFileName, lengthof(obj_desc.wszFileName)
);
- // release the existing segment if we have any
+ /* release the existing segment if we have any */
if (segment != NULL) {
segment->Release();
segment = NULL;
}
- // make a new segment
+ /* make a new segment */
if (FAILED(loader->GetObject(
&obj_desc, IID_IDirectMusicSegment, (LPVOID*)&segment
))) {
@@ -162,7 +164,7 @@
return;
}
- // tell the segment what kind of data it contains
+ /* tell the segment what kind of data it contains */
if (FAILED(segment->SetParam(
GUID_StandardMIDIFile, 0xFFFFFFFF, 0, 0, performance
))) {
@@ -170,13 +172,13 @@
return;
}
- // tell the segment to 'download' the instruments
+ /* tell the segment to 'download' the instruments */
if (FAILED(segment->SetParam(GUID_Download, 0xFFFFFFFF, 0, 0, performance))) {
DEBUG(driver, 0, "DirectMusic: failed to download instruments");
return;
}
- // start playing the MIDI file
+ /* start playing the MIDI file */
if (FAILED(performance->PlaySegment(segment, 0, 0, NULL))) {
DEBUG(driver, 0, "DirectMusic: PlaySegment failed");
return;
@@ -210,8 +212,7 @@
static void DMusicMidiSetVolume(byte vol)
{
- // 0 - 127 -> -2000 - 0
- long db = vol * 2000 / 127 - 2000;
+ long db = vol * 2000 / 127 - 2000; ///< 0 - 127 -> -2000 - 0
performance->SetGlobalParam(GUID_PerfMasterVolume, &db, sizeof(db));
}
--- a/src/namegen.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/namegen.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -283,7 +283,7 @@
if (SeedChance(0, 15, seed) >= 10) {
strecat(buf, name_finnish_real[SeedChance(2, lengthof(name_finnish_real), seed)], last);
} else if (SeedChance(0, 15, seed) >= 5) {
- /* A two-part name by combining one of name_finnish_1 + "la"/"lä"
+ /* A two-part name by combining one of name_finnish_1 + "la"/"lä"
* The reason for not having the contents of name_finnish_{1,2} in the same table is
* that the ones in name_finnish_2 are not good for this purpose. */
uint sel = SeedChance( 0, lengthof(name_finnish_1), seed);
@@ -297,7 +297,7 @@
{
strecat(buf, "la", last);
} else {
- strecat(buf, "lä", last);
+ strecat(buf, "lä", last);
}
} else {
/* A two-part name by combining one of name_finnish_{1,2} + name_finnish_3.
--- a/src/newgrf.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/newgrf.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -136,7 +136,7 @@
* loading/parsing grf files, not for runtime debug messages as there
* is no file information available during that time.
* @param severity debugging severity level, see debug.h
- * @param debugging message in printf() format */
+ * @param str message in printf() format */
void CDECL grfmsg(int severity, const char *str, ...)
{
char buf[1024];
@@ -234,6 +234,7 @@
/** Used when setting an object's property to map to the GRF's strings
* while taking in consideration the "drift" between TTDPatch string system and OpenTTD's one
+ * @param grfid Id of the grf file
* @param str StringID that we want to have the equivalent in OoenTTD
* @return the properly adjusted StringID
*/
@@ -1403,8 +1404,25 @@
break;
case 0x1E: // Accepted cargo types
- FOR_EACH_OBJECT grf_load_dword(&buf);
- ret = true;
+ FOR_EACH_OBJECT {
+ uint32 cargotypes = grf_load_dword(&buf);
+
+ /* Check if the cargo types should not be changed */
+ if (cargotypes == 0xFFFFFFFF) break;
+
+ for (uint j = 0; j < 3; j++) {
+ /* Get the cargo number from the 'list' */
+ uint8 cargo_part = GB(cargotypes, 8 * j, 8);
+ CargoID cargo = GetCargoTranslation(cargo_part, _cur_grffile);
+
+ if (cargo == CT_INVALID) {
+ /* Disable acceptance of invalid cargo type */
+ housespec[i]->cargo_acceptance[j] = 0;
+ } else {
+ housespec[i]->accepts_cargo[j] = cargo;
+ }
+ }
+ }
break;
default:
@@ -1954,7 +1972,7 @@
uint8 prop = grf_load_byte(&buf);
if (CargoChangeInfo(index, numinfo, prop, &buf, bufend - buf)) {
- grfmsg(2, "FeatureChangeInfo: Ignoring property 0x%02X (not implemented)", prop);
+ grfmsg(2, "ReserveChangeInfo: Ignoring property 0x%02X (not implemented)", prop);
}
}
}
@@ -1987,8 +2005,8 @@
/**
* Creates a spritegroup representing a sprite number result.
- * @param value The sprite number.
- * @param sprites The number of sprites per set.
+ * @param sprite The sprite number.
+ * @param num_sprites The number of sprites per set.
* @return A spritegroup representing the sprite number result.
*/
static const SpriteGroup* NewResultSpriteGroup(SpriteID sprite, byte num_sprites)
@@ -2043,7 +2061,7 @@
if (HASBIT(groupid, 15)) return NewCallBackResultSpriteGroup(groupid);
if (groupid >= _cur_grffile->spritegroups_count || _cur_grffile->spritegroups[groupid] == NULL) {
- grfmsg(1, "NewSpriteGroup(0x%02X:0x%02X): Groupid 0x%04X does not exist, leaving empty", setid, type, groupid);
+ grfmsg(1, "GetGroupFromGroupID(0x%02X:0x%02X): Groupid 0x%04X does not exist, leaving empty", setid, type, groupid);
return NULL;
}
@@ -2056,7 +2074,7 @@
if (HASBIT(spriteid, 15)) return NewCallBackResultSpriteGroup(spriteid);
if (spriteid >= _cur_grffile->spriteset_numsets) {
- grfmsg(1, "NewSpriteGroup(0x%02X:0x%02X): Sprite set %u invalid, max %u", setid, type, spriteid, _cur_grffile->spriteset_numsets);
+ grfmsg(1, "CreateGroupFromGroupID(0x%02X:0x%02X): Sprite set %u invalid, max %u", setid, type, spriteid, _cur_grffile->spriteset_numsets);
return NULL;
}
@@ -2064,7 +2082,7 @@
* is skipped, as TTDPatch mandates that Action 0x02s must be processed.
* We don't have that rule, but must live by the Patch... */
if (_cur_grffile->spriteset_start + spriteid * num_sprites + num_sprites > _cur_spriteid) {
- grfmsg(1, "NewSpriteGroup(0x%02X:0x%02X): Real Sprite IDs 0x%04X - 0x%04X do not (all) exist (max 0x%04X), leaving empty",
+ grfmsg(1, "CreateGroupFromGroupID(0x%02X:0x%02X): Real Sprite IDs 0x%04X - 0x%04X do not (all) exist (max 0x%04X), leaving empty",
setid, type,
_cur_grffile->spriteset_start + spriteid * num_sprites,
_cur_grffile->spriteset_start + spriteid * num_sprites + num_sprites - 1, _cur_spriteid - 1);
@@ -2072,7 +2090,7 @@
}
if (feature != _cur_grffile->spriteset_feature) {
- grfmsg(1, "NewSpriteGroup(0x%02X:0x%02X): Sprite set feature 0x%02X does not match action feature 0x%02X, skipping",
+ grfmsg(1, "CreateGroupFromGroupID(0x%02X:0x%02X): Sprite set feature 0x%02X does not match action feature 0x%02X, skipping",
_cur_grffile->spriteset_feature, feature);
return NULL;
}
@@ -2368,7 +2386,7 @@
if (_cur_grffile->cargo_max == 0) {
/* No cargo table, so use bitnum values */
if (ctype >= 32) {
- grfmsg(1, "FeatureMapSpriteGroup: Cargo bitnum %d out of range (max 31), skipping.", ctype);
+ grfmsg(1, "TranslateCargo: Cargo bitnum %d out of range (max 31), skipping.", ctype);
return CT_INVALID;
}
@@ -2377,35 +2395,35 @@
if (!cs->IsValid()) continue;
if (cs->bitnum == ctype) {
- grfmsg(6, "FeatureMapSpriteGroup: Cargo bitnum %d mapped to cargo type %d.", ctype, c);
+ grfmsg(6, "TranslateCargo: Cargo bitnum %d mapped to cargo type %d.", ctype, c);
return c;
}
}
- grfmsg(5, "FeatureMapSpriteGroup: Cargo bitnum %d not available in this climate, skipping.", ctype);
+ grfmsg(5, "TranslateCargo: Cargo bitnum %d not available in this climate, skipping.", ctype);
return CT_INVALID;
}
/* Check if the cargo type is out of bounds of the cargo translation table */
if (ctype >= _cur_grffile->cargo_max) {
- grfmsg(1, "FeatureMapSpriteGroup: Cargo type %d out of range (max %d), skipping.", ctype, _cur_grffile->cargo_max - 1);
+ grfmsg(1, "TranslateCargo: Cargo type %d out of range (max %d), skipping.", ctype, _cur_grffile->cargo_max - 1);
return CT_INVALID;
}
/* Look up the cargo label from the translation table */
CargoLabel cl = _cur_grffile->cargo_list[ctype];
if (cl == 0) {
- grfmsg(5, "FeatureMapSpriteGroup: Cargo type %d not available in this climate, skipping.", ctype);
+ grfmsg(5, "TranslateCargo: Cargo type %d not available in this climate, skipping.", ctype);
return CT_INVALID;
}
ctype = GetCargoIDByLabel(cl);
if (ctype == CT_INVALID) {
- grfmsg(5, "FeatureMapSpriteGroup: Cargo '%c%c%c%c' unsupported, skipping.", GB(cl, 24, 8), GB(cl, 16, 8), GB(cl, 8, 8), GB(cl, 0, 8));
+ grfmsg(5, "TranslateCargo: Cargo '%c%c%c%c' unsupported, skipping.", GB(cl, 24, 8), GB(cl, 16, 8), GB(cl, 8, 8), GB(cl, 0, 8));
return CT_INVALID;
}
- grfmsg(6, "FeatureMapSpriteGroup: Cargo '%c%c%c%c' mapped to cargo type %d.", GB(cl, 24, 8), GB(cl, 16, 8), GB(cl, 8, 8), GB(cl, 0, 8), ctype);
+ grfmsg(6, "TranslateCargo: Cargo '%c%c%c%c' mapped to cargo type %d.", GB(cl, 24, 8), GB(cl, 16, 8), GB(cl, 8, 8), GB(cl, 0, 8), ctype);
return ctype;
}
@@ -2422,11 +2440,11 @@
}
} else {
if (last_engines_count == 0) {
- grfmsg(0, "FeatureMapSpriteGroup: WagonOverride: No engine to do override with");
+ grfmsg(0, "VehicleMapSpriteGroup: WagonOverride: No engine to do override with");
return;
}
- grfmsg(6, "FeatureMapSpriteGroup: WagonOverride: %u engines, %u wagons",
+ grfmsg(6, "VehicleMapSpriteGroup: WagonOverride: %u engines, %u wagons",
last_engines_count, idcount);
}
@@ -2440,16 +2458,16 @@
return;
}
- grfmsg(7, "FeatureMapSpriteGroup: [%d] Engine %d...", i, engine);
+ grfmsg(7, "VehicleMapSpriteGroup: [%d] Engine %d...", i, engine);
for (uint c = 0; c < cidcount; c++) {
uint8 ctype = grf_load_byte(&bp);
uint16 groupid = grf_load_word(&bp);
- grfmsg(8, "FeatureMapSpriteGroup: * [%d] Cargo type 0x%X, group id 0x%02X", c, ctype, groupid);
+ grfmsg(8, "VehicleMapSpriteGroup: * [%d] Cargo type 0x%X, group id 0x%02X", c, ctype, groupid);
if (groupid >= _cur_grffile->spritegroups_count || _cur_grffile->spritegroups[groupid] == NULL) {
- grfmsg(1, "FeatureMapSpriteGroup: Spriteset 0x%04X out of range 0x%X or empty, skipping", groupid, _cur_grffile->spritegroups_count);
+ grfmsg(1, "VehicleMapSpriteGroup: Spriteset 0x%04X out of range 0x%X or empty, skipping", groupid, _cur_grffile->spritegroups_count);
continue;
}
@@ -2512,7 +2530,7 @@
uint16 groupid = grf_load_word(&bp);
if (groupid >= _cur_grffile->spritegroups_count || _cur_grffile->spritegroups[groupid] == NULL) {
- grfmsg(1, "FeatureMapSpriteGroup: Spriteset 0x%04X out of range 0x%X or empty, skipping",
+ grfmsg(1, "StationMapSpriteGroup: Spriteset 0x%04X out of range 0x%X or empty, skipping",
groupid, _cur_grffile->spritegroups_count);
continue;
}
@@ -2529,7 +2547,7 @@
uint16 groupid = grf_load_word(&bp);
if (groupid >= _cur_grffile->spritegroups_count || _cur_grffile->spritegroups[groupid] == NULL) {
- grfmsg(1, "FeatureMapSpriteGroup: Spriteset 0x%04X out of range 0x%X or empty, skipping",
+ grfmsg(1, "StationMapSpriteGroup: Spriteset 0x%04X out of range 0x%X or empty, skipping",
groupid, _cur_grffile->spritegroups_count);
return;
}
@@ -2553,7 +2571,7 @@
uint16 groupid = grf_load_word(&bp);
if (groupid >= _cur_grffile->spritegroups_count || _cur_grffile->spritegroups[groupid] == NULL) {
- grfmsg(1, "FeatureMapSpriteGroup: Spriteset 0x%04X out of range 0x%X or empty, skipping.",
+ grfmsg(1, "TownHouseMapSpriteGroup: Spriteset 0x%04X out of range 0x%X or empty, skipping.",
groupid, _cur_grffile->spritegroups_count);
return;
}
@@ -2563,7 +2581,7 @@
HouseSpec *hs = _cur_grffile->housespec[hid];
if (hs == NULL) {
- grfmsg(1, "FeatureMapSpriteGroup: Too many houses defined, skipping");
+ grfmsg(1, "TownHouseMapSpriteGroup: Too many houses defined, skipping");
return;
}
@@ -2578,7 +2596,7 @@
uint16 groupid = grf_load_word(&bp);
if (groupid >= _cur_grffile->spritegroups_count || _cur_grffile->spritegroups[groupid] == NULL) {
- grfmsg(1, "FeatureMapSpriteGroup: Spriteset 0x%04X out of range 0x%X or empty, skipping.",
+ grfmsg(1, "CargoMapSpriteGroup: Spriteset 0x%04X out of range 0x%X or empty, skipping.",
groupid, _cur_grffile->spritegroups_count);
return;
}
@@ -2587,7 +2605,7 @@
CargoID cid = buf[3 + i];
if (cid >= NUM_CARGO) {
- grfmsg(1, "FeatureMapSpriteGroup: Cargo ID %d out of range, skipping");
+ grfmsg(1, "CargoMapSpriteGroup: Cargo ID %d out of range, skipping");
continue;
}
@@ -2818,7 +2836,7 @@
switch (type) {
case 0x04: // Signal graphics
if (num != 112 && num != 240) {
- grfmsg(1, "GraphicsNews: Signal graphics sprite count must be 112 or 240, skipping");
+ grfmsg(1, "GraphicsNew: Signal graphics sprite count must be 112 or 240, skipping");
return;
}
_signal_base = _cur_spriteid;
@@ -2826,7 +2844,7 @@
case 0x05: // Catenary graphics
if (num != 48) {
- grfmsg(1, "GraphicsNews: Catenary graphics sprite count must be 48, skipping");
+ grfmsg(1, "GraphicsNew: Catenary graphics sprite count must be 48, skipping");
return;
}
replace = SPR_ELRAIL_BASE + 3;
@@ -2834,7 +2852,7 @@
case 0x06: // Foundations
if (num != 74) {
- grfmsg(1, "GraphicsNews: Foundation graphics sprite count must be 74, skipping");
+ grfmsg(1, "GraphicsNew: Foundation graphics sprite count must be 74, skipping");
return;
}
replace = SPR_SLOPES_BASE;
@@ -2842,20 +2860,44 @@
case 0x08: // Canal graphics
if (num != 65) {
- grfmsg(1, "GraphicsNews: Canal graphics sprite count must be 65, skipping");
+ grfmsg(1, "GraphicsNew: Canal graphics sprite count must be 65, skipping");
return;
}
replace = SPR_CANALS_BASE + 5;
break;
+ case 0x0A: // 2CC colour maps
+ if (num != 256) {
+ grfmsg(1, "GraphicsNew: 2CC colour maps sprite count must be 256, skipping");
+ return;
+ }
+ replace = SPR_2CCMAP_BASE;
+ break;
+
case 0x0D: // Coast graphics
if (num != 16) {
- grfmsg(1, "GraphicsNews: Coast graphics sprite count must be 16, skipping");
+ grfmsg(1, "GraphicsNew: Coast graphics sprite count must be 16, skipping");
return;
}
_coast_base = _cur_spriteid;
break;
+ case 0x10: // New airport sprites
+ if (num != 15) {
+ grfmsg(1, "GraphicsNew: Airport graphics sprite count must be 15, skipping");
+ return;
+ }
+ replace = SPR_AIRPORTX_BASE;
+ break;
+
+ case 0x11: // Road stop sprites
+ if (num != 8) {
+ grfmsg(1, "GraphicsNew: Road stop graphics sprite count must be 8, skipping");
+ return;
+ }
+ replace = SPR_ROADSTOP_BASE;
+ break;
+
default:
grfmsg(2, "GraphicsNew: Custom graphics (type 0x%02X) sprite block of length %u (unimplemented, ignoring)",
type, num);
@@ -3053,13 +3095,13 @@
}
if (param < 0x80 && _cur_grffile->param_end <= param) {
- grfmsg(7, "Param %d undefined, skipping test", param);
+ grfmsg(7, "SkipIf: Param %d undefined, skipping test", param);
return;
}
uint32 param_val = GetParamVal(param, &cond_val);
- grfmsg(7, "Test condtype %d, param 0x%08X, condval 0x%08X", condtype, param_val, cond_val);
+ grfmsg(7, "SkipIf: Test condtype %d, param 0x%08X, condval 0x%08X", condtype, param_val, cond_val);
if (param == 0x88) {
/* GRF ID checks */
@@ -3067,7 +3109,7 @@
const GRFConfig *c = GetGRFConfig(cond_val);
if (condtype != 10 && c == NULL) {
- grfmsg(7, "GRFID 0x%08X unknown, skipping test", BSWAP32(cond_val));
+ grfmsg(7, "SkipIf: GRFID 0x%08X unknown, skipping test", BSWAP32(cond_val));
return;
}
@@ -3094,7 +3136,7 @@
result = c == NULL || c->flags == GCS_DISABLED || c->status == GCS_NOT_FOUND;
break;
- default: grfmsg(1, "Unsupported GRF test %d. Ignoring", condtype); return;
+ default: grfmsg(1, "SkipIf: Unsupported GRF test %d. Ignoring", condtype); return;
}
} else {
/* Parameter or variable tests */
@@ -3112,12 +3154,12 @@
case 5: result = (param_val & mask) > cond_val;
break;
- default: grfmsg(1, "Unsupported test %d. Ignoring", condtype); return;
+ default: grfmsg(1, "SkipIf: Unsupported test %d. Ignoring", condtype); return;
}
}
if (!result) {
- grfmsg(2, "Not skipping sprites, test was false");
+ grfmsg(2, "SkipIf: Not skipping sprites, test was false");
return;
}
@@ -3141,13 +3183,13 @@
}
if (choice != NULL) {
- grfmsg(2, "Jumping to label 0x%0X at line %d, test was true", choice->label, choice->nfo_line);
+ grfmsg(2, "SkipIf: Jumping to label 0x%0X at line %d, test was true", choice->label, choice->nfo_line);
FioSeekTo(choice->pos, SEEK_SET);
_nfo_line = choice->nfo_line;
return;
}
- grfmsg(2, "Skipping %d sprites, test was true", numsprites);
+ grfmsg(2, "SkipIf: Skipping %d sprites, test was true", numsprites);
_skip_sprites = numsprites;
if (_skip_sprites == 0) {
/* Zero means there are no sprites to skip, so
@@ -3209,7 +3251,7 @@
_cur_grfconfig->status = _cur_stage < GLS_ACTIVATION ? GCS_INITIALISED : GCS_ACTIVATED;
/* Do swap the GRFID for displaying purposes since people expect that */
- DEBUG(grf, 1, "Loaded GRFv%d set %08lX - %s", version, BSWAP32(grfid), name);
+ DEBUG(grf, 1, "GRFInfo: Loaded GRFv%d set %08lX - %s", version, BSWAP32(grfid), name);
}
/* Action 0x0A */
@@ -3298,7 +3340,7 @@
/* Skip the error until the activation stage unless bit 7 of the severity
* is set. */
if (!HASBIT(severity, 7) && _cur_stage < GLS_ACTIVATION) {
- grfmsg(7, "Skipping non-fatal GRFLoadError in stage 1");
+ grfmsg(7, "GRFLoadError: Skipping non-fatal GRFLoadError in stage 1");
return;
}
CLRBIT(severity, 7);
@@ -3435,7 +3477,7 @@
* an earlier action D */
if (HASBIT(oper, 7)) {
if (target < 0x80 && target < _cur_grffile->param_end) {
- grfmsg(7, "Param %u already defined, skipping", target);
+ grfmsg(7, "ParamSet: Param %u already defined, skipping", target);
return;
}
@@ -3492,7 +3534,7 @@
if (size == count) {
/* Got the slot... */
if (op == 0 || op == 3) {
- grfmsg(2, "GRM: Reserving %d vehicles at %d", count, start);
+ grfmsg(2, "ParamSet: GRM: Reserving %d vehicles at %d", count, start);
for (uint i = 0; i < count; i++) _grm_engines[shift + start + i] = _cur_grffile->grfid;
}
src1 = start;
@@ -3500,14 +3542,14 @@
/* Unable to allocate */
if (op != 4 && op != 5) {
/* Deactivate GRF */
- grfmsg(0, "GRM: Unable to allocate %d vehicles, deactivating", count);
+ grfmsg(0, "ParamSet: GRM: Unable to allocate %d vehicles, deactivating", count);
_cur_grfconfig->status = GCS_DISABLED;
_skip_sprites = -1;
return;
}
- grfmsg(1, "GRM: Unable to allocate %d vehicles", count);
+ grfmsg(1, "ParamSet: GRM: Unable to allocate %d vehicles", count);
src1 = UINT_MAX;
}
break;
@@ -3518,7 +3560,7 @@
case 0:
/* Check if the allocated sprites will fit below the original sprite limit */
if (_cur_spriteid + count >= 16384) {
- grfmsg(0, "GRM: Unable to allocate %d sprites; try changing NewGRF order", count);
+ grfmsg(0, "ParamSet: GRM: Unable to allocate %d sprites; try changing NewGRF order", count);
_cur_grfconfig->status = GCS_DISABLED;
_skip_sprites = -1;
@@ -3535,12 +3577,12 @@
break;
default:
- grfmsg(1, "GRM: Unsupported operation %d for general sprites", op);
+ grfmsg(1, "ParamSet: GRM: Unsupported operation %d for general sprites", op);
return;
}
break;
- default: grfmsg(1, "GRM: Unsupported feature 0x%X", feature); return;
+ default: grfmsg(1, "ParamSet: GRM: Unsupported feature 0x%X", feature); return;
}
}
}
@@ -3943,7 +3985,7 @@
uint32 grfid = grf_load_dword(&buf);
const GRFConfig *c = GetGRFConfig(grfid);
if (c == NULL || (c->status != GCS_INITIALISED && c->status != GCS_ACTIVATED)) {
- grfmsg(7, "GRFID 0x%08x unknown, skipping action 13", BSWAP32(grfid));
+ grfmsg(7, "TranslateGRFStrings: GRFID 0x%08x unknown, skipping action 13", BSWAP32(grfid));
return;
}
@@ -3967,7 +4009,7 @@
uint16 first_id = grf_load_word(&buf);
if (!((first_id >= 0xD000 && first_id + num_strings <= 0xD3FF) || (first_id >= 0xDC00 && first_id + num_strings <= 0xDCFF))) {
- grfmsg(7, "Attempting to set out-of-range string IDs in action 13 (first: 0x%4X, number: 0x%2X)", first_id, num_strings);
+ grfmsg(7, "TranslateGRFStrings: Attempting to set out-of-range string IDs in action 13 (first: 0x%4X, number: 0x%2X)", first_id, num_strings);
return;
}
@@ -4091,7 +4133,7 @@
| (0 << 0x08) // fifoloading
| (0 << 0x09) // townroadbranchprob
| (0 << 0x0A) // tempsnowline
- | (0 << 0x0B) // newcargo
+ | (1 << 0x0B) // newcargo
| (1 << 0x0C) // enhancemultiplayer
| (1 << 0x0D) // onewayroads
| ((_patches.nonuniform_stations ? 1 : 0) << 0x0E) // irregularstations
@@ -4361,9 +4403,6 @@
static void CalculateRefitMasks()
{
for (EngineID engine = 0; engine < TOTAL_NUM_ENGINES; engine++) {
- /* Skip engine if not available in this climate */
- if (!HASBIT(_engine_info[engine].climates, _opt.landscape)) continue;
-
uint32 mask = 0;
uint32 not_mask = 0;
uint32 xor_mask = 0;
@@ -4564,17 +4603,17 @@
byte action = buf[0];
if (action == 0xFF) {
- grfmsg(7, "Handling data block in stage %d", stage);
+ grfmsg(7, "DecodeSpecialSprite: Handling data block in stage %d", stage);
GRFDataBlock(buf, num);
} else if (action == 0xFE) {
- grfmsg(7, "Handling import block in stage %d", stage);
+ grfmsg(7, "DecodeSpecialSprite: andling import block in stage %d", stage);
GRFImportBlock(buf, num);
} else if (action >= lengthof(handlers)) {
- grfmsg(7, "Skipping unknown action 0x%02X", action);
+ grfmsg(7, "DecodeSpecialSprite: Skipping unknown action 0x%02X", action);
} else if (handlers[action][stage] == NULL) {
- grfmsg(7, "Skipping action 0x%02X in stage %d", action, stage);
+ grfmsg(7, "DecodeSpecialSprite: Skipping action 0x%02X in stage %d", action, stage);
} else {
- grfmsg(7, "Handling action 0x%02X in stage %d", action, stage);
+ grfmsg(7, "DecodeSpecialSprite: Handling action 0x%02X in stage %d", action, stage);
handlers[action][stage](buf, num);
}
free(buf);
@@ -4606,7 +4645,7 @@
_cur_grfconfig = config;
- DEBUG(grf, 2, "Reading NewGRF-file '%s'", filename);
+ DEBUG(grf, 2, "LoadNewGRFFile: Reading NewGRF-file '%s'", filename);
/* Skip the first sprite; we don't care about how many sprites this
* does contain; newest TTDPatches and George's longvehicles don't
@@ -4614,7 +4653,7 @@
if (FioReadWord() == 4 && FioReadByte() == 0xFF) {
FioReadDword();
} else {
- DEBUG(grf, 7, "Custom .grf has invalid format");
+ DEBUG(grf, 7, "LoadNewGRFFile: Custom .grf has invalid format");
return;
}
@@ -4637,7 +4676,7 @@
FioSkipBytes(num);
}
} else {
- if (_skip_sprites == 0) grfmsg(7, "Skipping unexpected sprite");
+ if (_skip_sprites == 0) grfmsg(7, "LoadNewGRFFile: Skipping unexpected sprite");
FioSkipBytes(7);
num -= 8;
@@ -4706,7 +4745,7 @@
if (stage == GLS_ACTIVATION) {
ClearTemporaryNewGRFData();
BuildCargoTranslationMap();
- DEBUG(sprite, 2, "Currently %i sprites are loaded", _cur_spriteid);
+ DEBUG(sprite, 2, "LoadNewGRF: Currently %i sprites are loaded", _cur_spriteid);
}
}
}
--- a/src/newgrf_config.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/newgrf_config.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -187,7 +187,8 @@
}
/** Appends an element to a list of GRFs
- * @param dst the head of the list to add to */
+ * @param dst the head of the list to add to
+ * @param el the new tail to be */
void AppendToGRFConfigList(GRFConfig **dst, GRFConfig *el)
{
GRFConfig **tail = dst;
--- a/src/newgrf_engine.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/newgrf_engine.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -886,7 +886,7 @@
* @param param1 First parameter of the callback
* @param param2 Second parameter of the callback
* @param engine Engine type of the vehicle to evaluate the callback for
- * @param vehicle The vehicle to evaluate the callback for, or NULL if it doesnt exist yet
+ * @param v The vehicle to evaluate the callback for, or NULL if it doesnt exist yet
* @return The value the callback returned, or CALLBACK_FAILED if it failed
*/
uint16 GetVehicleCallback(uint16 callback, uint32 param1, uint32 param2, EngineID engine, const Vehicle *v)
--- a/src/newgrf_gui.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/newgrf_gui.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -296,7 +296,9 @@
/** Callback function for the newgrf 'apply changes' confirmation window
- * @param yes_clicked boolean value, true when yes was clicked, false otherwise */
+ * @param w Window which is calling this callback
+ * @param confirmed boolean value, true when yes was clicked, false otherwise
+ */
static void NewGRFConfirmationCallback(Window *w, bool confirmed)
{
if (confirmed) {
--- a/src/newgrf_station.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/newgrf_station.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -61,7 +61,7 @@
/**
* Allocate a station class for the given class id.
- * @param classid A 32 bit value identifying the class.
+ * @param cls A 32 bit value identifying the class.
* @return Index into station_classes of allocated class.
*/
StationClassID AllocateStationClass(uint32 cls)
@@ -138,7 +138,7 @@
/**
* Tie a station spec to its station class.
- * @param spec The station spec.
+ * @param statspec The station spec.
*/
void SetCustomStationSpec(StationSpec *statspec)
{
@@ -614,7 +614,7 @@
/**
* Allocate a StationSpec to a Station. This is called once per build operation.
- * @param spec StationSpec to allocate.
+ * @param statspec StationSpec to allocate.
* @param st Station to allocate it to.
* @param exec Whether to actually allocate the spec.
* @return Index within the Station's spec list, or -1 if the allocation failed.
@@ -695,10 +695,12 @@
}
/** Draw representation of a station tile for GUI purposes.
- * @param x, y Position of image.
- * @param dir Direction.
+ * @param x Position x of image.
+ * @param y Position y of image.
+ * @param axis Axis.
* @param railtype Rail type.
* @param sclass, station Type of station.
+ * @param station station ID
* @return True if the tile was drawn (allows for fallback to default graphic)
*/
bool DrawStationTile(int x, int y, RailType railtype, Axis axis, StationClassID sclass, uint station)
--- a/src/newgrf_text.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/newgrf_text.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -418,8 +418,8 @@
* The array iso_codes will be used to find that match.
* If not found, it will have to be standard english
* This function is called after the user changed language,
- * from strings.c:ReadLanguagePack
- * @param iso code of current selection
+ * from strings.cpp:ReadLanguagePack
+ * @param iso_name iso code of current selection
*/
void SetCurrentGrfLangID(const char *iso_name)
{
--- a/src/news_gui.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/news_gui.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -240,17 +240,17 @@
* @param flags various control bits that will show various news-types. See macro NEWS_FLAGS()
* @param data_a news-specific value based on news type
* @param data_b news-specific value based on news type
- * @note flags exists of 4 byte-sized extra parameters.<br/>
- * 1. 0 - 7 display_mode, any of the NewsMode enums (NM_)<br/>
- * 2. 8 - 15 news flags, any of the NewsFlags enums (NF_) NF_INCOLOR are set automatically if needed<br/>
- * 3. 16 - 23 news category, any of the NewsType enums (NT_)<br/>
- * 4. 24 - 31 news callback function, any of the NewsCallback enums (DNC_)<br/>
+ * @note flags exists of 4 byte-sized extra parameters.
+ * 1. 0 - 7 display_mode, any of the NewsMode enums (NM_)
+ * 2. 8 - 15 news flags, any of the NewsFlags enums (NF_) NF_INCOLOR are set automatically if needed
+ * 3. 16 - 23 news category, any of the NewsType enums (NT_)
+ * 4. 24 - 31 news callback function, any of the NewsCallback enums (DNC_)
* If the display mode is NM_CALLBACK special news is shown and parameter
- * stringid has a special meaning.<br/>
+ * stringid has a special meaning.
* DNC_TRAINAVAIL, DNC_ROADAVAIL, DNC_SHIPAVAIL, DNC_AIRCRAFTAVAIL: StringID is
- * the index of the engine that is shown<br/>
+ * the index of the engine that is shown
* DNC_BANKRUPCY: bytes 0-3 of StringID contains the player that is in trouble,
- * and 4-7 contains what kind of bankrupcy message is shown, NewsBankrupcy enum (NB_)<br/>
+ * and 4-7 contains what kind of bankrupcy message is shown, NewsBankrupcy enum (NB_)
* @see NewsMode
* @see NewsFlags
* @see NewsType
--- a/src/openttd.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/openttd.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -1913,7 +1913,20 @@
}
}
- if (CheckSavegameVersion(54)) {
+ /* A patch option containing the proportion of towns that grow twice as
+ * fast was added in version 54. From version 56 this is now saved in the
+ * town as cities can be built specifically in the scenario editor. */
+ if (CheckSavegameVersion(56)) {
+ Town *t;
+
+ FOR_ALL_TOWNS(t) {
+ if (_patches.larger_towns != 0 && (t->index % _patches.larger_towns) == 0) {
+ t->larger_town = true;
+ }
+ }
+ }
+
+ if (CheckSavegameVersion(57)) {
Town *t;
FOR_ALL_TOWNS(t) t->SetActivity(1);
}
--- a/src/openttd.h Tue Jun 12 11:56:35 2007 +0000
+++ b/src/openttd.h Wed Jun 13 11:00:24 2007 +0000
@@ -237,13 +237,13 @@
CT_IRON_ORE = 8,
CT_STEEL = 9,
CT_VALUABLES = 10,
- CT_FOOD = 11,
// Arctic
CT_WHEAT = 6,
CT_HILLY_UNUSED = 8,
CT_PAPER = 9,
CT_GOLD = 10,
+ CT_FOOD = 11,
// Tropic
CT_RUBBER = 1,
@@ -265,7 +265,7 @@
CT_PLASTIC = 10,
CT_FIZZY_DRINKS = 11,
- NUM_CARGO = 12,
+ NUM_CARGO = 32,
CT_NO_REFIT = 0xFE,
CT_INVALID = 0xFF
--- a/src/order_cmd.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/order_cmd.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -182,6 +182,7 @@
/** Add an order to the orderlist of a vehicle.
* @param tile unused
+ * @param flags operation to perform
* @param p1 various bitstuffed elements
* - p1 = (bit 0 - 15) - ID of the vehicle
* - p1 = (bit 16 - 31) - the selected order (if any). If the last order is given,
@@ -478,6 +479,7 @@
/** Delete an order from the orderlist of a vehicle.
* @param tile unused
+ * @param flags operation to perform
* @param p1 the ID of the vehicle
* @param p2 the order to delete (max 255)
*/
@@ -557,6 +559,7 @@
/** Goto next order of order-list.
* @param tile unused
+ * @param flags operation to perform
* @param p1 The ID of the vehicle which order is skipped
* @param p2 unused
*/
@@ -600,6 +603,7 @@
/** Modify an order in the orderlist of a vehicle.
* @param tile unused
+ * @param flags operation to perform
* @param p1 various bitstuffed elements
* - p1 = (bit 0 - 15) - ID of the vehicle
* - p1 = (bit 16 - 31) - the selected order (if any). If the last order is given,
@@ -680,6 +684,8 @@
}
/** Clone/share/copy an order-list of an other vehicle.
+ * @param tile unused
+ * @param flags operation to perform
* @param p1 various bitstuffed elements
* - p1 = (bit 0-15) - destination vehicle to clone orders to (p1 & 0xFFFF)
* - p1 = (bit 16-31) - source vehicle to clone orders from, if any (none for CO_UNSHARE)
@@ -812,6 +818,7 @@
/** Add/remove refit orders from an order
* @param tile Not used
+ * @param flags operation to perform
* @param p1 VehicleIndex of the vehicle having the order
* @param p2 bitmask
* - bit 0-7 CargoID
@@ -937,6 +944,7 @@
/** Restore the current order-index of a vehicle and sets service-interval.
* @param tile unused
+ * @param flags operation to perform
* @param p1 the ID of the vehicle
* @param p2 various bistuffed elements
* - p2 = (bit 0-15) - current order-index (p2 & 0xFFFF)
--- a/src/os2.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/os2.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -169,7 +169,7 @@
* Insert a chunk of text from the clipboard onto the textbuffer. Get TEXT clipboard
* and append this up to the maximum length (either absolute or screenlength). If maxlength
* is zero, we don't care about the screenlength but only about the physical length of the string
- * @param tb @Textbuf type to be changed
+ * @param tb Textbuf type to be changed
* @return Return true on successfull change of Textbuf, or false otherwise
*/
bool InsertTextBufferClipboard(Textbuf *tb)
--- a/src/players.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/players.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -622,6 +622,7 @@
/** Change engine renewal parameters
* @param tile unused
+ * @param flags operation to perform
* @param p1 bits 0-3 command
* - p1 = 0 - change auto renew bool
* - p1 = 1 - change auto renew months
@@ -755,6 +756,7 @@
/** Control the players: add, delete, etc.
* @param tile unused
+ * @param flags operation to perform
* @param p1 various functionality
* - p1 = 0 - create a new player, Which player (network) it will be is in p2
* - p1 = 1 - create a new AI player
--- a/src/rail_cmd.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/rail_cmd.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -230,6 +230,7 @@
/** Build a single piece of rail
* @param tile tile to build on
+ * @param flags operation to perform
* @param p1 railtype of being built piece (normal, mono, maglev)
* @param p2 rail track to build
*/
@@ -334,6 +335,7 @@
/** Remove a single piece of track
* @param tile tile to remove track from
+ * @param flags operation to perform
* @param p1 unused
* @param p2 rail orientation
*/
@@ -481,6 +483,7 @@
/** Build a stretch of railroad tracks.
* @param tile start tile of drag
+ * @param flags operation to perform
* @param p1 end tile of drag
* @param p2 various bitstuffed elements
* - p2 = (bit 0-3) - railroad type normal/maglev (0 = normal, 1 = mono, 2 = maglev)
@@ -530,6 +533,13 @@
/** Build rail on a stretch of track.
* Stub for the unified rail builder/remover
+ * @param tile start tile of drag
+ * @param flags operation to perform
+ * @param p1 end tile of drag
+ * @param p2 various bitstuffed elements
+ * - p2 = (bit 0-3) - railroad type normal/maglev (0 = normal, 1 = mono, 2 = maglev)
+ * - p2 = (bit 4-6) - track-orientation, valid values: 0-5 (Track enum)
+ * - p2 = (bit 7) - 0 = build, 1 = remove tracks
* @see CmdRailTrackHelper
*/
int32 CmdBuildRailroadTrack(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
@@ -539,6 +549,13 @@
/** Build rail on a stretch of track.
* Stub for the unified rail builder/remover
+ * @param tile start tile of drag
+ * @param flags operation to perform
+ * @param p1 end tile of drag
+ * @param p2 various bitstuffed elements
+ * - p2 = (bit 0-3) - railroad type normal/maglev (0 = normal, 1 = mono, 2 = maglev)
+ * - p2 = (bit 4-6) - track-orientation, valid values: 0-5 (Track enum)
+ * - p2 = (bit 7) - 0 = build, 1 = remove tracks
* @see CmdRailTrackHelper
*/
int32 CmdRemoveRailroadTrack(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
@@ -548,6 +565,7 @@
/** Build a train depot
* @param tile position of the train depot
+ * @param flags operation to perform
* @param p1 rail type
* @param p2 bit 0..1 entrance direction (DiagDirection)
*
@@ -615,6 +633,7 @@
* pre/exit/combo-signals, and what-else not. If the rail piece does not
* have any signals, bit 4 (cycle signal-type) is ignored
* @param tile tile where to build the signals
+ * @param flags operation to perform
* @param p1 various bitstuffed elements
* - p1 = (bit 0-2) - track-orientation, valid values: 0-5 (Track enum)
* - p1 = (bit 3) - 1 = override signal/semaphore, or pre/exit/combo signal (CTRL-toggle)
@@ -709,6 +728,7 @@
/** Build many signals by dragging; AutoSignals
* @param tile start tile of drag
+ * @param flags operation to perform
* @param p1 end tile of drag
* @param p2 various bitstuffed elements
* - p2 = (bit 0- 2) - track-orientation, valid values: 0-5 (Track enum)
@@ -796,6 +816,15 @@
/** Build signals on a stretch of track.
* Stub for the unified signal builder/remover
+ * @param tile start tile of drag
+ * @param flags operation to perform
+ * @param p1 end tile of drag
+ * @param p2 various bitstuffed elements
+ * - p2 = (bit 0- 2) - track-orientation, valid values: 0-5 (Track enum)
+ * - p2 = (bit 3) - 1 = override signal/semaphore, or pre/exit/combo signal (CTRL-toggle)
+ * - p2 = (bit 4) - 0 = signals, 1 = semaphores
+ * - p2 = (bit 5) - 0 = build, 1 = remove signals
+ * - p2 = (bit 24-31) - user defined signals_density
* @see CmdSignalTrackHelper
*/
int32 CmdBuildSignalTrack(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
@@ -805,10 +834,12 @@
/** Remove signals
* @param tile coordinates where signal is being deleted from
- * @param various bitstuffed elements, only track information is used
- * - p1 = (bit 0- 2) - track-orientation, valid values: 0-5 (Track enum)
- * - p1 = (bit 3) - override signal/semaphore, or pre/exit/combo signal (CTRL-toggle)
- * - p1 = (bit 4) - 0 = signals, 1 = semaphores
+ * @param flags operation to perform
+ * @param p1 various bitstuffed elements, only track information is used
+ * - (bit 0- 2) - track-orientation, valid values: 0-5 (Track enum)
+ * - (bit 3) - override signal/semaphore, or pre/exit/combo signal (CTRL-toggle)
+ * - (bit 4) - 0 = signals, 1 = semaphores
+ * @param p2 unused
*/
int32 CmdRemoveSingleSignal(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
{
@@ -848,6 +879,15 @@
/** Remove signals on a stretch of track.
* Stub for the unified signal builder/remover
+ * @param tile start tile of drag
+ * @param flags operation to perform
+ * @param p1 end tile of drag
+ * @param p2 various bitstuffed elements
+ * - p2 = (bit 0- 2) - track-orientation, valid values: 0-5 (Track enum)
+ * - p2 = (bit 3) - 1 = override signal/semaphore, or pre/exit/combo signal (CTRL-toggle)
+ * - p2 = (bit 4) - 0 = signals, 1 = semaphores
+ * - p2 = (bit 5) - 0 = build, 1 = remove signals
+ * - p2 = (bit 24-31) - user defined signals_density
* @see CmdSignalTrackHelper
*/
int32 CmdRemoveSignalTrack(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
@@ -914,6 +954,7 @@
/** Convert one rail type to the other. You can convert normal rail to
* monorail/maglev easily or vice-versa.
* @param tile end tile of rail conversion drag
+ * @param flags operation to perform
* @param p1 start tile of drag
* @param p2 new railtype to convert to
*/
@@ -1183,9 +1224,6 @@
* Draw ground sprite and track bits
* @param ti TileInfo
* @param track TrackBits to draw
- * @param earth Draw as earth
- * @param snow Draw as snow
- * @param flat Always draw foundation
*/
static void DrawTrackBits(TileInfo* ti, TrackBits track)
{
--- a/src/road_cmd.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/road_cmd.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -90,6 +90,7 @@
/** Delete a piece of road.
* @param tile tile where to remove road from
+ * @param flags operation to perform
* @param p1 bit 0..3 road pieces to remove (RoadBits)
* @param p2 unused
*/
@@ -251,6 +252,7 @@
/** Build a piece of road.
* @param tile tile where to build road
+ * @param flags operation to perform
* @param p1 bit 0..3 road pieces to build (RoadBits)
* @param p2 the town that is building the road (0 if not applicable)
*/
@@ -406,6 +408,7 @@
/** Build a long piece of road.
* @param end_tile end tile of drag
+ * @param flags operation to perform
* @param p1 start tile of drag
* @param p2 various bitstuffed elements
* - p2 = (bit 0) - start tile starts in the 2nd half of tile (p2 & 1)
@@ -462,6 +465,7 @@
/** Remove a long piece of road.
* @param end_tile end tile of drag
+ * @param flags operation to perform
* @param p1 start tile of drag
* @param p2 various bitstuffed elements
* - p2 = (bit 0) - start tile starts in the 2nd half of tile (p2 & 1)
@@ -516,6 +520,7 @@
/** Build a road depot.
* @param tile tile where to build the depot
+ * @param flags operation to perform
* @param p1 bit 0..1 entrance direction (DiagDirection)
* @param p2 unused
*
@@ -665,7 +670,6 @@
/**
* Draw ground sprite and road pieces
* @param ti TileInfo
- * @param road RoadBits to draw
*/
static void DrawRoadBits(TileInfo* ti)
{
--- a/src/roadveh_cmd.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/roadveh_cmd.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -122,6 +122,7 @@
/** Build a road vehicle.
* @param tile tile of depot where road vehicle is built
+ * @param flags operation to perform
* @param p1 bus/truck type being built (engine)
* @param p2 bit 0 when set, the unitnumber will be 0, otherwise it will be a free number
*/
@@ -227,6 +228,7 @@
/** Start/Stop a road vehicle.
* @param tile unused
+ * @param flags operation to perform
* @param p1 road vehicle ID to start/stop
* @param p2 unused
*/
@@ -278,6 +280,7 @@
/** Sell a road vehicle.
* @param tile unused
+ * @param flags operation to perform
* @param p1 vehicle ID to be sold
* @param p2 unused
*/
@@ -375,6 +378,7 @@
/** Send a road vehicle to the depot.
* @param tile unused
+ * @param flags operation to perform
* @param p1 vehicle ID to send to the depot
* @param p2 various bitmasked elements
* - p2 bit 0-3 - DEPOT_ flags (see vehicle.h)
@@ -447,6 +451,7 @@
/** Turn a roadvehicle around.
* @param tile unused
+ * @param flags operation to perform
* @param p1 vehicle ID to turn
* @param p2 unused
*/
@@ -1066,10 +1071,10 @@
/**
* Returns direction to for a road vehicle to take or
* INVALID_TRACKDIR if the direction is currently blocked
- * @param v the vehicle to do the pathfinding for
+ * @param v the Vehicle to do the pathfinding for
* @param tile the where to start the pathfinding
* @param enterdir the direction the vehicle enters the tile from
- * @return the trackdir to take
+ * @return the Trackdir to take
*/
static Trackdir RoadFindPathToDest(Vehicle* v, TileIndex tile, DiagDirection enterdir)
{
@@ -1841,6 +1846,7 @@
/** Refit a road vehicle to the specified cargo type
* @param tile unused
+ * @param flags operation to perform
* @param p1 Vehicle ID of the vehicle to refit
* @param p2 Bitstuffed elements
* - p2 = (bit 0-7) - the new cargo type to refit to
--- a/src/saveload.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/saveload.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -28,7 +28,7 @@
#include "variables.h"
#include <setjmp.h>
-extern const uint16 SAVEGAME_VERSION = 54;
+extern const uint16 SAVEGAME_VERSION = 57;
uint16 _sl_version; ///< the major savegame version identifier
byte _sl_minor_version; ///< the minor savegame version, DO NOT USE!
--- a/src/settings.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/settings.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -412,7 +412,7 @@
/** Find the set-integer value MANYofMANY type in a string
* @param many full domain of values the MANYofMANY setting can have
* @param str the current string value of the setting, each individual
- * of seperated by a whitespace\tab or | character
+ * of seperated by a whitespace,tab or | character
* @return the 'fully' set integer, or -1 if a set is not found */
static uint32 lookup_manyofmany(const char *many, const char *str)
{
@@ -682,7 +682,8 @@
* @param ini pointer to IniFile structure that holds administrative information
* @param sd pointer to SettingDesc structure whose internally pointed variables will
* be given values
- * @param grpname the group of the IniFile to search in for the new values */
+ * @param grpname the group of the IniFile to search in for the new values
+ * @param object pointer to the object been loaded */
static void ini_load_settings(IniFile *ini, const SettingDesc *sd, const char *grpname, void *object)
{
IniGroup *group;
@@ -752,6 +753,7 @@
* @param sd read-only SettingDesc structure which contains the unmodified,
* loaded values of the configuration file and various information about it
* @param grpname holds the name of the group (eg. [network]) where these will be saved
+ * @param object pointer to the object been saved
* The function works as follows: for each item in the SettingDesc structure we
* have a look if the value has changed since we started the game (the original
* values are reloaded when saving). If settings indeed have changed, we get
@@ -865,7 +867,7 @@
* The list parameter can be a NULL pointer, in this case nothing will be
* saved and a callback function should be defined that will take over the
* list-handling and store the data itself somewhere.
- * @param IniFile handle to the ini file with the source data
+ * @param ini IniFile handle to the ini file with the source data
* @param grpname character string identifying the section-header of the ini
* file that will be parsed
* @param list pointer to an string(pointer) array that will store the parsed
@@ -895,10 +897,10 @@
/** Saves all items from a list into the 'grpname' section
* The list parameter can be a NULL pointer, in this case a callback function
* should be defined that will provide the source data to be saved.
- * @param IniFile handle to the ini file where the destination data is saved
+ * @param ini IniFile handle to the ini file where the destination data is saved
* @param grpname character string identifying the section-header of the ini file
* @param list pointer to an string(pointer) array that will be used as the
- * source to be saved into the relevant ini section
+ * source to be saved into the relevant ini section
* @param len the maximum number of items available for the above list
* @param proc callback function that can will provide the source data if defined */
static void ini_save_setting_list(IniFile *ini, const char *grpname, char **list, uint len, SettingListCallbackProc proc)
@@ -1393,8 +1395,9 @@
SDT_VAR(Patches, ending_year, SLE_INT32,0,NC|NO,2051, MIN_YEAR, MAX_YEAR, 1, STR_CONFIG_PATCHES_ENDING_YEAR, NULL),
SDT_BOOL(Patches, smooth_economy, 0, 0, true, STR_CONFIG_PATCHES_SMOOTH_ECONOMY, NULL),
SDT_BOOL(Patches, allow_shares, 0, 0, false, STR_CONFIG_PATCHES_ALLOW_SHARES, NULL),
- SDT_CONDVAR(Patches, town_growth_rate, SLE_UINT8, 54, SL_MAX_VERSION, 0, MS, 2, 0, 4, 0, STR_CONFIG_PATCHES_TOWN_GROWTH, NULL),
- SDT_CONDVAR(Patches, larger_towns, SLE_UINT8, 54, SL_MAX_VERSION, 0, D0, 4, 0, 255, 1, STR_CONFIG_PATCHES_LARGER_TOWNS, NULL),
+ SDT_CONDVAR(Patches, town_growth_rate, SLE_UINT8, 54, SL_MAX_VERSION, 0, MS, 2, 0, 4, 0, STR_CONFIG_PATCHES_TOWN_GROWTH, NULL),
+ SDT_CONDVAR(Patches, larger_towns, SLE_UINT8, 54, SL_MAX_VERSION, 0, D0, 4, 0, 255, 1, STR_CONFIG_PATCHES_LARGER_TOWNS, NULL),
+ SDT_CONDVAR(Patches, initial_city_size, SLE_UINT8, 56, SL_MAX_VERSION, 0, 0, 2, 1, 10, 1, STR_CONFIG_PATCHES_CITY_SIZE_MULTIPLIER, NULL),
/***************************************************************************/
/* AI section of the GUI-configure patches window */
@@ -1729,6 +1732,8 @@
}
/** Network-safe changing of patch-settings (server-only).
+ * @param tile unused
+ * @param flags operation to perform
* @param p1 the index of the patch in the SettingDesc array which identifies it
* @param p2 the new value for the patch
* The new value is properly clamped to its minimum/maximum when setting
@@ -1879,6 +1884,7 @@
}
/** Loadhandler for a list of global variables
+ * @param sdg pointer for the global variable list SettingDescGlobVarList
* @note this is actually a stub for LoadSettings with the
* object pointer set to NULL */
static inline void LoadSettingsGlobList(const SettingDescGlobVarList *sdg)
@@ -1887,7 +1893,7 @@
}
/** Save and load handler for patches/settings
- * @param osd SettingDesc struct containing all information
+ * @param sd SettingDesc struct containing all information
* @param object can be either NULL in which case we load global variables or
* a pointer to a struct which is getting saved */
static void SaveSettings(const SettingDesc *sd, void *object)
--- a/src/settings_gui.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/settings_gui.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -225,6 +225,7 @@
/** Change the side of the road vehicles drive on (server only).
* @param tile unused
+ * @param flags operation to perform
* @param p1 the side of the road; 0 = left side and 1 = right side
* @param p2 unused
*/
@@ -327,13 +328,6 @@
{ 0, 3, 1, STR_6840_PRIMITIVE}
};
-static inline bool GetBitAndShift(uint32 *b)
-{
- uint32 x = *b;
- *b >>= 1;
- return HASBIT(x, 0);
-}
-
/*
* A: competitors
* B: start time in months / 3
@@ -434,9 +428,9 @@
y = GAMEDIFF_WND_TOP_OFFSET;
for (i = 0; i != GAME_DIFFICULTY_NUM; i++) {
- DrawFrameRect( 5, y, 5 + 8, y + 8, 3, GetBitAndShift(&click_a) ? FR_LOWERED : FR_NONE);
- DrawFrameRect(15, y, 15 + 8, y + 8, 3, GetBitAndShift(&click_b) ? FR_LOWERED : FR_NONE);
- if (GetBitAndShift(&disabled) || (_networking && !_network_server)) {
+ DrawFrameRect( 5, y, 5 + 8, y + 8, 3, HASBIT(click_a, i) ? FR_LOWERED : FR_NONE);
+ DrawFrameRect(15, y, 15 + 8, y + 8, 3, HASBIT(click_b, i) ? FR_LOWERED : FR_NONE);
+ if (HASBIT(disabled, i) || (_networking && !_network_server)) {
int color = (1 << PALETTE_MODIFIER_GREYOUT) | _colour_gradient[COLOUR_YELLOW][2];
GfxFillRect( 6, y + 1, 6 + 8, y + 8, color);
GfxFillRect(16, y + 1, 16 + 8, y + 8, color);
@@ -504,7 +498,9 @@
// save value in temporary variable
((int*)&_opt_mod_temp.diff)[btn] = val;
+ RaiseWindowWidget(w, _opt_mod_temp.diff_level + 3);
SetDifficultyLevel(3, &_opt_mod_temp); // set difficulty level to custom
+ LowerWindowWidget(w, _opt_mod_temp.diff_level + 3);
SetWindowDirty(w);
} break;
case 3: case 4: case 5: case 6: /* Easy / Medium / Hard / Custom */
@@ -643,6 +639,7 @@
"allow_shares",
"town_growth_rate",
"larger_towns",
+ "initial_city_size",
};
static const char *_patches_ai[] = {
--- a/src/smallmap_gui.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/smallmap_gui.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -49,12 +49,24 @@
static int _smallmap_type;
static bool _smallmap_show_towns = true;
-#define MK(a,b) a, b
-#define MKEND() 0xFFFF
-#define MS(a,b) (a | 0x100), b
+/** Macro for ordinary entry of LegendAndColor */
+#define MK(a,b) {a, b, false, false}
+/** Macro for end of list marker in arrays of LegendAndColor */
+#define MKEND() {0, STR_NULL, true, false}
+/** Macro for break marker in arrays of LegendAndColor.
+ * It will have valid data, though */
+#define MS(a,b) {a, b, false, true}
-/* Legend text giving the colours to look for on the minimap */
-static const uint16 _legend_land_contours[] = {
+/** Structure for holding relevant data for legends in small map */
+struct LegendAndColour {
+ uint16 colour; ///< color of the item on the map
+ StringID legend; ///< string corresponding to the colored item
+ bool end; ///< this is the end of the list
+ bool col_break; ///< perform a break and go one collumn further
+};
+
+/** Legend text giving the colours to look for on the minimap */
+static const LegendAndColour _legend_land_contours[] = {
MK(0x5A, STR_00F0_100M),
MK(0x5C, STR_00F1_200M),
MK(0x5E, STR_00F2_300M),
@@ -69,7 +81,7 @@
MKEND()
};
-static const uint16 _legend_vehicles[] = {
+static const LegendAndColour _legend_vehicles[] = {
MK(0xB8, STR_00F5_TRAINS),
MK(0xBF, STR_00F6_ROAD_VEHICLES),
MK(0x98, STR_00F7_SHIPS),
@@ -79,7 +91,7 @@
MKEND()
};
-static const uint16 _legend_industries_normal[] = {
+static const LegendAndColour _legend_industries_normal[] = {
MK(0xD7, STR_00FA_COAL_MINE),
MK(0xB8, STR_00FB_POWER_STATION),
MK(0x56, STR_00FC_FOREST),
@@ -95,7 +107,7 @@
MKEND()
};
-static const uint16 _legend_industries_hilly[] = {
+static const LegendAndColour _legend_industries_hilly[] = {
MK(0xD7, STR_00FA_COAL_MINE),
MK(0xB8, STR_00FB_POWER_STATION),
MK(0x56, STR_00FC_FOREST),
@@ -111,7 +123,7 @@
MKEND()
};
-static const uint16 _legend_industries_desert[] = {
+static const LegendAndColour _legend_industries_desert[] = {
MK(0xBF, STR_00FE_OIL_REFINERY),
MK(0x98, STR_0102_OIL_WELLS),
MK(0x0F, STR_0105_BANK),
@@ -129,7 +141,7 @@
MKEND()
};
-static const uint16 _legend_industries_candy[] = {
+static const LegendAndColour _legend_industries_candy[] = {
MK(0x30, STR_0110_COTTON_CANDY_FOREST),
MK(0xAE, STR_0111_CANDY_FACTORY),
MK(0x27, STR_0112_BATTERY_FARM),
@@ -145,7 +157,7 @@
MKEND()
};
-static const uint16 _legend_routes[] = {
+static const LegendAndColour _legend_routes[] = {
MK(0xD7, STR_00EB_ROADS),
MK(0x0A, STR_00EC_RAILROADS),
MK(0xB5, STR_00EE_BUILDINGS_INDUSTRIES),
@@ -158,7 +170,7 @@
MKEND()
};
-static const uint16 _legend_vegetation[] = {
+static const LegendAndColour _legend_vegetation[] = {
MK(0x52, STR_0120_ROUGH_LAND),
MK(0x54, STR_0121_GRASS_LAND),
MK(0x37, STR_0122_BARE_LAND),
@@ -174,7 +186,7 @@
MKEND()
};
-static const uint16 _legend_land_owners[] = {
+static const LegendAndColour _legend_land_owners[] = {
MK(0xCA, STR_0126_WATER),
MK(0x54, STR_0127_NO_OWNER),
MK(0xB4, STR_0128_TOWNS),
@@ -186,8 +198,9 @@
#undef MKEND
-enum { IND_OFFS = 6 };
-static const uint16 * const _legend_table[] = {
+enum { IND_OFFS = 6 }; ///< allow to "jump" to the industries corresponding to the landscape
+
+static const LegendAndColour * const _legend_table[] = {
_legend_land_contours,
_legend_vehicles,
NULL,
@@ -383,7 +396,7 @@
/**
* Return the color a tile would be displayed with in the small map in mode "Vehicles".
*
- * @param t The tile of which we would like to get the color.
+ * @param tile The tile of which we would like to get the color.
* @return The color of tile in the small map in mode "Vehicles"
*/
static inline uint32 GetSmallMapVehiclesPixels(TileIndex tile)
@@ -413,7 +426,7 @@
/**
* Return the color a tile would be displayed with in the small map in mode "Routes".
*
- * @param t The tile of which we would like to get the color.
+ * @param tile The tile of which we would like to get the color.
* @return The color of tile in the small map in mode "Routes"
*/
static inline uint32 GetSmallMapRoutesPixels(TileIndex tile)
@@ -489,7 +502,7 @@
/**
* Return the color a tile would be displayed with in the small map in mode "Owner".
*
- * @param t The tile of which we would like to get the color.
+ * @param tile The tile of which we would like to get the color.
* @return The color of tile in the small map in mode "Owner"
*/
static inline uint32 GetSmallMapOwnerPixels(TileIndex tile)
@@ -553,7 +566,7 @@
* are drawn directly into the screen buffer. The final map is drawn in multiple passes.
* The passes are:
* <ol><li>The colors of tiles in the different modes.</li>
- * <li>Town names (optional)</li>
+ * <li>Town names (optional)</li></ol>
*
* @param dpi pointer to pixel to write onto
* @param w pointer to Window struct
@@ -779,7 +792,7 @@
{
switch (e->event) {
case WE_PAINT: {
- const uint16 *tbl;
+ const LegendAndColour *tbl;
int x, y, y_org;
DrawPixelInfo new_dpi;
@@ -794,15 +807,16 @@
y = y_org;
for (;;) {
GfxFillRect(x, y + 1, x + 8, y + 5, 0);
- GfxFillRect(x + 1, y + 2, x + 7, y + 4, (byte)tbl[0]);
- DrawString(x + 11, y, tbl[1], 0);
+ GfxFillRect(x + 1, y + 2, x + 7, y + 4, tbl->colour);
+ DrawString(x + 11, y, tbl->legend, 0);
- tbl += 2;
+ tbl += 1;
y += 6;
- if (tbl[0] == 0xFFFF) {
+ if (tbl->end) { // end of the list
break;
- } else if (tbl[0] & 0x100) {
+ } else if (tbl->col_break) {
+ /* break asked, continue at top, 123 pixels (one "row") to the right */
x += 123;
y = y_org;
}
--- a/src/spritecache.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/spritecache.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -1,6 +1,6 @@
/* $Id$ */
-/** @file spritechache.cpp */
+/** @file spritecache.cpp */
#include "stdafx.h"
#include "openttd.h"
--- a/src/station.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/station.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -59,7 +59,6 @@
* Aircraft-Hangar orders need special treatment here, as the hangars are
* actually part of a station (tiletype is STATION), but the order type
* is OT_GOTO_DEPOT.
- * @param st Station to be deleted
*/
Station::~Station()
{
--- a/src/station_cmd.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/station_cmd.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -789,6 +789,7 @@
/** Build railroad station
* @param tile_org starting position of station dragging/placement
+ * @param flags operation to perform
* @param p1 various bitstuffed elements
* - p1 = (bit 0) - orientation (Axis)
* - p1 = (bit 8-15) - number of tracks
@@ -1023,6 +1024,7 @@
/** Remove a single tile from a railroad station.
* This allows for custom-built station with holes and weird layouts
* @param tile tile of station piece to remove
+ * @param flags operation to perform
* @param p1 unused
* @param p2 unused
*/
@@ -1153,8 +1155,8 @@
}
/**
- * @param[in] truck_station Determines whether a stop is RoadStop::BUS or RoadStop::TRUCK
- * @param[in] station The station to do the whole procedure for
+ * @param truck_station Determines whether a stop is RoadStop::BUS or RoadStop::TRUCK
+ * @param st The Station to do the whole procedure for
* @return a pointer to where to link a new RoadStop*
*/
static RoadStop **FindRoadStopSpot(bool truck_station, Station* st)
@@ -1162,10 +1164,10 @@
RoadStop **primary_stop = (truck_station) ? &st->truck_stops : &st->bus_stops;
if (*primary_stop == NULL) {
- //we have no roadstop of the type yet, so write a "primary stop"
+ /* we have no roadstop of the type yet, so write a "primary stop" */
return primary_stop;
} else {
- //there are stops already, so append to the end of the list
+ /* there are stops already, so append to the end of the list */
RoadStop *stop = *primary_stop;
while (stop->next != NULL) stop = stop->next;
return &stop->next;
@@ -1174,6 +1176,7 @@
/** Build a bus or truck stop
* @param tile tile to build the stop at
+ * @param flags operation to perform
* @param p1 entrance direction (DiagDirection)
* @param p2 bit 0: 0 for Bus stops, 1 for truck stops
* bit 1: 0 for normal, 1 for drive-through
@@ -1341,6 +1344,7 @@
/** Remove a bus or truck stop
* @param tile tile to remove the stop from
+ * @param flags operation to perform
* @param p1 not used
* @param p2 bit 0: 0 for Bus stops, 1 for truck stops
*/
@@ -1466,6 +1470,7 @@
/** Place an Airport.
* @param tile tile where airport will be built
+ * @param flags operation to perform
* @param p1 airport type, @see airport.h
* @param p2 unused
*/
@@ -1641,6 +1646,7 @@
/** Build a buoy.
* @param tile tile where to place the bouy
+ * @param flags operation to perform
* @param p1 unused
* @param p2 unused
*/
@@ -1749,6 +1755,7 @@
/** Build a dock/haven.
* @param tile tile where dock will be built
+ * @param flags operation to perform
* @param p1 unused
* @param p2 unused
*/
@@ -2381,6 +2388,7 @@
/** Rename a station
* @param tile unused
+ * @param flags operation to perform
* @param p1 station ID that is to be renamed
* @param p2 unused
*/
@@ -2820,7 +2828,9 @@
static void SaveLoad_STNS(Station *st)
{
SlObject(st, _station_desc);
- for (CargoID i = 0; i < NUM_CARGO; i++) {
+
+ uint num_cargo = CheckSavegameVersion(55) ? 12 : NUM_CARGO;
+ for (CargoID i = 0; i < num_cargo; i++) {
SlObject(&st->goods[i], _goods_desc);
}
--- a/src/station_map.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/station_map.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -6,7 +6,12 @@
#include "openttd.h"
#include "station_map.h"
-
+/**
+ * Get the station type (rail, airport, truck etc) for the given tile.
+ * @param t the tile to get the station type of.
+ * @pre IsTileType(t, MP_STATION)
+ * @return the station type of the given tile.
+ */
StationType GetStationType(TileIndex t)
{
assert(IsTileType(t, MP_STATION));
--- a/src/stdafx.h Tue Jun 12 11:56:35 2007 +0000
+++ b/src/stdafx.h Wed Jun 13 11:00:24 2007 +0000
@@ -1,6 +1,6 @@
/* $Id$ */
-/** @file stdfax.h */
+/** @file stdafx.h */
#ifndef STDAFX_H
#define STDAFX_H
--- a/src/table/build_industry.h Tue Jun 12 11:56:35 2007 +0000
+++ b/src/table/build_industry.h Wed Jun 13 11:00:24 2007 +0000
@@ -1068,7 +1068,42 @@
#undef MK
#undef MKEND
-#define MK(tbl, d, ai1, ai2, ai3, ai4, ag1, ag2, ag3, ag4, col,\
+/**
+ * Writes the properties of an industry into the IndustrySpec struct.
+ * @param tbl tile table
+ * @param d cost multiplier
+ * @param ai1 appear chance ingame - temperate
+ * @param ai2 appear chance ingame - arctic
+ * @param ai3 appear chance ingame - tropic
+ * @param ai4 appear chance ingame - toyland
+ * @param ag1 appear chance random creation - temperate
+ * @param ag2 appear chance random creation - arctic
+ * @param ag3 appear chance random creation - tropic
+ * @param ag4 appear chance random creation - toyland
+ * @param col map colour
+ * @param c1 industry proximity refusal - 1st
+ * @param c2 industry proximity refusal - 2nd
+ * @param c3 industry proximity refusal - 3th
+ * @param proc check procedure index
+ * @param p1 produce cargo 1
+ * @param r1 rate of production 1
+ * @param p2 produce cargo 2
+ * @param r2 rate of production 1
+ * @param m minimum cargo moved to station
+ * @param a1 accepted cargo 1
+ * @param a2 accepted cargo 2
+ * @param a3 accepted cargo 3
+ * @param pr industry life (actually, the same as extractive, organic, processing in ttdpatch's specs)
+ * @param clim climate availaility
+ * @param bev industry behaviour
+ * @param in name
+ * @param intx text while building
+ * @param s1 text for closure
+ * @param s2 text for production up
+ * @param s3 text for production down
+ */
+
+#define MI(tbl, d, ai1, ai2, ai3, ai4, ag1, ag2, ag3, ag4, col,\
c1, c2, c3, proc, p1, r1, p2, r2, m, a1, a2, a3, pr, clim, bev, in, intx, s1, s2, s3) \
{tbl, lengthof(tbl), d, {c1, c2, c3}, proc, {p1, p2}, {r1, r2}, m, \
{a1, a2, a3}, pr, clim, bev, col, in, intx, s1, s2, s3, {ai1, ai2, ai3, ai4}, {ag1, ag2, ag3, ag4}, 0, 0, 0, 0}
@@ -1083,7 +1118,7 @@
industry behaviours
industry name building text
messages : Closure production up production down */
- MK(_tile_table_coal_mine, 210, 2, 3, 0, 0, 8, 8, 0, 0, 215,
+ MI(_tile_table_coal_mine, 210, 2, 3, 0, 0, 8, 8, 0, 0, 215,
IT_POWER_STATION, IT_INVALID, IT_INVALID, CHECK_NOTHING,
CT_COAL, 15, CT_INVALID, 0, 5,
CT_INVALID, CT_INVALID, CT_INVALID,
@@ -1092,7 +1127,7 @@
STR_4802_COAL_MINE, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4836_NEW_COAL_SEAM_FOUND_AT, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_power_station, 30, 2, 2, 0, 0, 5, 5, 0, 0, 184,
+ MI(_tile_table_power_station, 30, 2, 2, 0, 0, 5, 5, 0, 0, 184,
IT_COAL_MINE, IT_INVALID, IT_INVALID, CHECK_NOTHING,
CT_INVALID, 0, CT_INVALID, 0, 5,
CT_COAL, CT_INVALID, CT_INVALID,
@@ -1101,7 +1136,7 @@
STR_4803_POWER_STATION, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_sawmill, 28, 2, 0, 0, 0, 5, 0, 0, 0, 194,
+ MI(_tile_table_sawmill, 28, 2, 0, 0, 0, 5, 0, 0, 0, 194,
IT_FOREST, IT_INVALID, IT_INVALID, CHECK_NOTHING,
CT_GOODS, 0, CT_INVALID, 0, 5,
CT_WOOD, CT_INVALID, CT_INVALID,
@@ -1110,7 +1145,7 @@
STR_4804_SAWMILL, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_forest, 200, 3, 4, 0, 0, 5, 5, 0, 0, 86,
+ MI(_tile_table_forest, 200, 3, 4, 0, 0, 5, 5, 0, 0, 86,
IT_SAWMILL, IT_PAPER_MILL, IT_INVALID, CHECK_FOREST,
CT_WOOD, 13, CT_INVALID, 0, 30,
CT_INVALID, CT_INVALID, CT_INVALID,
@@ -1119,7 +1154,7 @@
STR_4805_FOREST, STR_482E_NEW_BEING_PLANTED_NEAR,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_483A_INSECT_INFESTATION_CAUSES),
- MK(_tile_table_oil_refinery, 31, 2, 2, 2, 0, 4, 4, 4, 0, 191,
+ MI(_tile_table_oil_refinery, 31, 2, 2, 2, 0, 4, 4, 4, 0, 191,
IT_OIL_RIG, IT_INVALID, IT_INVALID, CHECK_REFINERY,
CT_GOODS, 0, CT_INVALID, 0, 5,
CT_OIL, CT_INVALID, CT_INVALID,
@@ -1128,7 +1163,7 @@
STR_4806_OIL_REFINERY, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_oil_rig, 240, 6, 0, 0, 0, 0, 0, 0, 0, 152,
+ MI(_tile_table_oil_rig, 240, 6, 0, 0, 0, 0, 0, 0, 0, 152,
IT_OIL_REFINERY, IT_INVALID, IT_INVALID, CHECK_OIL_RIG,
CT_OIL, 15, CT_PASSENGERS, 2, 5,
CT_INVALID, CT_INVALID, CT_INVALID,
@@ -1137,7 +1172,7 @@
STR_4807_OIL_RIG, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4837_NEW_OIL_RESERVES_FOUND, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_factory, 26, 2, 0, 0, 0, 5, 0, 0, 0, 174,
+ MI(_tile_table_factory, 26, 2, 0, 0, 0, 5, 0, 0, 0, 174,
IT_FARM, IT_STEEL_MILL, IT_INVALID, CHECK_NOTHING,
CT_GOODS, 0, CT_INVALID, 0, 5,
CT_LIVESTOCK, CT_GRAIN, CT_STEEL,
@@ -1146,7 +1181,7 @@
STR_4808_FACTORY, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_printing_works, 26, 0, 2, 0, 0, 0, 5, 0, 0, 174,
+ MI(_tile_table_printing_works, 26, 0, 2, 0, 0, 0, 5, 0, 0, 174,
IT_PAPER_MILL, IT_INVALID, IT_INVALID, CHECK_NOTHING,
CT_GOODS, 0, CT_INVALID, 0, 5,
CT_PAPER, CT_INVALID, CT_INVALID,
@@ -1155,7 +1190,7 @@
STR_4809_PRINTING_WORKS, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_steel_mill, 27, 2, 0, 0, 0, 5, 0, 0, 0, 10,
+ MI(_tile_table_steel_mill, 27, 2, 0, 0, 0, 5, 0, 0, 0, 10,
IT_IRON_MINE, IT_FACTORY, IT_INVALID, CHECK_NOTHING,
CT_STEEL, 0, CT_INVALID, 0, 5,
CT_IRON_ORE, CT_INVALID, CT_INVALID,
@@ -1164,7 +1199,7 @@
STR_480A_STEEL_MILL, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_farm, 250, 2, 4, 0, 0, 9, 9, 0, 0, 48,
+ MI(_tile_table_farm, 250, 2, 4, 0, 0, 9, 9, 0, 0, 48,
IT_FACTORY, IT_FOOD_PROCESS, IT_INVALID, CHECK_FARM,
CT_GRAIN, 10, CT_LIVESTOCK, 10, 5,
CT_INVALID, CT_INVALID, CT_INVALID,
@@ -1173,7 +1208,7 @@
STR_480B_FARM, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4838_IMPROVED_FARMING_METHODS, STR_483A_INSECT_INFESTATION_CAUSES),
- MK(_tile_table_copper_mine, 205, 0, 0, 3, 0, 0, 0, 4, 0, 10,
+ MI(_tile_table_copper_mine, 205, 0, 0, 3, 0, 0, 0, 4, 0, 10,
IT_FACTORY_2, IT_INVALID, IT_INVALID, CHECK_NOTHING,
CT_COPPER_ORE, 10, CT_INVALID, 0, 5,
CT_INVALID, CT_INVALID, CT_INVALID,
@@ -1182,7 +1217,7 @@
STR_480C_COPPER_ORE_MINE, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_oil_well, 220, 0, 5, 3, 0, 4, 5, 5, 0, 152,
+ MI(_tile_table_oil_well, 220, 0, 5, 3, 0, 4, 5, 5, 0, 152,
IT_OIL_REFINERY, IT_INVALID, IT_INVALID, CHECK_NOTHING,
CT_OIL, 12, CT_INVALID, 0, 5,
CT_INVALID, CT_INVALID, CT_INVALID,
@@ -1191,7 +1226,7 @@
STR_480D_OIL_WELLS, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4837_NEW_OIL_RESERVES_FOUND, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_bank, 193, 7, 0, 0, 0, 0, 0, 0, 0, 15,
+ MI(_tile_table_bank, 193, 7, 0, 0, 0, 0, 0, 0, 0, 15,
IT_BANK_TEMP, IT_INVALID, IT_INVALID, CHECK_NOTHING,
CT_VALUABLES, 6, CT_INVALID, 0, 5,
CT_VALUABLES, CT_INVALID, CT_INVALID,
@@ -1200,7 +1235,7 @@
STR_480E_BANK, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_food_process, 26, 0, 2, 2, 0, 0, 3, 4, 0, 55,
+ MI(_tile_table_food_process, 26, 0, 2, 2, 0, 0, 3, 4, 0, 55,
IT_FRUIT_PLANTATION, IT_FARM, IT_FARM_2, CHECK_NOTHING,
CT_FOOD, 0, CT_INVALID, 0, 5,
CT_FRUIT, CT_MAIZE, CT_INVALID,
@@ -1209,7 +1244,7 @@
STR_480F_FOOD_PROCESSING_PLANT, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_paper_mill, 28, 0, 2, 0, 0, 0, 5, 0, 0, 10,
+ MI(_tile_table_paper_mill, 28, 0, 2, 0, 0, 0, 5, 0, 0, 10,
IT_FOREST, IT_PRINTING_WORKS, IT_INVALID, CHECK_NOTHING,
CT_PAPER, 0, CT_INVALID, 0, 5,
CT_WOOD, CT_INVALID, CT_INVALID,
@@ -1218,7 +1253,7 @@
STR_4810_PAPER_MILL, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_gold_mine, 208, 0, 3, 0, 0, 0, 4, 0, 0, 194,
+ MI(_tile_table_gold_mine, 208, 0, 3, 0, 0, 0, 4, 0, 0, 194,
IT_BANK_TROPIC_ARCTIC, IT_INVALID, IT_INVALID, CHECK_NOTHING,
CT_GOLD, 7, CT_INVALID, 0, 5,
CT_INVALID, CT_INVALID, CT_INVALID,
@@ -1227,7 +1262,7 @@
STR_4811_GOLD_MINE, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_bank2, 19, 0, 3, 3, 0, 0, 6, 5, 0, 15,
+ MI(_tile_table_bank2, 19, 0, 3, 3, 0, 0, 6, 5, 0, 15,
IT_GOLD_MINE, IT_DIAMOND_MINE, IT_INVALID, CHECK_NOTHING,
CT_INVALID, 0, CT_INVALID, 0, 5,
CT_GOLD, CT_INVALID, CT_INVALID,
@@ -1236,7 +1271,7 @@
STR_4812_BANK, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_diamond_mine, 213, 0, 0, 3, 0, 0, 0, 4, 0, 184,
+ MI(_tile_table_diamond_mine, 213, 0, 0, 3, 0, 0, 0, 4, 0, 184,
IT_BANK_TROPIC_ARCTIC, IT_INVALID, IT_INVALID, CHECK_NOTHING,
CT_DIAMONDS, 7, CT_INVALID, 0, 5,
CT_INVALID, CT_INVALID, CT_INVALID,
@@ -1245,7 +1280,7 @@
STR_4813_DIAMOND_MINE, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_iron_mine, 220, 2, 0, 0, 0, 5, 0, 0, 0, 55,
+ MI(_tile_table_iron_mine, 220, 2, 0, 0, 0, 5, 0, 0, 0, 55,
IT_STEEL_MILL, IT_INVALID, IT_INVALID, CHECK_NOTHING,
CT_IRON_ORE, 10, CT_INVALID, 0, 5,
CT_INVALID, CT_INVALID, CT_INVALID,
@@ -1254,7 +1289,7 @@
STR_4814_IRON_ORE_MINE, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_fruit_plantation, 225, 0, 0, 2, 0, 0, 0, 4, 0, 86,
+ MI(_tile_table_fruit_plantation, 225, 0, 0, 2, 0, 0, 0, 4, 0, 86,
IT_FOOD_PROCESS, IT_INVALID, IT_INVALID, CHECK_PLANTATION,
CT_FRUIT, 10, CT_INVALID, 0, 15,
CT_INVALID, CT_INVALID, CT_INVALID,
@@ -1263,7 +1298,7 @@
STR_4815_FRUIT_PLANTATION, STR_482E_NEW_BEING_PLANTED_NEAR,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4838_IMPROVED_FARMING_METHODS, STR_483A_INSECT_INFESTATION_CAUSES),
- MK(_tile_table_rubber_plantation, 218, 0, 0, 3, 0, 0, 0, 4, 0, 39,
+ MI(_tile_table_rubber_plantation, 218, 0, 0, 3, 0, 0, 0, 4, 0, 39,
IT_FACTORY_2, IT_INVALID, IT_INVALID, CHECK_PLANTATION,
CT_RUBBER, 10, CT_INVALID, 0, 15,
CT_INVALID, CT_INVALID, CT_INVALID,
@@ -1272,7 +1307,7 @@
STR_4816_RUBBER_PLANTATION, STR_482E_NEW_BEING_PLANTED_NEAR,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4838_IMPROVED_FARMING_METHODS, STR_483A_INSECT_INFESTATION_CAUSES),
- MK(_tile_table_water_supply, 199, 0, 0, 3, 0, 0, 0, 4, 0, 37,
+ MI(_tile_table_water_supply, 199, 0, 0, 3, 0, 0, 0, 4, 0, 37,
IT_WATER_TOWER, IT_INVALID, IT_INVALID, CHECK_WATER,
CT_WATER, 12, CT_INVALID, 0, 5,
CT_INVALID, CT_INVALID, CT_INVALID,
@@ -1281,7 +1316,7 @@
STR_4817_WATER_SUPPLY, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_water_tower, 14, 0, 0, 4, 0, 0, 0, 8, 0, 208,
+ MI(_tile_table_water_tower, 14, 0, 0, 4, 0, 0, 0, 8, 0, 208,
IT_WATER_SUPPLY, IT_INVALID, IT_INVALID, CHECK_WATER,
CT_INVALID, 0, CT_INVALID, 0, 5,
CT_WATER, CT_INVALID, CT_INVALID,
@@ -1290,7 +1325,7 @@
STR_4818_WATER_TOWER, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_factory2, 26, 0, 0, 2, 0, 0, 0, 4, 0, 174,
+ MI(_tile_table_factory2, 26, 0, 0, 2, 0, 0, 0, 4, 0, 174,
IT_RUBBER_PLANTATION, IT_COPPER_MINE, IT_LUMBER_MILL, CHECK_PLANTATION,
CT_GOODS, 0, CT_INVALID, 0, 5,
CT_RUBBER, CT_COPPER_ORE, CT_WOOD,
@@ -1299,7 +1334,7 @@
STR_4819_FACTORY, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_farm2, 250, 0, 0, 1, 0, 0, 0, 2, 0, 48,
+ MI(_tile_table_farm2, 250, 0, 0, 1, 0, 0, 0, 2, 0, 48,
IT_FOOD_PROCESS, IT_INVALID, IT_INVALID, CHECK_PLANTATION,
CT_MAIZE, 11, CT_INVALID, 0, 5,
CT_INVALID, CT_INVALID, CT_INVALID,
@@ -1308,7 +1343,7 @@
STR_481A_FARM, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4838_IMPROVED_FARMING_METHODS, STR_483A_INSECT_INFESTATION_CAUSES),
- MK(_tile_table_lumber_mill, 17, 0, 0, 0, 0, 0, 0, 0, 0, 194,
+ MI(_tile_table_lumber_mill, 17, 0, 0, 0, 0, 0, 0, 0, 0, 194,
IT_FACTORY_2, IT_INVALID, IT_INVALID, CHECK_LUMBERMILL,
CT_WOOD, 0, CT_INVALID, 0, 5,
CT_INVALID, CT_INVALID, CT_INVALID,
@@ -1317,7 +1352,7 @@
STR_481B_LUMBER_MILL, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4834_LACK_OF_NEARBY_TREES_CAUSES, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_cotton_candy, 195, 0, 0, 0, 3, 0, 0, 0, 5, 48,
+ MI(_tile_table_cotton_candy, 195, 0, 0, 0, 3, 0, 0, 0, 5, 48,
IT_CANDY_FACTORY, IT_INVALID, IT_INVALID, CHECK_NOTHING,
CT_COTTON_CANDY, 13, CT_INVALID, 0, 30,
CT_INVALID, CT_INVALID, CT_INVALID,
@@ -1326,7 +1361,7 @@
STR_481C_COTTON_CANDY_FOREST, STR_482E_NEW_BEING_PLANTED_NEAR,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4838_IMPROVED_FARMING_METHODS, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_candy_factory, 26, 0, 0, 0, 3, 0, 0, 0, 5, 174,
+ MI(_tile_table_candy_factory, 26, 0, 0, 0, 3, 0, 0, 0, 5, 174,
IT_COTTON_CANDY, IT_TOFFEE_QUARRY, IT_SUGAR_MINE, CHECK_NOTHING,
CT_CANDY, 0, CT_INVALID, 0, 5,
CT_SUGAR, CT_TOFFEE, CT_COTTON_CANDY,
@@ -1335,7 +1370,7 @@
STR_481D_CANDY_FACTORY, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_battery_farm, 187, 0, 0, 0, 3, 0, 0, 0, 4, 39,
+ MI(_tile_table_battery_farm, 187, 0, 0, 0, 3, 0, 0, 0, 4, 39,
IT_TOY_FACTORY, IT_INVALID, IT_INVALID, CHECK_NOTHING,
CT_BATTERIES, 11, CT_INVALID, 0, 30,
CT_INVALID, CT_INVALID, CT_INVALID,
@@ -1344,7 +1379,7 @@
STR_481E_BATTERY_FARM, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4838_IMPROVED_FARMING_METHODS, STR_483A_INSECT_INFESTATION_CAUSES),
- MK(_tile_table_cola_wells, 193, 0, 0, 0, 3, 0, 0, 0, 5, 55,
+ MI(_tile_table_cola_wells, 193, 0, 0, 0, 3, 0, 0, 0, 5, 55,
IT_FIZZY_DRINK_FACTORY, IT_INVALID, IT_INVALID, CHECK_NOTHING,
CT_COLA, 12, CT_INVALID, 0, 5,
CT_INVALID, CT_INVALID, CT_INVALID,
@@ -1353,7 +1388,7 @@
STR_481F_COLA_WELLS, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_toy_shop, 17, 0, 0, 0, 3, 0, 0, 0, 4, 208,
+ MI(_tile_table_toy_shop, 17, 0, 0, 0, 3, 0, 0, 0, 4, 208,
IT_TOY_FACTORY, IT_INVALID, IT_INVALID, CHECK_NOTHING,
CT_INVALID, 0, CT_INVALID, 0, 5,
CT_TOYS, CT_INVALID, CT_INVALID,
@@ -1362,7 +1397,7 @@
STR_4820_TOY_SHOP, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_toy_factory, 20, 0, 0, 0, 3, 0, 0, 0, 5, 10,
+ MI(_tile_table_toy_factory, 20, 0, 0, 0, 3, 0, 0, 0, 5, 10,
IT_PLASTIC_FOUNTAINS, IT_BATTERY_FARM, IT_TOY_SHOP, CHECK_NOTHING,
CT_TOYS, 0, CT_INVALID, 0, 5,
CT_PLASTIC, CT_BATTERIES, CT_INVALID,
@@ -1371,7 +1406,7 @@
STR_4821_TOY_FACTORY, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_plastic_fountain, 192, 0, 0, 0, 3, 0, 0, 0, 5, 37,
+ MI(_tile_table_plastic_fountain, 192, 0, 0, 0, 3, 0, 0, 0, 5, 37,
IT_TOY_FACTORY, IT_INVALID, IT_INVALID, CHECK_NOTHING,
CT_PLASTIC, 14, CT_INVALID, 0, 5,
CT_INVALID, CT_INVALID, CT_INVALID,
@@ -1380,7 +1415,7 @@
STR_4822_PLASTIC_FOUNTAINS, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_fizzy_drink, 22, 0, 0, 0, 3, 0, 0, 0, 4, 184,
+ MI(_tile_table_fizzy_drink, 22, 0, 0, 0, 3, 0, 0, 0, 4, 184,
IT_COLA_WELLS, IT_BUBBLE_GENERATOR, IT_INVALID, CHECK_NOTHING,
CT_FIZZY_DRINKS, 0, CT_INVALID, 0, 5,
CT_COLA, CT_BUBBLES, CT_INVALID,
@@ -1389,7 +1424,7 @@
STR_4823_FIZZY_DRINK_FACTORY, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_bubble_generator, 203, 0, 0, 0, 3, 0, 0, 0, 5, 152,
+ MI(_tile_table_bubble_generator, 203, 0, 0, 0, 3, 0, 0, 0, 5, 152,
IT_FIZZY_DRINK_FACTORY, IT_INVALID, IT_INVALID, CHECK_BUBBLEGEN,
CT_BUBBLES, 13, CT_INVALID, 0, 5,
CT_INVALID, CT_INVALID, CT_INVALID,
@@ -1398,7 +1433,7 @@
STR_4824_BUBBLE_GENERATOR, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_toffee_quarry, 213, 0, 0, 0, 3, 0, 0, 0, 5, 194,
+ MI(_tile_table_toffee_quarry, 213, 0, 0, 0, 3, 0, 0, 0, 5, 194,
IT_CANDY_FACTORY, IT_INVALID, IT_INVALID, CHECK_NOTHING,
CT_TOFFEE, 10, CT_INVALID, 0, 5,
CT_INVALID, CT_INVALID, CT_INVALID,
@@ -1407,7 +1442,7 @@
STR_4825_TOFFEE_QUARRY, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
- MK(_tile_table_sugar_mine, 210, 0, 0, 0, 2, 0, 0, 0, 4, 15,
+ MI(_tile_table_sugar_mine, 210, 0, 0, 0, 2, 0, 0, 0, 4, 15,
IT_CANDY_FACTORY, IT_INVALID, IT_INVALID, CHECK_NOTHING,
CT_SUGAR, 11, CT_INVALID, 0, 5,
CT_INVALID, CT_INVALID, CT_INVALID,
@@ -1416,266 +1451,266 @@
STR_4826_SUGAR_MINE, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
};
-#undef MK
+#undef MI
-/** Writes the properties of a industry tile into the IndustryTileSpec struct.
+/** Writes the properties of an industry tile into the IndustryTileSpec struct.
* @param c1 first type of cargo accepted for this tile
* @param c2 second cargo
* @param c3 and third cargo. Those three are in an array
* @param s1 slope refused upon choosing a place to build
* @param a1 animation frame on production
* @param a2 next frame of animation
- * @param a3 chosses between animation of construction state
+ * @param a3 chooses between animation or construction state
*/
-#define MK(c1, c2, c3, sl, a1, a2, a3) {{c1, c2, c3}, sl, a1, a2, a3}
+#define MT(c1, c2, c3, sl, a1, a2, a3) {{c1, c2, c3}, sl, a1, a2, a3}
static const IndustryTileSpec _industry_tile_specs[] = {
/* Coal Mine */
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, true),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_PASSENGERS, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, true),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_PASSENGERS, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Power Station */
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_PASSENGERS, CT_INVALID, CT_COAL, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_PASSENGERS, CT_INVALID, CT_COAL, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Sawmill */
- MK(CT_PASSENGERS, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_PASSENGERS, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_PASSENGERS, CT_INVALID, CT_WOOD, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_PASSENGERS, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_PASSENGERS, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_PASSENGERS, CT_INVALID, CT_WOOD, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Forest Artic, temperate */
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, 17, INDUTILE_NOANIM, false), // Chopping forest
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, 16, false), // Growing forest
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, 17, INDUTILE_NOANIM, false), ///< Chopping forest
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, 16, false), ///< Growing forest
/* Oil refinery */
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_OIL, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_PASSENGERS, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_OIL, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_PASSENGERS, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* oil Rig */
- MK(CT_INVALID, CT_INVALID, CT_PASSENGERS, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_MAIL, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_PASSENGERS, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_MAIL, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Oil Wells artic, temperate */
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, true ),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, true ),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, true ),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, true ),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, true ),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, true ),
/* Farm tropic, arctic and temperate */
- MK(CT_PASSENGERS, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_PASSENGERS, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_PASSENGERS, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_PASSENGERS, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Factory temperate */
- MK(CT_GRAIN, CT_STEEL, CT_LIVESTOCK, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_GRAIN, CT_STEEL, CT_LIVESTOCK, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_GRAIN, CT_STEEL, CT_LIVESTOCK, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_GRAIN, CT_STEEL, CT_LIVESTOCK, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_GRAIN, CT_STEEL, CT_LIVESTOCK, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_GRAIN, CT_STEEL, CT_LIVESTOCK, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_GRAIN, CT_STEEL, CT_LIVESTOCK, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_GRAIN, CT_STEEL, CT_LIVESTOCK, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Printing works */
- MK(CT_INVALID, CT_INVALID, CT_PAPER, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_PAPER, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_PAPER, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_PAPER, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_PAPER, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_PAPER, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_PAPER, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_PAPER, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Copper ore mine */
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, true ),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_PASSENGERS, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_PASSENGERS, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, true ),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_PASSENGERS, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_PASSENGERS, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Steel mill */
- MK(CT_PASSENGERS, CT_INVALID, CT_IRON_ORE, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_PASSENGERS, CT_INVALID, CT_IRON_ORE, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_PASSENGERS, CT_INVALID, CT_IRON_ORE, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_PASSENGERS, CT_INVALID, CT_IRON_ORE, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_PASSENGERS, CT_INVALID, CT_IRON_ORE, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_PASSENGERS, CT_INVALID, CT_IRON_ORE, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_PASSENGERS, CT_INVALID, CT_IRON_ORE, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_PASSENGERS, CT_INVALID, CT_IRON_ORE, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_PASSENGERS, CT_INVALID, CT_IRON_ORE, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_PASSENGERS, CT_INVALID, CT_IRON_ORE, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_PASSENGERS, CT_INVALID, CT_IRON_ORE, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_PASSENGERS, CT_INVALID, CT_IRON_ORE, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Bank temperate*/
- MK(CT_PASSENGERS, CT_INVALID, CT_VALUABLES, SLOPE_E, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_PASSENGERS, CT_INVALID, CT_VALUABLES, SLOPE_S, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_PASSENGERS, CT_INVALID, CT_VALUABLES, SLOPE_E, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_PASSENGERS, CT_INVALID, CT_VALUABLES, SLOPE_S, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Food processing plant, tropic and arctic. CT_MAIZE or CT_WHEAT, CT_LIVESTOCK or CT_FRUIT*/
- MK(CT_MAIZE, CT_INVALID, CT_LIVESTOCK, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_MAIZE, CT_INVALID, CT_LIVESTOCK, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_MAIZE, CT_INVALID, CT_LIVESTOCK, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_MAIZE, CT_INVALID, CT_LIVESTOCK, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_MAIZE, CT_INVALID, CT_LIVESTOCK, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_MAIZE, CT_INVALID, CT_LIVESTOCK, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_MAIZE, CT_INVALID, CT_LIVESTOCK, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_MAIZE, CT_INVALID, CT_LIVESTOCK, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Paper mill */
- MK(CT_INVALID, CT_INVALID, CT_WOOD, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_WOOD, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_WOOD, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_WOOD, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_WOOD, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_WOOD, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_WOOD, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_WOOD, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_WOOD, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_WOOD, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_WOOD, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_WOOD, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_WOOD, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_WOOD, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_WOOD, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_WOOD, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Gold mine */
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, true ),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, true ),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Bank Sub Arctic */
- MK(CT_INVALID, CT_INVALID, CT_GOLD, SLOPE_E, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_GOLD, SLOPE_S, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_GOLD, SLOPE_E, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_GOLD, SLOPE_S, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Diamond mine */
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Iron ore Mine */
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Fruit plantation */
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Rubber plantation */
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Water supply */
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Water tower */
- MK(CT_INVALID, CT_INVALID, CT_WATER, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_WATER, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Factory (sub-tropical) */
- MK(CT_COPPER_ORE, CT_WOOD, CT_RUBBER, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_COPPER_ORE, CT_WOOD, CT_RUBBER, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_COPPER_ORE, CT_WOOD, CT_RUBBER, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_COPPER_ORE, CT_WOOD, CT_RUBBER, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_COPPER_ORE, CT_WOOD, CT_RUBBER, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_COPPER_ORE, CT_WOOD, CT_RUBBER, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_COPPER_ORE, CT_WOOD, CT_RUBBER, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_COPPER_ORE, CT_WOOD, CT_RUBBER, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Lumber mill */
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Candyfloss forest */
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, 130, INDUTILE_NOANIM, false), // Chopping candyfloss
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, 129, false), // Growing candyfloss
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, 130, INDUTILE_NOANIM, false), ///< Chopping candyfloss
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, 129, false), ///< Growing candyfloss
/* Sweet factory */
- MK(CT_COTTON_CANDY, CT_TOFFEE, CT_SUGAR, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_COTTON_CANDY, CT_TOFFEE, CT_SUGAR, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_COTTON_CANDY, CT_TOFFEE, CT_SUGAR, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_COTTON_CANDY, CT_TOFFEE, CT_SUGAR, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_COTTON_CANDY, CT_TOFFEE, CT_SUGAR, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_COTTON_CANDY, CT_TOFFEE, CT_SUGAR, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_COTTON_CANDY, CT_TOFFEE, CT_SUGAR, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_COTTON_CANDY, CT_TOFFEE, CT_SUGAR, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Batter farm */
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, 136, INDUTILE_NOANIM, false), // Reaping batteries
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, 135, false), // Growing batteries
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, 136, INDUTILE_NOANIM, false), ///< Reaping batteries
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, 135, false), ///< Growing batteries
/* Cola wells */
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Toy shop */
- MK(CT_INVALID, CT_INVALID, CT_TOYS, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_TOYS, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_TOYS, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_TOYS, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_TOYS, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_TOYS, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_TOYS, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_TOYS, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Toy factory */
- MK(CT_BATTERIES, CT_INVALID, CT_PLASTIC, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_BATTERIES, CT_INVALID, CT_PLASTIC, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_BATTERIES, CT_INVALID, CT_PLASTIC, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_BATTERIES, CT_INVALID, CT_PLASTIC, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_BATTERIES, CT_INVALID, CT_PLASTIC, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_BATTERIES, CT_INVALID, CT_PLASTIC, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_BATTERIES, CT_INVALID, CT_PLASTIC, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_BATTERIES, CT_INVALID, CT_PLASTIC, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_BATTERIES, CT_INVALID, CT_PLASTIC, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_BATTERIES, CT_INVALID, CT_PLASTIC, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_BATTERIES, CT_INVALID, CT_PLASTIC, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_BATTERIES, CT_INVALID, CT_PLASTIC, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Plastic Fountain */
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Fizzy drink factory */
- MK(CT_BUBBLES, CT_INVALID, CT_COLA, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_BUBBLES, CT_INVALID, CT_COLA, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_BUBBLES, CT_INVALID, CT_COLA, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_BUBBLES, CT_INVALID, CT_COLA, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_BUBBLES, CT_INVALID, CT_COLA, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_BUBBLES, CT_INVALID, CT_COLA, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_BUBBLES, CT_INVALID, CT_COLA, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_BUBBLES, CT_INVALID, CT_COLA, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Bubble generator */
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Toffee quarry */
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
/* Sugar mine */
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
- MK(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
+ MT(CT_INVALID, CT_INVALID, CT_INVALID, SLOPE_STEEP, INDUTILE_NOANIM, INDUTILE_NOANIM, false),
};
-#undef MK
+#undef MT
#endif /* BUILD_INDUSTRY_H */
--- a/src/table/engines.h Tue Jun 12 11:56:35 2007 +0000
+++ b/src/table/engines.h Wed Jun 13 11:00:24 2007 +0000
@@ -12,25 +12,43 @@
/** Writes the properties of a train or road vehicle into the EngineInfo struct.
* @see EngineInfo
* @param a Introduction date
+ * @param b unk2, flag for carriage(bit 7) and decay speed(bits0..6)
+ * @param c life length
+ * @param d base life
* @param e Bitmask of the climates
+ * @note the 0x80 in parameter b sets the "is carriage bit"
* @note the 5 between d and e is the load amount
*/
#define MK(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b, 5, e, 0, 8, 0, 0 }
/** Writes the properties of a train carriage into the EngineInfo struct.
+ * @param a Introduction date
+ * @param b unk2, flag for carriage(bit 7) and decay speed(bits0..6)
+ * @param c life length
+ * @param d base life
+ * @param e Bitmask of the climates
* @see MK
- * @note the 0x80 in parameter b sets the "is carriage bit"
* @note the 5 between d and e is the load amount
*/
#define MW(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b | 0x80, 5, e, 0, 8, 0, 0 }
/** Writes the properties of a ship into the EngineInfo struct.
+ * @param a Introduction date
+ * @param b unk2, flag for carriage(bit 7) and decay speed(bits0..6)
+ * @param c life length
+ * @param d base life
+ * @param e Bitmask of the climates
* @see MK
* @note the 10 between d and e is the load amount
*/
#define MS(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b, 10, e, 0, 8, 0, 0 }
/** Writes the properties of an aeroplane into the EngineInfo struct.
+ * @param a Introduction date
+ * @param b unk2, flag for carriage(bit 7) and decay speed(bits0..6)
+ * @param c life length
+ * @param d base life
+ * @param e Bitmask of the climates
* @see MK
* @note the 20 between d and e is the load amount
*/
@@ -321,7 +339,7 @@
* @param e power (hp)
* @param f weight
* @param g running_cost_base
- * @param h running_cost_class / engclass
+ * @param h running_cost_class - engclass
* @param i capacity
* @param j cargo_type
* @param k ai_rank
@@ -586,101 +604,101 @@
* @param f capacity
* @param g cargo_type
*/
-#define RVI(a, b, c, d, e, f, g) { a, b, c, {d}, e, f, g }
+#define ROV(a, b, c, d, e, f, g) { a, b, c, {d}, e, f, g }
const RoadVehicleInfo orig_road_vehicle_info[NUM_ROAD_ENGINES] = {
// image_index sfx max_speed
// | base_cost | | capacity
// | | running_cost | | cargo_type
// | | | | | | |
- RVI( 0, 120, 91, SND_19_BUS_START_PULL_AWAY, 112, 31, CT_PASSENGERS ), /* 0 */
- RVI( 17, 140, 128, SND_1C_TRUCK_START_2, 176, 35, CT_PASSENGERS ), /* 1 */
- RVI( 17, 150, 178, SND_1B_TRUCK_START, 224, 37, CT_PASSENGERS ), /* 2 */
- RVI( 34, 160, 240, SND_1B_TRUCK_START, 255, 40, CT_PASSENGERS ), /* 3 */
- RVI( 51, 120, 91, SND_3C_COMEDY_CAR, 112, 30, CT_PASSENGERS ), /* 4 */
- RVI( 51, 140, 171, SND_3E_COMEDY_CAR_2, 192, 35, CT_PASSENGERS ), /* 5 */
- RVI( 51, 160, 240, SND_3C_COMEDY_CAR, 240, 38, CT_PASSENGERS ), /* 6 */
- RVI( 1, 108, 90, SND_19_BUS_START_PULL_AWAY, 96, 20, CT_COAL ), /* 7 */
- RVI( 18, 128, 168, SND_19_BUS_START_PULL_AWAY, 176, 25, CT_COAL ), /* 8 */
- RVI( 35, 138, 240, SND_19_BUS_START_PULL_AWAY, 224, 28, CT_COAL ), /* 9 */
- RVI( 2, 115, 90, SND_19_BUS_START_PULL_AWAY, 96, 22, CT_MAIL ), /* 10 */
- RVI( 19, 135, 168, SND_19_BUS_START_PULL_AWAY, 176, 28, CT_MAIL ), /* 11 */
- RVI( 36, 145, 240, SND_19_BUS_START_PULL_AWAY, 224, 30, CT_MAIL ), /* 12 */
- RVI( 57, 115, 90, SND_3E_COMEDY_CAR_2, 96, 22, CT_MAIL ), /* 13 */
- RVI( 57, 135, 168, SND_3C_COMEDY_CAR, 176, 28, CT_MAIL ), /* 14 */
- RVI( 57, 145, 240, SND_3E_COMEDY_CAR_2, 224, 30, CT_MAIL ), /* 15 */
- RVI( 3, 110, 90, SND_19_BUS_START_PULL_AWAY, 96, 21, CT_OIL ), /* 16 */
- RVI( 20, 140, 168, SND_19_BUS_START_PULL_AWAY, 176, 25, CT_OIL ), /* 17 */
- RVI( 37, 150, 240, SND_19_BUS_START_PULL_AWAY, 224, 27, CT_OIL ), /* 18 */
- RVI( 4, 105, 90, SND_19_BUS_START_PULL_AWAY, 96, 14, CT_LIVESTOCK ), /* 19 */
- RVI( 21, 130, 168, SND_19_BUS_START_PULL_AWAY, 176, 16, CT_LIVESTOCK ), /* 20 */
- RVI( 38, 140, 240, SND_19_BUS_START_PULL_AWAY, 224, 18, CT_LIVESTOCK ), /* 21 */
- RVI( 5, 107, 90, SND_19_BUS_START_PULL_AWAY, 96, 14, CT_GOODS ), /* 22 */
- RVI( 22, 130, 168, SND_19_BUS_START_PULL_AWAY, 176, 16, CT_GOODS ), /* 23 */
- RVI( 39, 140, 240, SND_19_BUS_START_PULL_AWAY, 224, 18, CT_GOODS ), /* 24 */
- RVI( 6, 114, 90, SND_19_BUS_START_PULL_AWAY, 96, 20, CT_GRAIN ), /* 25 */
- RVI( 23, 133, 168, SND_19_BUS_START_PULL_AWAY, 176, 25, CT_GRAIN ), /* 26 */
- RVI( 40, 143, 240, SND_19_BUS_START_PULL_AWAY, 224, 30, CT_GRAIN ), /* 27 */
- RVI( 7, 118, 90, SND_19_BUS_START_PULL_AWAY, 96, 20, CT_WOOD ), /* 28 */
- RVI( 24, 137, 168, SND_19_BUS_START_PULL_AWAY, 176, 22, CT_WOOD ), /* 29 */
- RVI( 41, 147, 240, SND_19_BUS_START_PULL_AWAY, 224, 24, CT_WOOD ), /* 30 */
- RVI( 8, 121, 90, SND_19_BUS_START_PULL_AWAY, 96, 22, CT_IRON_ORE ), /* 31 */
- RVI( 25, 140, 168, SND_19_BUS_START_PULL_AWAY, 176, 25, CT_IRON_ORE ), /* 32 */
- RVI( 42, 150, 240, SND_19_BUS_START_PULL_AWAY, 224, 27, CT_IRON_ORE ), /* 33 */
- RVI( 9, 112, 90, SND_19_BUS_START_PULL_AWAY, 96, 15, CT_STEEL ), /* 34 */
- RVI( 26, 135, 168, SND_19_BUS_START_PULL_AWAY, 176, 18, CT_STEEL ), /* 35 */
- RVI( 43, 145, 240, SND_19_BUS_START_PULL_AWAY, 224, 20, CT_STEEL ), /* 36 */
- RVI( 10, 145, 90, SND_19_BUS_START_PULL_AWAY, 96, 12, CT_VALUABLES ), /* 37 */
- RVI( 27, 170, 168, SND_19_BUS_START_PULL_AWAY, 176, 15, CT_VALUABLES ), /* 38 */
- RVI( 44, 180, 240, SND_19_BUS_START_PULL_AWAY, 224, 16, CT_VALUABLES ), /* 39 */
- RVI( 11, 112, 90, SND_19_BUS_START_PULL_AWAY, 96, 17, CT_FOOD ), /* 40 */
- RVI( 28, 134, 168, SND_19_BUS_START_PULL_AWAY, 176, 20, CT_FOOD ), /* 41 */
- RVI( 45, 144, 240, SND_19_BUS_START_PULL_AWAY, 224, 22, CT_FOOD ), /* 42 */
- RVI( 12, 112, 90, SND_19_BUS_START_PULL_AWAY, 96, 15, CT_PAPER ), /* 43 */
- RVI( 29, 135, 168, SND_19_BUS_START_PULL_AWAY, 176, 18, CT_PAPER ), /* 44 */
- RVI( 46, 145, 240, SND_19_BUS_START_PULL_AWAY, 224, 20, CT_PAPER ), /* 45 */
- RVI( 13, 121, 90, SND_19_BUS_START_PULL_AWAY, 96, 22, CT_COPPER_ORE ), /* 46 */
- RVI( 30, 140, 168, SND_19_BUS_START_PULL_AWAY, 176, 25, CT_COPPER_ORE ), /* 47 */
- RVI( 47, 150, 240, SND_19_BUS_START_PULL_AWAY, 224, 27, CT_COPPER_ORE ), /* 48 */
- RVI( 14, 111, 90, SND_19_BUS_START_PULL_AWAY, 96, 21, CT_WATER ), /* 49 */
- RVI( 31, 141, 168, SND_19_BUS_START_PULL_AWAY, 176, 25, CT_WATER ), /* 50 */
- RVI( 48, 151, 240, SND_19_BUS_START_PULL_AWAY, 224, 27, CT_WATER ), /* 51 */
- RVI( 15, 118, 90, SND_19_BUS_START_PULL_AWAY, 96, 18, CT_FRUIT ), /* 52 */
- RVI( 32, 148, 168, SND_19_BUS_START_PULL_AWAY, 176, 20, CT_FRUIT ), /* 53 */
- RVI( 49, 158, 240, SND_19_BUS_START_PULL_AWAY, 224, 23, CT_FRUIT ), /* 54 */
- RVI( 16, 117, 90, SND_19_BUS_START_PULL_AWAY, 96, 17, CT_RUBBER ), /* 55 */
- RVI( 33, 147, 168, SND_19_BUS_START_PULL_AWAY, 176, 19, CT_RUBBER ), /* 56 */
- RVI( 50, 157, 240, SND_19_BUS_START_PULL_AWAY, 224, 22, CT_RUBBER ), /* 57 */
- RVI( 52, 117, 90, SND_3F_COMEDY_CAR_3, 96, 17, CT_SUGAR ), /* 58 */
- RVI( 52, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_SUGAR ), /* 59 */
- RVI( 52, 157, 240, SND_3F_COMEDY_CAR_3, 224, 22, CT_SUGAR ), /* 60 */
- RVI( 53, 117, 90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 96, 17, CT_COLA ), /* 61 */
- RVI( 53, 147, 168, SND_3F_COMEDY_CAR_3, 176, 19, CT_COLA ), /* 62 */
- RVI( 53, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_COLA ), /* 63 */
- RVI( 54, 117, 90, SND_3F_COMEDY_CAR_3, 96, 17, CT_COTTON_CANDY ), /* 64 */
- RVI( 54, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_COTTON_CANDY ), /* 65 */
- RVI( 54, 157, 240, SND_3F_COMEDY_CAR_3, 224, 22, CT_COTTON_CANDY ), /* 66 */
- RVI( 55, 117, 90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 96, 17, CT_TOFFEE ), /* 67 */
- RVI( 55, 147, 168, SND_3F_COMEDY_CAR_3, 176, 19, CT_TOFFEE ), /* 68 */
- RVI( 55, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_TOFFEE ), /* 69 */
- RVI( 56, 117, 90, SND_3F_COMEDY_CAR_3, 96, 17, CT_TOYS ), /* 70 */
- RVI( 56, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_TOYS ), /* 71 */
- RVI( 56, 157, 240, SND_3F_COMEDY_CAR_3, 224, 22, CT_TOYS ), /* 72 */
- RVI( 58, 117, 90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 96, 17, CT_CANDY ), /* 73 */
- RVI( 58, 147, 168, SND_3F_COMEDY_CAR_3, 176, 19, CT_CANDY ), /* 74 */
- RVI( 58, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_CANDY ), /* 75 */
- RVI( 59, 117, 90, SND_3F_COMEDY_CAR_3, 96, 17, CT_BATTERIES ), /* 76 */
- RVI( 59, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_BATTERIES ), /* 77 */
- RVI( 59, 157, 240, SND_3F_COMEDY_CAR_3, 224, 22, CT_BATTERIES ), /* 78 */
- RVI( 60, 117, 90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 96, 17, CT_FIZZY_DRINKS ), /* 79 */
- RVI( 60, 147, 168, SND_3F_COMEDY_CAR_3, 176, 19, CT_FIZZY_DRINKS ), /* 80 */
- RVI( 60, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_FIZZY_DRINKS ), /* 81 */
- RVI( 61, 117, 90, SND_3F_COMEDY_CAR_3, 96, 17, CT_PLASTIC ), /* 82 */
- RVI( 61, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_PLASTIC ), /* 83 */
- RVI( 61, 157, 240, SND_3F_COMEDY_CAR_3, 224, 22, CT_PLASTIC ), /* 84 */
- RVI( 62, 117, 90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 96, 17, CT_BUBBLES ), /* 85 */
- RVI( 62, 147, 168, SND_3F_COMEDY_CAR_3, 176, 19, CT_BUBBLES ), /* 86 */
- RVI( 62, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_BUBBLES ), /* 87 */
+ ROV( 0, 120, 91, SND_19_BUS_START_PULL_AWAY, 112, 31, CT_PASSENGERS ), /* 0 */
+ ROV( 17, 140, 128, SND_1C_TRUCK_START_2, 176, 35, CT_PASSENGERS ), /* 1 */
+ ROV( 17, 150, 178, SND_1B_TRUCK_START, 224, 37, CT_PASSENGERS ), /* 2 */
+ ROV( 34, 160, 240, SND_1B_TRUCK_START, 255, 40, CT_PASSENGERS ), /* 3 */
+ ROV( 51, 120, 91, SND_3C_COMEDY_CAR, 112, 30, CT_PASSENGERS ), /* 4 */
+ ROV( 51, 140, 171, SND_3E_COMEDY_CAR_2, 192, 35, CT_PASSENGERS ), /* 5 */
+ ROV( 51, 160, 240, SND_3C_COMEDY_CAR, 240, 38, CT_PASSENGERS ), /* 6 */
+ ROV( 1, 108, 90, SND_19_BUS_START_PULL_AWAY, 96, 20, CT_COAL ), /* 7 */
+ ROV( 18, 128, 168, SND_19_BUS_START_PULL_AWAY, 176, 25, CT_COAL ), /* 8 */
+ ROV( 35, 138, 240, SND_19_BUS_START_PULL_AWAY, 224, 28, CT_COAL ), /* 9 */
+ ROV( 2, 115, 90, SND_19_BUS_START_PULL_AWAY, 96, 22, CT_MAIL ), /* 10 */
+ ROV( 19, 135, 168, SND_19_BUS_START_PULL_AWAY, 176, 28, CT_MAIL ), /* 11 */
+ ROV( 36, 145, 240, SND_19_BUS_START_PULL_AWAY, 224, 30, CT_MAIL ), /* 12 */
+ ROV( 57, 115, 90, SND_3E_COMEDY_CAR_2, 96, 22, CT_MAIL ), /* 13 */
+ ROV( 57, 135, 168, SND_3C_COMEDY_CAR, 176, 28, CT_MAIL ), /* 14 */
+ ROV( 57, 145, 240, SND_3E_COMEDY_CAR_2, 224, 30, CT_MAIL ), /* 15 */
+ ROV( 3, 110, 90, SND_19_BUS_START_PULL_AWAY, 96, 21, CT_OIL ), /* 16 */
+ ROV( 20, 140, 168, SND_19_BUS_START_PULL_AWAY, 176, 25, CT_OIL ), /* 17 */
+ ROV( 37, 150, 240, SND_19_BUS_START_PULL_AWAY, 224, 27, CT_OIL ), /* 18 */
+ ROV( 4, 105, 90, SND_19_BUS_START_PULL_AWAY, 96, 14, CT_LIVESTOCK ), /* 19 */
+ ROV( 21, 130, 168, SND_19_BUS_START_PULL_AWAY, 176, 16, CT_LIVESTOCK ), /* 20 */
+ ROV( 38, 140, 240, SND_19_BUS_START_PULL_AWAY, 224, 18, CT_LIVESTOCK ), /* 21 */
+ ROV( 5, 107, 90, SND_19_BUS_START_PULL_AWAY, 96, 14, CT_GOODS ), /* 22 */
+ ROV( 22, 130, 168, SND_19_BUS_START_PULL_AWAY, 176, 16, CT_GOODS ), /* 23 */
+ ROV( 39, 140, 240, SND_19_BUS_START_PULL_AWAY, 224, 18, CT_GOODS ), /* 24 */
+ ROV( 6, 114, 90, SND_19_BUS_START_PULL_AWAY, 96, 20, CT_GRAIN ), /* 25 */
+ ROV( 23, 133, 168, SND_19_BUS_START_PULL_AWAY, 176, 25, CT_GRAIN ), /* 26 */
+ ROV( 40, 143, 240, SND_19_BUS_START_PULL_AWAY, 224, 30, CT_GRAIN ), /* 27 */
+ ROV( 7, 118, 90, SND_19_BUS_START_PULL_AWAY, 96, 20, CT_WOOD ), /* 28 */
+ ROV( 24, 137, 168, SND_19_BUS_START_PULL_AWAY, 176, 22, CT_WOOD ), /* 29 */
+ ROV( 41, 147, 240, SND_19_BUS_START_PULL_AWAY, 224, 24, CT_WOOD ), /* 30 */
+ ROV( 8, 121, 90, SND_19_BUS_START_PULL_AWAY, 96, 22, CT_IRON_ORE ), /* 31 */
+ ROV( 25, 140, 168, SND_19_BUS_START_PULL_AWAY, 176, 25, CT_IRON_ORE ), /* 32 */
+ ROV( 42, 150, 240, SND_19_BUS_START_PULL_AWAY, 224, 27, CT_IRON_ORE ), /* 33 */
+ ROV( 9, 112, 90, SND_19_BUS_START_PULL_AWAY, 96, 15, CT_STEEL ), /* 34 */
+ ROV( 26, 135, 168, SND_19_BUS_START_PULL_AWAY, 176, 18, CT_STEEL ), /* 35 */
+ ROV( 43, 145, 240, SND_19_BUS_START_PULL_AWAY, 224, 20, CT_STEEL ), /* 36 */
+ ROV( 10, 145, 90, SND_19_BUS_START_PULL_AWAY, 96, 12, CT_VALUABLES ), /* 37 */
+ ROV( 27, 170, 168, SND_19_BUS_START_PULL_AWAY, 176, 15, CT_VALUABLES ), /* 38 */
+ ROV( 44, 180, 240, SND_19_BUS_START_PULL_AWAY, 224, 16, CT_VALUABLES ), /* 39 */
+ ROV( 11, 112, 90, SND_19_BUS_START_PULL_AWAY, 96, 17, CT_FOOD ), /* 40 */
+ ROV( 28, 134, 168, SND_19_BUS_START_PULL_AWAY, 176, 20, CT_FOOD ), /* 41 */
+ ROV( 45, 144, 240, SND_19_BUS_START_PULL_AWAY, 224, 22, CT_FOOD ), /* 42 */
+ ROV( 12, 112, 90, SND_19_BUS_START_PULL_AWAY, 96, 15, CT_PAPER ), /* 43 */
+ ROV( 29, 135, 168, SND_19_BUS_START_PULL_AWAY, 176, 18, CT_PAPER ), /* 44 */
+ ROV( 46, 145, 240, SND_19_BUS_START_PULL_AWAY, 224, 20, CT_PAPER ), /* 45 */
+ ROV( 13, 121, 90, SND_19_BUS_START_PULL_AWAY, 96, 22, CT_COPPER_ORE ), /* 46 */
+ ROV( 30, 140, 168, SND_19_BUS_START_PULL_AWAY, 176, 25, CT_COPPER_ORE ), /* 47 */
+ ROV( 47, 150, 240, SND_19_BUS_START_PULL_AWAY, 224, 27, CT_COPPER_ORE ), /* 48 */
+ ROV( 14, 111, 90, SND_19_BUS_START_PULL_AWAY, 96, 21, CT_WATER ), /* 49 */
+ ROV( 31, 141, 168, SND_19_BUS_START_PULL_AWAY, 176, 25, CT_WATER ), /* 50 */
+ ROV( 48, 151, 240, SND_19_BUS_START_PULL_AWAY, 224, 27, CT_WATER ), /* 51 */
+ ROV( 15, 118, 90, SND_19_BUS_START_PULL_AWAY, 96, 18, CT_FRUIT ), /* 52 */
+ ROV( 32, 148, 168, SND_19_BUS_START_PULL_AWAY, 176, 20, CT_FRUIT ), /* 53 */
+ ROV( 49, 158, 240, SND_19_BUS_START_PULL_AWAY, 224, 23, CT_FRUIT ), /* 54 */
+ ROV( 16, 117, 90, SND_19_BUS_START_PULL_AWAY, 96, 17, CT_RUBBER ), /* 55 */
+ ROV( 33, 147, 168, SND_19_BUS_START_PULL_AWAY, 176, 19, CT_RUBBER ), /* 56 */
+ ROV( 50, 157, 240, SND_19_BUS_START_PULL_AWAY, 224, 22, CT_RUBBER ), /* 57 */
+ ROV( 52, 117, 90, SND_3F_COMEDY_CAR_3, 96, 17, CT_SUGAR ), /* 58 */
+ ROV( 52, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_SUGAR ), /* 59 */
+ ROV( 52, 157, 240, SND_3F_COMEDY_CAR_3, 224, 22, CT_SUGAR ), /* 60 */
+ ROV( 53, 117, 90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 96, 17, CT_COLA ), /* 61 */
+ ROV( 53, 147, 168, SND_3F_COMEDY_CAR_3, 176, 19, CT_COLA ), /* 62 */
+ ROV( 53, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_COLA ), /* 63 */
+ ROV( 54, 117, 90, SND_3F_COMEDY_CAR_3, 96, 17, CT_COTTON_CANDY ), /* 64 */
+ ROV( 54, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_COTTON_CANDY ), /* 65 */
+ ROV( 54, 157, 240, SND_3F_COMEDY_CAR_3, 224, 22, CT_COTTON_CANDY ), /* 66 */
+ ROV( 55, 117, 90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 96, 17, CT_TOFFEE ), /* 67 */
+ ROV( 55, 147, 168, SND_3F_COMEDY_CAR_3, 176, 19, CT_TOFFEE ), /* 68 */
+ ROV( 55, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_TOFFEE ), /* 69 */
+ ROV( 56, 117, 90, SND_3F_COMEDY_CAR_3, 96, 17, CT_TOYS ), /* 70 */
+ ROV( 56, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_TOYS ), /* 71 */
+ ROV( 56, 157, 240, SND_3F_COMEDY_CAR_3, 224, 22, CT_TOYS ), /* 72 */
+ ROV( 58, 117, 90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 96, 17, CT_CANDY ), /* 73 */
+ ROV( 58, 147, 168, SND_3F_COMEDY_CAR_3, 176, 19, CT_CANDY ), /* 74 */
+ ROV( 58, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_CANDY ), /* 75 */
+ ROV( 59, 117, 90, SND_3F_COMEDY_CAR_3, 96, 17, CT_BATTERIES ), /* 76 */
+ ROV( 59, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_BATTERIES ), /* 77 */
+ ROV( 59, 157, 240, SND_3F_COMEDY_CAR_3, 224, 22, CT_BATTERIES ), /* 78 */
+ ROV( 60, 117, 90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 96, 17, CT_FIZZY_DRINKS ), /* 79 */
+ ROV( 60, 147, 168, SND_3F_COMEDY_CAR_3, 176, 19, CT_FIZZY_DRINKS ), /* 80 */
+ ROV( 60, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_FIZZY_DRINKS ), /* 81 */
+ ROV( 61, 117, 90, SND_3F_COMEDY_CAR_3, 96, 17, CT_PLASTIC ), /* 82 */
+ ROV( 61, 147, 168, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 176, 19, CT_PLASTIC ), /* 83 */
+ ROV( 61, 157, 240, SND_3F_COMEDY_CAR_3, 224, 22, CT_PLASTIC ), /* 84 */
+ ROV( 62, 117, 90, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 96, 17, CT_BUBBLES ), /* 85 */
+ ROV( 62, 147, 168, SND_3F_COMEDY_CAR_3, 176, 19, CT_BUBBLES ), /* 86 */
+ ROV( 62, 157, 240, SND_40_COMEDY_CAR_START_AND_PULL_AWAY, 224, 22, CT_BUBBLES ), /* 87 */
};
-#undef RVI
+#undef ROV
#endif /* ENGINES_H */
--- a/src/table/palettes.h Tue Jun 12 11:56:35 2007 +0000
+++ b/src/table/palettes.h Wed Jun 13 11:00:24 2007 +0000
@@ -178,22 +178,43 @@
byte shadow;
};
-static const StringColor _string_colormap[] = {
- { 150, 215 }, // BLUE
- { 12, 215 }, // SILVER
- { 189, 215 }, // GOLD
- { 184, 215 }, // RED
- { 174, 215 }, // PURPLE
- { 30, 215 }, // LTBROWN
- { 195, 215 }, // ORANGE
- { 209, 215 }, // GREEN
- { 68, 215 }, // YELLOW
- { 95, 215 }, // DKGREEN
- { 79, 215 }, // CREAM
- { 116, 215 }, // BROWN
- { 15, 215 }, // WHITE
- { 152, 215 }, // LTBLUE
- { 32, 215 }, // GRAY
- { 133, 215 }, // DKBLUE
- { 215, 0 }, // BLACK
+static const StringColor _string_colormap[][17] = {
+ { /* Windows palette. */
+ { 150, 215 }, // BLUE
+ { 12, 215 }, // SILVER
+ { 189, 215 }, // GOLD
+ { 184, 215 }, // RED
+ { 174, 215 }, // PURPLE
+ { 30, 215 }, // LTBROWN
+ { 195, 215 }, // ORANGE
+ { 209, 215 }, // GREEN
+ { 68, 215 }, // YELLOW
+ { 95, 215 }, // DKGREEN
+ { 79, 215 }, // CREAM
+ { 116, 215 }, // BROWN
+ { 15, 215 }, // WHITE
+ { 152, 215 }, // LTBLUE
+ { 32, 215 }, // GRAY
+ { 133, 215 }, // DKBLUE
+ { 215, 0 }, // BLACK
+ },
+ { /* DOS palette. */
+ { 150, 1 }, // BLUE
+ { 12, 1 }, // SILVER
+ { 189, 1 }, // GOLD
+ { 184, 1 }, // RED
+ { 174, 1 }, // PURPLE
+ { 30, 1 }, // LTBROWN
+ { 195, 1 }, // ORANGE
+ { 209, 1 }, // GREEN
+ { 68, 1 }, // YELLOW
+ { 95, 1 }, // DKGREEN
+ { 79, 1 }, // CREAM
+ { 116, 1 }, // BROWN
+ { 15, 1 }, // WHITE
+ { 152, 1 }, // LTBLUE
+ { 6, 1 }, // GRAY
+ { 133, 1 }, // DKBLUE
+ { 1, 0 }, // BLACK
+ }
};
--- a/src/table/sprites.h Tue Jun 12 11:56:35 2007 +0000
+++ b/src/table/sprites.h Wed Jun 13 11:00:24 2007 +0000
@@ -1302,7 +1302,7 @@
* <li> TRANSPARENT_BIT is the bit number which toggles sprite transparency</li>
* <li> RECOLOR_BIT toggles the recoloring system</li>
* <li> PALETTE_SPRITE_WIDTH and PALETTE_SPRITE_START determine the position and number of
- * bits used for the recoloring process. For transparency, it must be 0x322.</li>
+ * bits used for the recoloring process. For transparency, it must be 0x322.</li></ul>
*/
enum SpriteSetup {
TRANSPARENT_BIT = 31, ///< toggles transparency in the sprite
--- a/src/table/town_land.h Tue Jun 12 11:56:35 2007 +0000
+++ b/src/table/town_land.h Wed Jun 13 11:00:24 2007 +0000
@@ -1781,7 +1781,7 @@
M(0x1244, PAL_NONE, 0x125a, PAL_NONE, 0, 0, 16, 16, 50, 0),
};
#undef M
-/* 4 variants * 4 build stages */
+/** Make sure we have the right number of elements: 4 variants * 4 build stages for each house */
assert_compile(lengthof(_town_draw_tile_data) == (NEW_HOUSE_OFFSET) * 4 * 4);
/** Describes the data that defines each house in the game
@@ -1802,9 +1802,10 @@
* @param cg3 3rd CargoID available
* @see HouseSpec
*/
-#define M(mnd, mxd, p, rc, bn, rr, mg, ca1, ca2, ca3, bf, ba, cg1, cg2, cg3) \
+#define MS(mnd, mxd, p, rc, bn, rr, mg, ca1, ca2, ca3, bf, ba, cg1, cg2, cg3) \
{mnd, mxd, p, rc, bn, rr, mg, {ca1, ca2, ca3}, {cg1, cg2, cg3}, bf, ba, true, \
0, NULL, 0, 0, {0, 0, 0, 0}, 16, NO_EXTRA_FLAG, HOUSE_NO_CLASS, 0, 2, 0, 0, NULL}
+/** House specifications from original data */
static const HouseSpec _original_house_specs[] = {
/**
* remove_rating_decrease
@@ -1820,446 +1821,448 @@
* +-building_availability | | | | | | |
* +-cargoID accepted | | | | | | | |
* | | | | | | | | | | | */
- M( 1963, MAX_YEAR, 187, 150, STR_200F_TALL_OFFICE_BLOCK, 140, 70, 8, 3, 4,
+ MS(1963, MAX_YEAR, 187, 150, STR_200F_TALL_OFFICE_BLOCK, 140, 70, 8, 3, 4,
TILE_SIZE_1x1,
HZ_TEMP | HZ_ZON5,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //00
- M( 1957, MAX_YEAR, 85, 140, STR_2010_OFFICE_BLOCK, 130, 55, 8, 3, 4,
+ MS(1957, MAX_YEAR, 85, 140, STR_2010_OFFICE_BLOCK, 130, 55, 8, 3, 4,
TILE_SIZE_1x1,
HZ_TEMP | HZ_ZON5 | HZ_ZON4,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //01
- M( 1968, MAX_YEAR, 40, 100, STR_2011_SMALL_BLOCK_OF_FLATS, 90, 20, 8, 3, 1,
+ MS(1968, MAX_YEAR, 40, 100, STR_2011_SMALL_BLOCK_OF_FLATS, 90, 20, 8, 3, 1,
TILE_SIZE_1x1,
HZ_TEMP | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //02
- M( 0, MAX_YEAR, 5, 90, STR_2012_CHURCH, 230, 2, 2, 0, 0,
+ MS( 0, MAX_YEAR, 5, 90, STR_2012_CHURCH, 230, 2, 2, 0, 0,
BUILDING_IS_CHURCH | TILE_SIZE_1x1,
HZ_TEMP | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //03
- M( 1975, MAX_YEAR, 220, 160, STR_2013_LARGE_OFFICE_BLOCK, 160, 85, 10, 4, 6,
+ MS(1975, MAX_YEAR, 220, 160, STR_2013_LARGE_OFFICE_BLOCK, 160, 85, 10, 4, 6,
BUILDING_IS_ANIMATED | TILE_SIZE_1x1,
HZ_TEMP | HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //04
- M( 1975, MAX_YEAR, 220, 160, STR_2013_LARGE_OFFICE_BLOCK, 160, 85, 10, 4, 6,
+ MS(1975, MAX_YEAR, 220, 160, STR_2013_LARGE_OFFICE_BLOCK, 160, 85, 10, 4, 6,
BUILDING_IS_ANIMATED | TILE_SIZE_1x1,
HZ_SUBARTC_ABOVE | HZ_ZON5,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //05
- M( 0, MAX_YEAR, 30, 80, STR_2014_TOWN_HOUSES, 80, 12, 4, 1, 0,
+ MS( 0, MAX_YEAR, 30, 80, STR_2014_TOWN_HOUSES, 80, 12, 4, 1, 0,
TILE_SIZE_1x1,
HZ_TEMP | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //06
- M( 1959, MAX_YEAR, 140, 180, STR_2015_HOTEL, 150, 22, 6, 1, 2,
+ MS(1959, MAX_YEAR, 140, 180, STR_2015_HOTEL, 150, 22, 6, 1, 2,
TILE_SIZE_1x2,
HZ_TEMP | HZ_ZON5 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //07
- M( 1959, MAX_YEAR, 0, 180, STR_2015_HOTEL, 150, 22, 6, 1, 2,
+ MS(1959, MAX_YEAR, 0, 180, STR_2015_HOTEL, 150, 22, 6, 1, 2,
TILE_NO_FLAG,
HZ_NOZNS,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //08
- M( 1945, MAX_YEAR, 0, 65, STR_2016_STATUE, 40, 0, 2, 0, 0,
+ MS(1945, MAX_YEAR, 0, 65, STR_2016_STATUE, 40, 0, 2, 0, 0,
TILE_SIZE_1x1,
HZ_TEMP | HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //09
- M( 1945, MAX_YEAR, 0, 65, STR_2017_FOUNTAIN, 40, 0, 2, 0, 0,
+ MS(1945, MAX_YEAR, 0, 65, STR_2017_FOUNTAIN, 40, 0, 2, 0, 0,
TILE_SIZE_1x1,
HZ_TEMP | HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //0A
- M( 0, MAX_YEAR, 0, 60, STR_2018_PARK, 75, 0, 2, 0, 0,
+ MS( 0, MAX_YEAR, 0, 60, STR_2018_PARK, 75, 0, 2, 0, 0,
TILE_SIZE_1x1,
HZ_TEMP | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //0B
- M( 1935, MAX_YEAR, 0, 60, STR_2018_PARK, 75, 0, 2, 0, 0,
+ MS(1935, MAX_YEAR, 0, 60, STR_2018_PARK, 75, 0, 2, 0, 0,
TILE_SIZE_1x1,
HZ_TEMP | HZ_ZON4,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //0C
- M( 1951, MAX_YEAR, 150, 130, STR_2019_OFFICE_BLOCK, 110, 65, 8, 2, 4,
+ MS(1951, MAX_YEAR, 150, 130, STR_2019_OFFICE_BLOCK, 110, 65, 8, 2, 4,
TILE_SIZE_1x1,
HZ_TEMP | HZ_ZON5 | HZ_ZON4,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //0D
- M( 1930, 1960, 95, 110, STR_201A_SHOPS_AND_OFFICES, 100, 48, 6, 2, 3,
+ MS(1930, 1960, 95, 110, STR_201A_SHOPS_AND_OFFICES, 100, 48, 6, 2, 3,
TILE_SIZE_1x1,
HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //0E
- M( 1930, 1960, 95, 105, STR_201A_SHOPS_AND_OFFICES, 100, 48, 6, 2, 3,
+ MS(1930, 1960, 95, 105, STR_201A_SHOPS_AND_OFFICES, 100, 48, 6, 2, 3,
TILE_SIZE_1x1,
HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //0F
- M( 1930, 1960, 95, 107, STR_201A_SHOPS_AND_OFFICES, 100, 48, 6, 2, 3,
+ MS(1930, 1960, 95, 107, STR_201A_SHOPS_AND_OFFICES, 100, 48, 6, 2, 3,
TILE_SIZE_1x1,
HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //10
- M( 1977, MAX_YEAR, 130, 200, STR_201B_MODERN_OFFICE_BUILDING, 150, 50, 10, 3, 6,
+ MS(1977, MAX_YEAR, 130, 200, STR_201B_MODERN_OFFICE_BUILDING, 150, 50, 10, 3, 6,
TILE_SIZE_1x1,
HZ_TEMP | HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //11
- M( 1983, MAX_YEAR, 6, 145, STR_201C_WAREHOUSE, 110, 10, 6, 3, 8,
+ MS(1983, MAX_YEAR, 6, 145, STR_201C_WAREHOUSE, 110, 10, 6, 3, 8,
TILE_SIZE_1x1,
HZ_TEMP | HZ_ZON5,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //12
- M( 1985, MAX_YEAR, 110, 155, STR_201D_OFFICE_BLOCK, 110, 55, 6, 2, 6,
+ MS(1985, MAX_YEAR, 110, 155, STR_201D_OFFICE_BLOCK, 110, 55, 6, 2, 6,
TILE_SIZE_1x1,
HZ_TEMP | HZ_ZON5,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //13
- M( 0, MAX_YEAR, 65, 250, STR_201E_STADIUM, 300, 5, 4, 0, 0,
+ MS( 0, MAX_YEAR, 65, 250, STR_201E_STADIUM, 300, 5, 4, 0, 0,
BUILDING_IS_STADIUM | TILE_SIZE_2x2,
HZ_TEMP | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //14
- M( 0, MAX_YEAR, 0, 250, STR_201E_STADIUM, 300, 5, 4, 0, 0,
+ MS( 0, MAX_YEAR, 0, 250, STR_201E_STADIUM, 300, 5, 4, 0, 0,
TILE_NO_FLAG,
HZ_NOZNS,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //15
- M( 0, MAX_YEAR, 0, 250, STR_201E_STADIUM, 300, 5, 4, 0, 0,
+ MS( 0, MAX_YEAR, 0, 250, STR_201E_STADIUM, 300, 5, 4, 0, 0,
TILE_NO_FLAG,
HZ_NOZNS,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //16
- M( 0, MAX_YEAR, 0, 250, STR_201E_STADIUM, 300, 5, 4, 0, 0,
+ MS( 0, MAX_YEAR, 0, 250, STR_201E_STADIUM, 300, 5, 4, 0, 0,
TILE_NO_FLAG,
HZ_NOZNS,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //17
- M( 0, 1951, 15, 70, STR_201F_OLD_HOUSES, 75, 6, 3, 1, 0,
+ MS( 0, 1951, 15, 70, STR_201F_OLD_HOUSES, 75, 6, 3, 1, 0,
TILE_SIZE_1x1,
HZ_TEMP | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //18
- M( 0, 1952, 12, 75, STR_2036_COTTAGES, 75, 7, 3, 1, 0,
+ MS( 0, 1952, 12, 75, STR_2036_COTTAGES, 75, 7, 3, 1, 0,
TILE_SIZE_1x1,
HZ_TEMP | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //19
- M( 1931, MAX_YEAR, 13, 71, STR_2037_HOUSES, 75, 8, 3, 1, 0,
+ MS(1931, MAX_YEAR, 13, 71, STR_2037_HOUSES, 75, 8, 3, 1, 0,
TILE_SIZE_1x1,
HZ_TEMP | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //1A
- M( 1935, MAX_YEAR, 100, 135, STR_2038_FLATS, 100, 35, 7, 2, 2,
+ MS(1935, MAX_YEAR, 100, 135, STR_2038_FLATS, 100, 35, 7, 2, 2,
TILE_SIZE_1x1,
HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //1B
- M( 1963, MAX_YEAR, 170, 145, STR_2039_TALL_OFFICE_BLOCK, 170, 50, 8, 3, 3,
+ MS(1963, MAX_YEAR, 170, 145, STR_2039_TALL_OFFICE_BLOCK, 170, 50, 8, 3, 3,
TILE_SIZE_1x1,
HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //1C
- M( 0, 1955, 100, 132, STR_203A_SHOPS_AND_OFFICES, 135, 40, 6, 2, 3,
+ MS( 0, 1955, 100, 132, STR_203A_SHOPS_AND_OFFICES, 135, 40, 6, 2, 3,
TILE_SIZE_1x1,
HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //1D
- M( 1973, MAX_YEAR, 180, 155, STR_203B_SHOPS_AND_OFFICES, 180, 64, 8, 3, 3,
+ MS(1973, MAX_YEAR, 180, 155, STR_203B_SHOPS_AND_OFFICES, 180, 64, 8, 3, 3,
TILE_SIZE_1x1,
HZ_TEMP | HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //1E
- M( 0, MAX_YEAR, 35, 220, STR_203C_THEATER, 230, 23, 8, 2, 2,
+ MS( 0, MAX_YEAR, 35, 220, STR_203C_THEATER, 230, 23, 8, 2, 2,
TILE_SIZE_1x1,
HZ_TEMP | HZ_ZON5 | HZ_ZON4,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //1F
- M( 1958, MAX_YEAR, 65, 250, STR_203D_STADIUM, 300, 5, 4, 0, 0,
+ MS(1958, MAX_YEAR, 65, 250, STR_203D_STADIUM, 300, 5, 4, 0, 0,
BUILDING_IS_STADIUM | TILE_SIZE_2x2,
HZ_TEMP | HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //20
- M( 1958, MAX_YEAR, 0, 250, STR_203D_STADIUM, 300, 5, 4, 0, 0,
+ MS(1958, MAX_YEAR, 0, 250, STR_203D_STADIUM, 300, 5, 4, 0, 0,
TILE_NO_FLAG,
HZ_NOZNS,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //21
- M( 1958, MAX_YEAR, 0, 250, STR_203D_STADIUM, 300, 5, 4, 0, 0,
+ MS(1958, MAX_YEAR, 0, 250, STR_203D_STADIUM, 300, 5, 4, 0, 0,
TILE_NO_FLAG,
HZ_NOZNS,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //22
- M( 1958, MAX_YEAR, 0, 250, STR_203D_STADIUM, 300, 5, 4, 0, 0,
+ MS(1958, MAX_YEAR, 0, 250, STR_203D_STADIUM, 300, 5, 4, 0, 0,
TILE_NO_FLAG,
HZ_NOZNS,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //23
- M( 2000, MAX_YEAR, 140, 170, STR_203E_OFFICES, 250, 65, 8, 3, 2,
+ MS(2000, MAX_YEAR, 140, 170, STR_203E_OFFICES, 250, 65, 8, 3, 2,
TILE_SIZE_1x1,
HZ_TEMP | HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //24
- M( 0, 1960, 15, 70, STR_203F_HOUSES, 75, 6, 3, 1, 1,
+ MS( 0, 1960, 15, 70, STR_203F_HOUSES, 75, 6, 3, 1, 1,
TILE_SIZE_1x1,
HZ_SUBARTC_BELOW | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_FOOD), //25
- M( 0, 1960, 15, 70, STR_203F_HOUSES, 75, 6, 3, 1, 1,
+ MS( 0, 1960, 15, 70, STR_203F_HOUSES, 75, 6, 3, 1, 1,
TILE_SIZE_1x1,
HZ_SUBARTC_ABOVE | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_FOOD), //26
- M( 1945, MAX_YEAR, 35, 210, STR_2040_CINEMA, 230, 23, 8, 2, 2,
+ MS(1945, MAX_YEAR, 35, 210, STR_2040_CINEMA, 230, 23, 8, 2, 2,
TILE_SIZE_1x1,
HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //27
- M( 1983, MAX_YEAR, 180, 250, STR_2041_SHOPPING_MALL, 300, 5, 8, 2, 3,
+ MS(1983, MAX_YEAR, 180, 250, STR_2041_SHOPPING_MALL, 300, 5, 8, 2, 3,
TILE_SIZE_2x2,
HZ_TEMP | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 |HZ_ZON2,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //28
- M( 1983, MAX_YEAR, 0, 250, STR_2041_SHOPPING_MALL, 300, 5, 8, 2, 3,
+ MS(1983, MAX_YEAR, 0, 250, STR_2041_SHOPPING_MALL, 300, 5, 8, 2, 3,
TILE_NO_FLAG,
HZ_NOZNS,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //29
- M( 1983, MAX_YEAR, 0, 250, STR_2041_SHOPPING_MALL, 300, 5, 8, 2, 3,
+ MS(1983, MAX_YEAR, 0, 250, STR_2041_SHOPPING_MALL, 300, 5, 8, 2, 3,
TILE_NO_FLAG,
HZ_NOZNS,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //2A
- M( 1983, MAX_YEAR, 0, 250, STR_2041_SHOPPING_MALL, 300, 5, 8, 2, 3,
+ MS(1983, MAX_YEAR, 0, 250, STR_2041_SHOPPING_MALL, 300, 5, 8, 2, 3,
TILE_NO_FLAG,
HZ_NOZNS,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //2B
- M( 0, MAX_YEAR, 80, 100, STR_2038_FLATS, 90, 20, 5, 2, 2,
+ MS( 0, MAX_YEAR, 80, 100, STR_2038_FLATS, 90, 20, 5, 2, 2,
TILE_SIZE_1x1,
HZ_SUBARTC_BELOW | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_FOOD), //2C
- M( 0, MAX_YEAR, 80, 100, STR_2038_FLATS, 90, 20, 5, 2, 2,
+ MS( 0, MAX_YEAR, 80, 100, STR_2038_FLATS, 90, 20, 5, 2, 2,
TILE_SIZE_1x1,
HZ_SUBARTC_ABOVE | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_FOOD), //2D
- M( 0, MAX_YEAR, 16, 70, STR_203F_HOUSES, 70, 6, 3, 1, 2,
+ MS( 0, MAX_YEAR, 16, 70, STR_203F_HOUSES, 70, 6, 3, 1, 2,
TILE_SIZE_1x1,
HZ_SUBARTC_BELOW | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_FOOD), //2E
- M( 0, MAX_YEAR, 16, 70, STR_203F_HOUSES, 70, 6, 3, 1, 2,
+ MS( 0, MAX_YEAR, 16, 70, STR_203F_HOUSES, 70, 6, 3, 1, 2,
TILE_SIZE_1x1,
HZ_SUBARTC_ABOVE | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_FOOD), //2F
- M( 0, 1963, 14, 80, STR_203F_HOUSES, 70, 6, 3, 1, 2,
+ MS( 0, 1963, 14, 80, STR_203F_HOUSES, 70, 6, 3, 1, 2,
TILE_SIZE_1x1,
HZ_SUBARTC_BELOW | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_FOOD), //30
- M( 0, 1963, 14, 80, STR_203F_HOUSES, 70, 6, 3, 1, 2,
+ MS( 0, 1963, 14, 80, STR_203F_HOUSES, 70, 6, 3, 1, 2,
TILE_SIZE_1x1,
HZ_SUBARTC_ABOVE | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_FOOD), //31
- M( 1966, MAX_YEAR, 135, 150, STR_200F_TALL_OFFICE_BLOCK, 120, 60, 8, 3, 4,
+ MS(1966, MAX_YEAR, 135, 150, STR_200F_TALL_OFFICE_BLOCK, 120, 60, 8, 3, 4,
TILE_SIZE_1x1,
HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //32
- M( 1966, MAX_YEAR, 135, 150, STR_200F_TALL_OFFICE_BLOCK, 120, 60, 8, 3, 4,
+ MS(1966, MAX_YEAR, 135, 150, STR_200F_TALL_OFFICE_BLOCK, 120, 60, 8, 3, 4,
TILE_SIZE_1x1,
HZ_SUBARTC_ABOVE | HZ_ZON5 | HZ_ZON4,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //33
- M( 1970, MAX_YEAR, 170, 170, STR_200F_TALL_OFFICE_BLOCK, 130, 70, 9, 3, 4,
+ MS(1970, MAX_YEAR, 170, 170, STR_200F_TALL_OFFICE_BLOCK, 130, 70, 9, 3, 4,
TILE_SIZE_1x1,
HZ_SUBARTC_BELOW | HZ_ZON5 | HZ_ZON4,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //34
- M( 1970, MAX_YEAR, 170, 170, STR_200F_TALL_OFFICE_BLOCK, 130, 70, 9, 3, 4,
+ MS(1970, MAX_YEAR, 170, 170, STR_200F_TALL_OFFICE_BLOCK, 130, 70, 9, 3, 4,
TILE_SIZE_1x1,
HZ_SUBARTC_ABOVE | HZ_ZON5 | HZ_ZON4,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //35
- M( 1974, MAX_YEAR, 210, 200, STR_200F_TALL_OFFICE_BLOCK, 140, 80, 10, 3, 5,
+ MS(1974, MAX_YEAR, 210, 200, STR_200F_TALL_OFFICE_BLOCK, 140, 80, 10, 3, 5,
TILE_SIZE_1x1,
HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //36
- M( 1974, MAX_YEAR, 210, 200, STR_200F_TALL_OFFICE_BLOCK, 140, 80, 10, 3, 5,
+ MS(1974, MAX_YEAR, 210, 200, STR_200F_TALL_OFFICE_BLOCK, 140, 80, 10, 3, 5,
TILE_SIZE_1x1,
HZ_SUBARTC_ABOVE | HZ_ZON5 | HZ_ZON4,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //37
- M( 0, MAX_YEAR, 10, 60, STR_203F_HOUSES, 60, 5, 2, 1, 1,
+ MS( 0, MAX_YEAR, 10, 60, STR_203F_HOUSES, 60, 5, 2, 1, 1,
TILE_SIZE_1x1,
HZ_SUBARTC_BELOW | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_FOOD), //38
- M( 0, MAX_YEAR, 10, 60, STR_203F_HOUSES, 60, 5, 2, 1, 1,
+ MS( 0, MAX_YEAR, 10, 60, STR_203F_HOUSES, 60, 5, 2, 1, 1,
TILE_SIZE_1x1,
HZ_SUBARTC_ABOVE | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_FOOD), //39
- M( 0, MAX_YEAR, 25, 100, STR_201A_SHOPS_AND_OFFICES, 80, 20, 3, 1, 1,
+ MS( 0, MAX_YEAR, 25, 100, STR_201A_SHOPS_AND_OFFICES, 80, 20, 3, 1, 1,
TILE_SIZE_1x1,
HZ_SUBARTC_BELOW | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
CT_PASSENGERS, CT_MAIL, CT_FOOD), //3A
- M( 0, MAX_YEAR, 25, 100, STR_201A_SHOPS_AND_OFFICES, 80, 20, 3, 1, 1,
+ MS( 0, MAX_YEAR, 25, 100, STR_201A_SHOPS_AND_OFFICES, 80, 20, 3, 1, 1,
TILE_SIZE_1x1,
HZ_SUBARTC_ABOVE | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
CT_PASSENGERS, CT_MAIL, CT_FOOD), //3B
- M( 0, MAX_YEAR, 6, 85, STR_2012_CHURCH, 230, 2, 2, 0, 0,
+ MS( 0, MAX_YEAR, 6, 85, STR_2012_CHURCH, 230, 2, 2, 0, 0,
BUILDING_IS_CHURCH | TILE_SIZE_1x1,
HZ_SUBARTC_BELOW | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //3C
- M( 0, MAX_YEAR, 6, 85, STR_2012_CHURCH, 230, 2, 2, 0, 0,
+ MS( 0, MAX_YEAR, 6, 85, STR_2012_CHURCH, 230, 2, 2, 0, 0,
BUILDING_IS_CHURCH | TILE_SIZE_1x1,
HZ_SUBARTC_ABOVE | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //3D
- M( 0, MAX_YEAR, 17, 80, STR_203F_HOUSES, 80, 7, 3, 1, 1,
+ MS( 0, MAX_YEAR, 17, 80, STR_203F_HOUSES, 80, 7, 3, 1, 1,
TILE_SIZE_1x1,
HZ_SUBARTC_BELOW | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_FOOD), //3E
- M( 0, MAX_YEAR, 17, 80, STR_203F_HOUSES, 80, 7, 3, 1, 1,
+ MS( 0, MAX_YEAR, 17, 80, STR_203F_HOUSES, 80, 7, 3, 1, 1,
TILE_SIZE_1x1,
HZ_SUBARTC_ABOVE | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_FOOD), //3F
- M( 0, 1960, 90, 140, STR_201A_SHOPS_AND_OFFICES, 110, 45, 6, 2, 3,
+ MS( 0, 1960, 90, 140, STR_201A_SHOPS_AND_OFFICES, 110, 45, 6, 2, 3,
TILE_SIZE_1x1,
HZ_SUBARTC_BELOW| HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //40
- M( 0, 1960, 90, 140, STR_201A_SHOPS_AND_OFFICES, 110, 45, 6, 2, 3,
+ MS( 0, 1960, 90, 140, STR_201A_SHOPS_AND_OFFICES, 110, 45, 6, 2, 3,
TILE_SIZE_1x1,
HZ_SUBARTC_ABOVE| HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //41
- M( 1972, MAX_YEAR, 140, 160, STR_2015_HOTEL, 160, 25, 6, 1, 3,
+ MS(1972, MAX_YEAR, 140, 160, STR_2015_HOTEL, 160, 25, 6, 1, 3,
TILE_SIZE_1x2,
HZ_SUBARTC_BELOW| HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_FOOD), //42
- M( 1972, MAX_YEAR, 0, 160, STR_2015_HOTEL, 160, 25, 6, 1, 2,
+ MS(1972, MAX_YEAR, 0, 160, STR_2015_HOTEL, 160, 25, 6, 1, 2,
TILE_NO_FLAG,
HZ_NOZNS,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //43
- M( 1972, MAX_YEAR, 140, 160, STR_2015_HOTEL, 160, 25, 6, 1, 3,
+ MS(1972, MAX_YEAR, 140, 160, STR_2015_HOTEL, 160, 25, 6, 1, 3,
TILE_SIZE_1x2,
HZ_SUBARTC_ABOVE| HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_FOOD), //44
- M( 1972, MAX_YEAR, 0, 160, STR_2015_HOTEL, 160, 25, 6, 1, 2,
+ MS(1972, MAX_YEAR, 0, 160, STR_2015_HOTEL, 160, 25, 6, 1, 2,
TILE_NO_FLAG,
HZ_NOZNS,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //45
- M( 1963, MAX_YEAR, 105, 130, STR_201A_SHOPS_AND_OFFICES, 105, 50, 7, 2, 3,
+ MS(1963, MAX_YEAR, 105, 130, STR_201A_SHOPS_AND_OFFICES, 105, 50, 7, 2, 3,
TILE_SIZE_1x1,
HZ_SUBARTC_BELOW | HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //46
- M( 1963, MAX_YEAR, 105, 130, STR_201A_SHOPS_AND_OFFICES, 105, 50, 7, 2, 3,
+ MS(1963, MAX_YEAR, 105, 130, STR_201A_SHOPS_AND_OFFICES, 105, 50, 7, 2, 3,
TILE_SIZE_1x1,
HZ_SUBARTC_ABOVE| HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //47
- M( 1978, MAX_YEAR, 190, 190, STR_200F_TALL_OFFICE_BLOCK, 135, 75, 9, 3, 4,
+ MS(1978, MAX_YEAR, 190, 190, STR_200F_TALL_OFFICE_BLOCK, 135, 75, 9, 3, 4,
TILE_SIZE_1x1,
HZ_SUBARTC_BELOW | HZ_ZON5 | HZ_ZON4,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //48
- M( 1978, MAX_YEAR, 190, 190, STR_200F_TALL_OFFICE_BLOCK, 135, 75, 9, 3, 4,
+ MS(1978, MAX_YEAR, 190, 190, STR_200F_TALL_OFFICE_BLOCK, 135, 75, 9, 3, 4,
TILE_SIZE_1x1,
HZ_SUBARTC_ABOVE | HZ_ZON5 | HZ_ZON4,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //49
- M( 1967, MAX_YEAR, 250, 140, STR_200F_TALL_OFFICE_BLOCK, 200, 60, 7, 2, 2,
+ MS(1967, MAX_YEAR, 250, 140, STR_200F_TALL_OFFICE_BLOCK, 200, 60, 7, 2, 2,
TILE_SIZE_2x1,
HZ_SUBARTC_BELOW| HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //4A
- M( 1967, MAX_YEAR, 0, 140, STR_200F_TALL_OFFICE_BLOCK, 200, 60, 7, 2, 2,
+ MS(1967, MAX_YEAR, 0, 140, STR_200F_TALL_OFFICE_BLOCK, 200, 60, 7, 2, 2,
TILE_NO_FLAG,
HZ_NOZNS,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //4B
- M( 1967, MAX_YEAR, 250, 140, STR_200F_TALL_OFFICE_BLOCK, 200, 60, 7, 2, 2,
+ MS(1967, MAX_YEAR, 250, 140, STR_200F_TALL_OFFICE_BLOCK, 200, 60, 7, 2, 2,
TILE_SIZE_2x1,
HZ_SUBARTC_ABOVE | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //4C
- M( 1967, MAX_YEAR, 0, 140, STR_200F_TALL_OFFICE_BLOCK, 200, 60, 7, 2, 2,
+ MS(1967, MAX_YEAR, 0, 140, STR_200F_TALL_OFFICE_BLOCK, 200, 60, 7, 2, 2,
TILE_NO_FLAG,
HZ_NOZNS,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //4D
- M( 0, MAX_YEAR, 16, 80, STR_203F_HOUSES, 80, 6, 3, 1, 2,
+ MS( 0, MAX_YEAR, 16, 80, STR_203F_HOUSES, 80, 6, 3, 1, 2,
TILE_SIZE_1x1,
HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
CT_PASSENGERS, CT_MAIL, CT_FOOD), //4E
- M( 0, MAX_YEAR, 16, 80, STR_203F_HOUSES, 80, 6, 3, 1, 2,
+ MS( 0, MAX_YEAR, 16, 80, STR_203F_HOUSES, 80, 6, 3, 1, 2,
TILE_SIZE_1x1,
HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
CT_PASSENGERS, CT_MAIL, CT_FOOD), //4F
- M( 0, MAX_YEAR, 16, 80, STR_203F_HOUSES, 80, 5, 3, 1, 2,
+ MS( 0, MAX_YEAR, 16, 80, STR_203F_HOUSES, 80, 5, 3, 1, 2,
TILE_SIZE_1x1,
HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
CT_PASSENGERS, CT_MAIL, CT_FOOD), //50
- M( 0, MAX_YEAR, 7, 30, STR_203F_HOUSES, 30, 4, 3, 1, 1,
+ MS( 0, MAX_YEAR, 7, 30, STR_203F_HOUSES, 30, 4, 3, 1, 1,
TILE_SIZE_1x1,
HZ_SUBTROPIC | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_FOOD), //51
- M( 0, MAX_YEAR, 45, 130, STR_2038_FLATS, 95, 15, 6, 2, 1,
+ MS( 0, MAX_YEAR, 45, 130, STR_2038_FLATS, 95, 15, 6, 2, 1,
TILE_SIZE_1x1,
HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //52
- M( 0, MAX_YEAR, 8, 90, STR_2012_CHURCH, 200, 3, 2, 0, 0,
+ MS( 0, MAX_YEAR, 8, 90, STR_2012_CHURCH, 200, 3, 2, 0, 0,
BUILDING_IS_CHURCH | TILE_SIZE_1x1,
HZ_SUBTROPIC | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //53
- M( 0, MAX_YEAR, 18, 80, STR_203F_HOUSES, 80, 7, 3, 1, 2,
+ MS( 0, MAX_YEAR, 18, 80, STR_203F_HOUSES, 80, 7, 3, 1, 2,
TILE_SIZE_1x1,
HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2,
CT_PASSENGERS, CT_MAIL, CT_FOOD), //54
- M( 1973, MAX_YEAR, 90, 110, STR_2038_FLATS, 95, 24, 6, 2, 1,
+ MS(1973, MAX_YEAR, 90, 110, STR_2038_FLATS, 95, 24, 6, 2, 1,
TILE_SIZE_1x1,
HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //55
- M( 1962, MAX_YEAR, 120, 120, STR_2038_FLATS, 95, 25, 6, 2, 1,
+ MS(1962, MAX_YEAR, 120, 120, STR_2038_FLATS, 95, 25, 6, 2, 1,
TILE_SIZE_1x1,
HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //56
- M( 1984, MAX_YEAR, 250, 190, STR_200F_TALL_OFFICE_BLOCK, 140, 80, 8, 3, 4,
+ MS(1984, MAX_YEAR, 250, 190, STR_200F_TALL_OFFICE_BLOCK, 140, 80, 8, 3, 4,
TILE_SIZE_2x1,
HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //57
- M( 1984, MAX_YEAR, 0, 190, STR_200F_TALL_OFFICE_BLOCK, 140, 80, 8, 3, 4,
+ MS(1984, MAX_YEAR, 0, 190, STR_200F_TALL_OFFICE_BLOCK, 140, 80, 8, 3, 4,
TILE_NO_FLAG,
HZ_SUBTROPIC,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //58
- M( 0, MAX_YEAR, 80, 110, STR_2038_FLATS, 95, 23, 6, 2, 1,
+ MS( 0, MAX_YEAR, 80, 110, STR_2038_FLATS, 95, 23, 6, 2, 1,
TILE_SIZE_1x1,
HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //59
- M( 1993, MAX_YEAR, 180, 180, STR_200F_TALL_OFFICE_BLOCK, 150, 90, 8, 3, 4,
+ MS(1993, MAX_YEAR, 180, 180, STR_200F_TALL_OFFICE_BLOCK, 150, 90, 8, 3, 4,
TILE_SIZE_1x1,
HZ_SUBTROPIC | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_GOODS), //5A
- M( 0, MAX_YEAR, 8, 90, STR_2012_CHURCH, 200, 3, 2, 0, 0,
+ MS( 0, MAX_YEAR, 8, 90, STR_2012_CHURCH, 200, 3, 2, 0, 0,
BUILDING_IS_CHURCH | TILE_SIZE_1x1,
HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_CANDY), //5B
- M( 0, MAX_YEAR, 18, 90, STR_203F_HOUSES, 90, 5, 6, 2, 2,
+ MS( 0, MAX_YEAR, 18, 90, STR_203F_HOUSES, 90, 5, 6, 2, 2,
TILE_SIZE_1x1,
HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_CANDY), //5C
- M( 0, MAX_YEAR, 7, 70, STR_203F_HOUSES, 50, 3, 3, 1, 1,
+ MS( 0, MAX_YEAR, 7, 70, STR_203F_HOUSES, 50, 3, 3, 1, 1,
TILE_SIZE_1x1,
HZ_TOYLND | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_CANDY), //5D
- M( 0, MAX_YEAR, 15, 80, STR_203F_HOUSES, 75, 6, 3, 1, 2,
+ MS( 0, MAX_YEAR, 15, 80, STR_203F_HOUSES, 75, 6, 3, 1, 2,
TILE_SIZE_1x1,
HZ_TOYLND | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_CANDY), //5E
- M( 0, MAX_YEAR, 17, 80, STR_203F_HOUSES, 75, 6, 3, 1, 2,
+ MS( 0, MAX_YEAR, 17, 80, STR_203F_HOUSES, 75, 6, 3, 1, 2,
TILE_SIZE_1x1,
HZ_TOYLND | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_CANDY), //5F
- M( 0, MAX_YEAR, 19, 80, STR_203F_HOUSES, 75, 6, 3, 1, 2,
+ MS( 0, MAX_YEAR, 19, 80, STR_203F_HOUSES, 75, 6, 3, 1, 2,
TILE_SIZE_1x1,
HZ_TOYLND | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_CANDY), //60
- M( 0, MAX_YEAR, 21, 80, STR_203F_HOUSES, 75, 6, 3, 1, 2,
+ MS( 0, MAX_YEAR, 21, 80, STR_203F_HOUSES, 75, 6, 3, 1, 2,
TILE_SIZE_1x1,
HZ_TOYLND | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_CANDY), //61
- M( 0, MAX_YEAR, 75, 160, STR_200F_TALL_OFFICE_BLOCK, 130, 20, 8, 4, 2,
+ MS( 0, MAX_YEAR, 75, 160, STR_200F_TALL_OFFICE_BLOCK, 130, 20, 8, 4, 2,
TILE_SIZE_1x1,
HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_CANDY), //62
- M( 0, MAX_YEAR, 35, 90, STR_203F_HOUSES, 80, 9, 4, 1, 2,
+ MS( 0, MAX_YEAR, 35, 90, STR_203F_HOUSES, 80, 9, 4, 1, 2,
TILE_SIZE_1x2,
HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_CANDY), //63
- M( 0, MAX_YEAR, 0, 90, STR_203F_HOUSES, 80, 0, 4, 1, 2,
+ MS( 0, MAX_YEAR, 0, 90, STR_203F_HOUSES, 80, 0, 4, 1, 2,
TILE_NO_FLAG,
HZ_NOZNS,
CT_PASSENGERS, CT_MAIL, CT_CANDY), //64
- M( 0, MAX_YEAR, 85, 150, STR_200F_TALL_OFFICE_BLOCK, 130, 18, 8, 4, 2,
+ MS( 0, MAX_YEAR, 85, 150, STR_200F_TALL_OFFICE_BLOCK, 130, 18, 8, 4, 2,
TILE_SIZE_1x1,
HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_CANDY), //65
- M( 0, MAX_YEAR, 11, 60, STR_2059_IGLOO, 45, 3, 3, 1, 1,
+ MS( 0, MAX_YEAR, 11, 60, STR_2059_IGLOO, 45, 3, 3, 1, 1,
TILE_SIZE_1x1,
HZ_TOYLND | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_CANDY), //66
- M( 0, MAX_YEAR, 10, 60, STR_205A_TEPEES, 45, 3, 3, 1, 1,
+ MS( 0, MAX_YEAR, 10, 60, STR_205A_TEPEES, 45, 3, 3, 1, 1,
TILE_SIZE_1x1,
HZ_TOYLND | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_CANDY), //67
- M( 0, MAX_YEAR, 67, 140, STR_201A_SHOPS_AND_OFFICES, 130, 22, 8, 4, 4,
+ MS( 0, MAX_YEAR, 67, 140, STR_201A_SHOPS_AND_OFFICES, 130, 22, 8, 4, 4,
TILE_SIZE_1x1,
HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_FIZZY_DRINKS), //68
- M( 0, MAX_YEAR, 86, 145, STR_201A_SHOPS_AND_OFFICES, 130, 23, 8, 4, 4,
+ MS( 0, MAX_YEAR, 86, 145, STR_201A_SHOPS_AND_OFFICES, 130, 23, 8, 4, 4,
TILE_SIZE_1x1,
HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_FIZZY_DRINKS), //69
- M( 0, MAX_YEAR, 95, 165, STR_200F_TALL_OFFICE_BLOCK, 130, 28, 8, 4, 2,
+ MS( 0, MAX_YEAR, 95, 165, STR_200F_TALL_OFFICE_BLOCK, 130, 28, 8, 4, 2,
TILE_SIZE_1x1,
HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_CANDY), //6A
- M( 0, MAX_YEAR, 30, 90, STR_2016_STATUE, 70, 10, 4, 1, 2,
+ MS( 0, MAX_YEAR, 30, 90, STR_2016_STATUE, 70, 10, 4, 1, 2,
TILE_SIZE_1x1,
HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3,
CT_PASSENGERS, CT_MAIL, CT_CANDY), //6B
- M( 0, MAX_YEAR, 25, 75, STR_205B_TEAPOT_HOUSE, 65, 8, 3, 1, 2,
+ MS( 0, MAX_YEAR, 25, 75, STR_205B_TEAPOT_HOUSE, 65, 8, 3, 1, 2,
TILE_SIZE_1x1,
HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_CANDY), //6C
- M( 0, MAX_YEAR, 18, 85, STR_205C_PIGGY_BANK, 95, 7, 3, 2, 4,
+ MS( 0, MAX_YEAR, 18, 85, STR_205C_PIGGY_BANK, 95, 7, 3, 2, 4,
TILE_SIZE_1x1,
HZ_TOYLND | HZ_ZON5 | HZ_ZON4 | HZ_ZON3 | HZ_ZON2 | HZ_ZON1,
CT_PASSENGERS, CT_MAIL, CT_FIZZY_DRINKS), //6D
};
-#undef M
+#undef MS
+
+/** Make sure we have the right number of elements: one entry for each house */
assert_compile(lengthof(_original_house_specs) == NEW_HOUSE_OFFSET);
--- a/src/town.h Tue Jun 12 11:56:35 2007 +0000
+++ b/src/town.h Wed Jun 13 11:00:24 2007 +0000
@@ -143,6 +143,9 @@
/* Index in town array */
TownID index;
+ /* If this is a larger town, and should grow more quickly. */
+ bool larger_town;
+
/* NOSAVE: UpdateTownRadius updates this given the house count. */
uint16 radius[5];
@@ -251,6 +254,12 @@
const struct GRFFile *grffile; ///< grf file that introduced this house
};
+enum TownSizeMode {
+ TSM_RANDOM,
+ TSM_FIXED,
+ TSM_CITY
+};
+
VARDEF HouseSpec _house_specs[HOUSE_MAX];
uint32 GetWorldPopulation();
@@ -259,7 +268,7 @@
void InitializeTown();
void ShowTownViewWindow(TownID town);
void ExpandTown(Town *t);
-Town *CreateRandomTown(uint attempts, uint size_mode);
+Town *CreateRandomTown(uint attempts, TownSizeMode mode, uint size);
enum {
ROAD_REMOVE = 0,
@@ -349,7 +358,7 @@
/**
* Check if a TownID is valid.
- * @param TownID to inquiry
+ * @param index to inquiry in the pool of town
* @return true if it exists
*/
static inline bool IsValidTownID(TownID index)
--- a/src/town_cmd.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/town_cmd.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -949,7 +949,16 @@
t->max_mail = t->population >> 4;
}
-static void DoCreateTown(Town *t, TileIndex tile, uint32 townnameparts, uint size_mode)
+/**
+ * Does the actual town creation.
+ *
+ * @param t The town
+ * @param tile Where to put it
+ * @param townnameparts The town name
+ * @param size_mode How the size should be determined
+ * @param size Parameter for size determination
+ */
+static void DoCreateTown(Town *t, TileIndex tile, uint32 townnameparts, TownSizeMode size_mode, uint size)
{
int x, i;
@@ -1014,10 +1023,25 @@
UpdateTownVirtCoord(t);
_town_sort_dirty = true;
- if (size_mode == 0) {
- x = (Random() & 0xF) + 8;
- } else {
- x = (size_mode - 1) * 16 + 3;
+ /* Random town size. */
+ x = (Random() & 0xF) + 8;
+
+ switch (size_mode) {
+ default: NOT_REACHED();
+
+ case TSM_RANDOM:
+ t->larger_town = false;
+ break;
+
+ case TSM_FIXED:
+ x = size * 16 + 3;
+ t->larger_town = false;
+ break;
+
+ case TSM_CITY:
+ x *= _patches.initial_city_size;
+ t->larger_town = true;
+ break;
}
t->num_houses += x;
@@ -1062,8 +1086,8 @@
* as it might be possible in the future to fund your own town :)
* @param tile coordinates where town is built
* @param flags type of operation
- * @param p1 size of the town (0 = random, 1 = small, 2 = medium, 3 = large)
- * @param p2 unused
+ * @param p1 size of the town (0 = small, 1 = medium, 2 = large)
+ * @param p2 size mode (@see TownSizeMode)
*/
int32 CmdBuildTown(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
{
@@ -1072,6 +1096,7 @@
/* Only in the scenario editor */
if (_game_mode != GM_EDITOR) return CMD_ERROR;
+ if (p2 > TSM_CITY) return CMD_ERROR;
SET_EXPENSES_TYPE(EXPENSES_OTHER);
@@ -1099,13 +1124,13 @@
/* Create the town */
if (flags & DC_EXEC) {
_generating_world = true;
- DoCreateTown(t, tile, townnameparts, p1);
+ DoCreateTown(t, tile, townnameparts, (TownSizeMode)p2, p1);
_generating_world = false;
}
return 0;
}
-Town *CreateRandomTown(uint attempts, uint size_mode)
+Town *CreateRandomTown(uint attempts, TownSizeMode mode, uint size)
{
TileIndex tile;
Town *t;
@@ -1129,7 +1154,7 @@
t = AllocateTown();
if (t == NULL) break;
- DoCreateTown(t, tile, townnameparts, size_mode);
+ DoCreateTown(t, tile, townnameparts, mode, size);
return t;
} while (--attempts);
return NULL;
@@ -1141,17 +1166,20 @@
{
uint num = 0;
uint n = ScaleByMapSize(_num_initial_towns[_opt.diff.number_towns] + (Random() & 7));
+ uint num_cities = _patches.larger_towns == 0 ? 0 : n / _patches.larger_towns;
SetGeneratingWorldProgress(GWP_TOWN, n);
do {
IncreaseGeneratingWorldProgress(GWP_TOWN);
/* try 20 times to create a random-sized town for the first loop. */
- if (CreateRandomTown(20, 0) != NULL) num++;
+ TownSizeMode mode = num_cities > 0 ? TSM_CITY : TSM_RANDOM;
+ if (CreateRandomTown(20, mode, _patches.initial_city_size) != NULL) num++;
+ if (num_cities > 0) num_cities--;
} while (--n);
/* give it a last try, but now more aggressive */
- if (num == 0 && CreateRandomTown(10000, 0) == NULL) {
+ if (num == 0 && CreateRandomTown(10000, TSM_RANDOM, 0) == NULL) {
if (GetNumTowns() == 0) {
/* XXX - can we handle that more gracefully? */
if (_game_mode != GM_EDITOR) error("Could not generate any town");
@@ -1539,6 +1567,7 @@
/**
* Search callback function for TownActionBuildStatue
+ * @param tile on which to perform the search
* @param town_id The town_id for which we want a statue
* @return the result of the test
*/
@@ -1713,7 +1742,7 @@
uint growth_multiplier = _patches.town_growth_rate != 0 ? _patches.town_growth_rate - 1 : 1;
m >>= growth_multiplier;
- if (_patches.larger_towns != 0 && (t->index % _patches.larger_towns) == 0) m /= 2;
+ if (t->larger_town) m /= 2;
t->growth_rate = m / (t->num_houses / 50 + 1);
if (m <= t->grow_counter)
@@ -1973,6 +2002,9 @@
SLE_VAR(Town, exclusivity, SLE_UINT8),
SLE_VAR(Town, exclusive_counter, SLE_UINT8),
+
+ SLE_CONDVAR(Town, larger_town, SLE_BOOL, 56, SL_MAX_VERSION),
+
/* reserve extra space in savegame here. (currently 30 bytes) */
SLE_CONDNULL(30, 2, SL_MAX_VERSION),
--- a/src/train_cmd.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/train_cmd.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -3107,7 +3107,7 @@
* train, then goes to the last wagon and deletes that. Each call to this function
* will remove the last wagon of a crashed train. If this wagon was on a crossing,
* or inside a tunnel, recalculate the signals as they might need updating
- * @param v the @Vehicle of which last wagon is to be removed
+ * @param v the Vehicle of which last wagon is to be removed
*/
static void DeleteLastWagon(Vehicle *v)
{
--- a/src/tunnel_map.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/tunnel_map.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -7,6 +7,12 @@
#include "tile.h"
#include "tunnel_map.h"
+/**
+ * Gets the other end of the tunnel. Where a vehicle would reappear when it
+ * enters at the given tile.
+ * @param tile the tile to search from.
+ * @return the tile of the other end of the tunnel.
+ */
TileIndex GetOtherTunnelEnd(TileIndex tile)
{
DiagDirection dir = GetTunnelDirection(tile);
@@ -26,6 +32,13 @@
}
+/**
+ * Is there a tunnel in the way in the given direction?
+ * @param tile the tile to search from.
+ * @param z the 'z' to search on.
+ * @param dir the direction to start searching to.
+ * @return true if and only if there is a tunnel.
+ */
static bool IsTunnelInWayDir(TileIndex tile, uint z, DiagDirection dir)
{
TileIndexDiff delta = TileOffsByDiagDir(dir);
@@ -42,6 +55,12 @@
GetTunnelDirection(tile) == dir;
}
+/**
+ * Is there a tunnel in the way in any direction?
+ * @param tile the tile to search from.
+ * @param z the 'z' to search on.
+ * @return true if and only if there is a tunnel.
+ */
bool IsTunnelInWay(TileIndex tile, uint z)
{
return
--- a/src/tunnelbridge_cmd.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/tunnelbridge_cmd.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -440,7 +440,7 @@
/** Build Tunnel.
- * @param tile start tile of tunnel
+ * @param start_tile start tile of tunnel
* @param flags type of operation
* @param p1 railtype, 0x200 for road tunnel
* @param p2 unused
--- a/src/unmovable_cmd.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/unmovable_cmd.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -27,8 +27,9 @@
/** Destroy a HQ.
* During normal gameplay you can only implicitely destroy a HQ when you are
* rebuilding it. Otherwise, only water can destroy it.
- * @param tile tile coordinates where HQ is located to destroy
+ * @param pid Player requesting the destruction of his HQ
* @param flags docommand flags of calling function
+ * @return cost of the operation
*/
static int32 DestroyCompanyHQ(PlayerID pid, uint32 flags)
{
--- a/src/unmovable_map.h Tue Jun 12 11:56:35 2007 +0000
+++ b/src/unmovable_map.h Wed Jun 13 11:00:24 2007 +0000
@@ -6,88 +6,152 @@
#define UNMOVABLE_MAP_H
enum {
- HQ_NUM_TILE = 4,
- HQ_NUM_SIZE = 5
+ HQ_NUM_TILE = 4, ///< Number of HQ tiles
+ HQ_NUM_SIZE = 5 ///< Number of stages of an HQ
};
+/** Types of unmovable structure */
enum UnmovableType {
- UNMOVABLE_TRANSMITTER = 0,
- UNMOVABLE_LIGHTHOUSE = 1,
- UNMOVABLE_STATUE = 2,
- UNMOVABLE_OWNED_LAND = 3,
- UNMOVABLE_HQ_NORTH = 0x80,
- UNMOVABLE_HQ_WEST = 0x81,
- UNMOVABLE_HQ_EAST = 0x82,
- UNMOVABLE_HQ_SOUTH = 0x83,
+ UNMOVABLE_TRANSMITTER = 0, ///< The large antenna
+ UNMOVABLE_LIGHTHOUSE = 1, ///< The nice lighthouse
+ UNMOVABLE_STATUE = 2, ///< Statue in towns
+ UNMOVABLE_OWNED_LAND = 3, ///< Owned land 'flag'
+ UNMOVABLE_HQ_NORTH = 0x80, ///< Offset for the northern HQ tile
+ UNMOVABLE_HQ_WEST = 0x81, ///< Offset for the western HQ tile
+ UNMOVABLE_HQ_EAST = 0x82, ///< Offset for the eastern HQ tile
+ UNMOVABLE_HQ_SOUTH = 0x83, ///< Offset for the southern HQ tile
+ /** End of the HQ (rather end + 1 for IS_INT_INSIDE) */
UNMOVABLE_HQ_END = UNMOVABLE_HQ_NORTH + HQ_NUM_SIZE * HQ_NUM_TILE
};
+/**
+ * Gets the UnmovableType of the given unmovable tile
+ * @param t the tile to get the type from.
+ * @pre IsTileType(t, MP_UNMOVABLE)
+ * @return the type.
+ */
static inline UnmovableType GetUnmovableType(TileIndex t)
{
assert(IsTileType(t, MP_UNMOVABLE));
return (UnmovableType)_m[t].m5;
}
-
+/**
+ * Does the given tile have a transmitter?
+ * @param t the tile to inspect.
+ * @return true if and only if the tile has a transmitter.
+ */
static inline bool IsTransmitterTile(TileIndex t)
{
- return
- IsTileType(t, MP_UNMOVABLE) &&
- GetUnmovableType(t) == UNMOVABLE_TRANSMITTER;
+ return IsTileType(t, MP_UNMOVABLE) && GetUnmovableType(t) == UNMOVABLE_TRANSMITTER;
}
-
+/**
+ * Is this unmovable tile an 'owned land' tile?
+ * @param t the tile to inspect.
+ * @pre IsTileType(t, MP_UNMOVABLE)
+ * @return true if and only if the tile is an 'owned land' tile.
+ */
static inline bool IsOwnedLand(TileIndex t)
{
assert(IsTileType(t, MP_UNMOVABLE));
return GetUnmovableType(t) == UNMOVABLE_OWNED_LAND;
}
+/**
+ * Is the given tile (pre-)owned by someone (the little flags)?
+ * @param t the tile to inspect.
+ * @return true if and only if the tile is an 'owned land' tile.
+ */
static inline bool IsOwnedLandTile(TileIndex t)
{
return IsTileType(t, MP_UNMOVABLE) && IsOwnedLand(t);
}
+/**
+ * Is this unmovable tile a HQ tile?
+ * @param t the tile to inspect.
+ * @pre IsTileType(t, MP_UNMOVABLE)
+ * @return true if and only if the tile is a HQ tile.
+ */
static inline bool IsCompanyHQ(TileIndex t)
{
+ assert(IsTileType(t, MP_UNMOVABLE));
return IS_INT_INSIDE(GetUnmovableType(t), UNMOVABLE_HQ_NORTH, UNMOVABLE_HQ_END);
}
+/**
+ * Is this unmovable tile a statue?
+ * @param t the tile to inspect.
+ * @pre IsTileType(t, MP_UNMOVABLE)
+ * @return true if and only if the tile is a statue.
+ */
static inline bool IsStatue(TileIndex t)
{
assert(IsTileType(t, MP_UNMOVABLE));
return GetUnmovableType(t) == UNMOVABLE_STATUE;
}
+/**
+ * Is the given tile a statue?
+ * @param t the tile to inspect.
+ * @return true if and only if the tile is a statue.
+ */
static inline bool IsStatueTile(TileIndex t)
{
return IsTileType(t, MP_UNMOVABLE) && IsStatue(t);
}
+/**
+ * Get the town of the given statue tile.
+ * @param t the tile of the statue.
+ * @pre IsStatueTile(t)
+ * @return the town the given statue is in.
+ */
static inline TownID GetStatueTownID(TileIndex t)
{
- assert(IsStatue(t));
+ assert(IsStatueTile(t));
return _m[t].m2;
}
+/**
+ * Get the 'stage' of the HQ.
+ * @param t a tile of the HQ.
+ * @pre IsTileType(t, MP_UNMOVABLE) && IsCompanyHQ(t)
+ * @return the 'stage' of the HQ.
+ */
static inline byte GetCompanyHQSize(TileIndex t)
{
assert(IsTileType(t, MP_UNMOVABLE) && IsCompanyHQ(t));
return GB(_m[t].m5, 2, 3);
}
+/**
+ * Get the 'section' (including stage) of the HQ.
+ * @param t a tile of the HQ.
+ * @pre IsTileType(t, MP_UNMOVABLE) && IsCompanyHQ(t)
+ * @return the 'section' of the HQ.
+ */
static inline byte GetCompanyHQSection(TileIndex t)
{
assert(IsTileType(t, MP_UNMOVABLE) && IsCompanyHQ(t));
return GB(_m[t].m5, 0, 5);
}
-
+/**
+ * Enlarge the given HQ to the given size. If the new size
+ * is larger than the current size, nothing happens.
+ * @param t the tile of the HQ.
+ * @param size the new size of the HQ.
+ * @pre t is the northern tile of the HQ
+ */
static inline void EnlargeCompanyHQ(TileIndex t, byte size)
{
+ assert(GB(GetCompanyHQSection(t), 0, 2) == 0);
+
size *= 4;
if (size <= _m[t].m5 - UNMOVABLE_HQ_NORTH) return;
@@ -98,6 +162,13 @@
}
+/**
+ * Make an Unmovable tile.
+ * @note do not use this function directly. Use one of the other Make* functions.
+ * @param t the tile to make unmovable.
+ * @param u the unmovable type of the tile.
+ * @param o the new owner of the tile.
+ */
static inline void MakeUnmovable(TileIndex t, UnmovableType u, Owner o)
{
SetTileType(t, MP_UNMOVABLE);
@@ -109,27 +180,51 @@
}
+/**
+ * Make a transmitter tile.
+ * @param t the tile to make a transmitter.
+ */
static inline void MakeTransmitter(TileIndex t)
{
MakeUnmovable(t, UNMOVABLE_TRANSMITTER, OWNER_NONE);
}
+/**
+ * Make a lighthouse tile.
+ * @param t the tile to make a transmitter.
+ */
static inline void MakeLighthouse(TileIndex t)
{
MakeUnmovable(t, UNMOVABLE_LIGHTHOUSE, OWNER_NONE);
}
+/**
+ * Make a statue tile.
+ * @param t the tile to make a statue.
+ * @param o the owner of the statue.
+ * @param town_id the town the statue was built in.
+ */
static inline void MakeStatue(TileIndex t, Owner o, TownID town_id)
{
MakeUnmovable(t, UNMOVABLE_STATUE, o);
_m[t].m2 = town_id;
}
+/**
+ * Make an 'owned land' tile.
+ * @param t the tile to make an 'owned land' tile.
+ * @param o the owner of the land.
+ */
static inline void MakeOwnedLand(TileIndex t, Owner o)
{
MakeUnmovable(t, UNMOVABLE_OWNED_LAND, o);
}
+/**
+ * Make an HQ with the give tile as it's northern tile.
+ * @param t the tile to make the northern tile of a HQ.
+ * @param o the owner of the HQ.
+ */
static inline void MakeCompanyHQ(TileIndex t, Owner o)
{
MakeUnmovable(t + TileDiffXY(0, 0), UNMOVABLE_HQ_NORTH, o);
--- a/src/variables.h Tue Jun 12 11:56:35 2007 +0000
+++ b/src/variables.h Wed Jun 13 11:00:24 2007 +0000
@@ -222,8 +222,9 @@
uint8 scrollwheel_scrolling;
uint8 scrollwheel_multiplier;
- uint8 town_growth_rate; ///< Town growth rate
- uint8 larger_towns; ///< 1 in the specified number of towns will grow twice as fast
+ uint8 town_growth_rate; ///< Town growth rate
+ uint8 larger_towns; ///< The number of cities to build. These start off larger and grow twice as fast
+ uint8 initial_city_size; ///< Multiplier for the initial size of the cities compared to towns
};
VARDEF Patches _patches;
--- a/src/vehicle.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/vehicle.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -767,7 +767,7 @@
}
/** Find the first cargo type that an engine can be refitted to.
- * @param engine Which engine to find cargo for.
+ * @param engine_type Which engine to find cargo for.
* @return A climate dependent cargo type. CT_INVALID is returned if not refittable.
*/
CargoID FindFirstRefittableCargo(EngineID engine_type)
@@ -784,7 +784,7 @@
}
/** Learn the price of refitting a certain engine
-* @param engine Which engine to refit
+* @param engine_type Which engine to refit
* @return Price for refitting
*/
int32 GetRefitCost(EngineID engine_type)
@@ -1904,7 +1904,7 @@
/** Generates a list of vehicles inside a depot
* Will enlarge allocated space for the list if they are too small, so it's ok to call with (pointer to NULL array, pointer to uninitised uint16, pointer to 0)
* If one of the lists is not needed (say wagons when finding ships), all the pointers regarding that list should be set to NULL
- * @param Type type of vehicle
+ * @param type Type of vehicle
* @param tile The tile the depot is located in
* @param ***engine_list Pointer to a pointer to an array of vehicles in the depot (old list is freed and a new one is malloced)
* @param *engine_list_length Allocated size of engine_list. Needs to be set to 0 when engine_list points to a NULL array
@@ -1986,11 +1986,13 @@
* @param length_of_array informs the length allocated for sort_list. This is not the same as the number of vehicles in the list. Needs to be 0 when sort_list is NULL
* @param type type of vehicle
* @param owner PlayerID of owner to generate a list for
-* @param index This parameter got different meanings depending on window_type
- VLW_STATION_LIST: index of station to generate a list for
- VLW_SHARED_ORDERS: index of order to generate a list for
- VLW_STANDARD: not used
- VLW_DEPOT_LIST: TileIndex of the depot/hangar to make the list for
+* @param index This parameter has different meanings depending on window_type
+ <ul>
+ <li>VLW_STATION_LIST: index of station to generate a list for</li>
+ <li>VLW_SHARED_ORDERS: index of order to generate a list for<li>
+ <li>VLW_STANDARD: not used<li>
+ <li>VLW_DEPOT_LIST: TileIndex of the depot/hangar to make the list for</li>
+ </ul>
* @param window_type tells what kind of window the list is for. Use the VLW flags in vehicle_gui.h
* @return the number of vehicles added to the list
*/
@@ -2088,7 +2090,7 @@
* @param flags the flags used for DoCommand()
* @param service should the vehicles only get service in the depots
* @param owner PlayerID of owner of the vehicles to send
- * @param VLW_flag tells what kind of list requested the goto depot
+ * @param vlw_flag tells what kind of list requested the goto depot
* @return 0 for success and CMD_ERROR if no vehicle is able to go to depot
*/
int32 SendAllVehiclesToDepot(byte type, uint32 flags, bool service, PlayerID owner, uint16 vlw_flag, uint32 id)
--- a/src/vehicle_gui.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/vehicle_gui.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -279,8 +279,11 @@
/** Draw the list of available refit options for a consist.
* Draw the list and highlight the selected refit option (if any)
- * @param *v first vehicle in consist to get the refit-options of
+ * @param *list first vehicle in consist to get the refit-options of
* @param sel selected refit cargo-type in the window
+ * @param pos position of the selected item in caller widow
+ * @param rows number of rows(capacity) in caller window
+ * @param delta step height in caller window
* @return the refit option that is hightlighted, NULL if none
*/
static RefitOption *DrawVehicleRefitWindow(const RefitList *list, int sel, uint pos, uint rows, uint delta)
--- a/src/viewport.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/viewport.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -2023,8 +2023,9 @@
* north-south (DIR_S) to obtain the same results with less code. This is what
* the return value signifies.
* @param style HighLightStyle dragging style
- * @param start_tile, end_tile start and end tile of drag
- * @param boolean value which when true means start/end should be swapped */
+ * @param start_tile start tile of drag
+ * @param end_tile end tile of drag
+ * @return boolean value which when true means start/end should be swapped */
static bool SwapDirection(HighLightStyle style, TileIndex start_tile, TileIndex end_tile)
{
uint start_x = TileX(start_tile);
--- a/src/void_map.h Tue Jun 12 11:56:35 2007 +0000
+++ b/src/void_map.h Wed Jun 13 11:00:24 2007 +0000
@@ -5,6 +5,10 @@
#ifndef VOID_MAP_H
#define VOID_MAP_H
+/**
+ * Make a nice void tile ;)
+ * @param t the tile to make void
+ */
static inline void MakeVoid(TileIndex t)
{
SetTileType(t, MP_VOID);
--- a/src/widget.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/widget.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -36,17 +36,13 @@
return pt;
}
-/*****************************************************
- * Special handling for the scrollbar widget type.
+/** Special handling for the scrollbar widget type.
* Handles the special scrolling buttons and other
* scrolling.
- * Parameters:
- * w - Window.
- * wi - Pointer to the scrollbar widget.
- * x - The X coordinate of the mouse click.
- * y - The Y coordinate of the mouse click.
- */
-
+ * @param w Window on which a scroll was performed.
+ * @param wi Pointer to the scrollbar widget.
+ * @param x The X coordinate of the mouse click.
+ * @param y The Y coordinate of the mouse click. */
void ScrollbarClickHandler(Window *w, const Widget *wi, int x, int y)
{
int mi, ma, pos;
@@ -128,8 +124,8 @@
/** Returns the index for the widget located at the given position
* relative to the window. It includes all widget-corner pixels as well.
* @param *w Window to look inside
- * @param x
- * @param y Window client coordinates
+ * @param x The Window client X coordinate
+ * @param y The Window client y coordinate
* @return A widget index, or -1 if no widget was found.
*/
int GetWidgetFromPos(const Window *w, int x, int y)
@@ -737,7 +733,7 @@
/** Evenly distribute some widgets when resizing horizontally (often a button row)
* When only two arguments are given, the widgets are presumed to be on a line and only the ends are given
- * @param w widow to modify
+ * @param w Window to modify
* @param left The leftmost widget to resize
* @param right The rightmost widget to resize. Since right side of it is used, remember to set it to RESIZE_RIGHT
*/
--- a/src/window.cpp Tue Jun 12 11:56:35 2007 +0000
+++ b/src/window.cpp Wed Jun 13 11:00:24 2007 +0000
@@ -1080,7 +1080,7 @@
* Both the areas of the old window and the new sized window are set dirty
* ensuring proper redrawal.
* @param w Window to resize
- * @param x delta x-size of changed window (positive if larger, etc.(
+ * @param x delta x-size of changed window (positive if larger, etc.)
* @param y delta y-size of changed window */
void ResizeWindow(Window *w, int x, int y)
{
--- a/src/yapf/yapf.h Tue Jun 12 11:56:35 2007 +0000
+++ b/src/yapf/yapf.h Wed Jun 13 11:00:24 2007 +0000
@@ -20,7 +20,6 @@
* @param v the RV that needs to find a path
* @param tile the tile to find the path from (should be next tile the RV is about to enter)
* @param enterdir diagonal direction which the RV will enter this new tile from
- * @param tracks available tracks on the new tile (to choose from)
* @return the best trackdir for next turn or INVALID_TRACKDIR if the path could not be found
*/
Trackdir YapfChooseRoadTrack(Vehicle *v, TileIndex tile, DiagDirection enterdir);
@@ -29,8 +28,8 @@
* @param v the train that needs to find a path
* @param tile the tile to find the path from (should be next tile the train is about to enter)
* @param enterdir diagonal direction which the RV will enter this new tile from
- * @param trackdirs available trackdirs on the new tile (to choose from)
- * @param no_path_found [out] true is returned if no path can be found (returned Trackdir is only a 'guess')
+ * @param tracks available trackdirs on the new tile (to choose from)
+ * @param path_not_found [out] true is returned if no path can be found (returned Trackdir is only a 'guess')
* @return the best trackdir for next turn or INVALID_TRACKDIR if the path could not be found
*/
Trackdir YapfChooseRailTrack(Vehicle *v, TileIndex tile, DiagDirection enterdir, TrackBits tracks, bool *path_not_found);
@@ -48,13 +47,13 @@
Depot* YapfFindNearestRoadDepot(const Vehicle *v);
/** Used when user sends train to the nearest depot or if train needs servicing.
- * @v train that needs to go to some depot
- * @max_distance max distance (number of track tiles) from the current train position
+ * @param v train that needs to go to some depot
+ * @param max_distance max distance (number of track tiles) from the current train position
* (used also as optimization - the pathfinder can stop path finding if max_distance
* was reached and no depot was seen)
- * @reverse_penalty penalty that should be added for the path that requires reversing the train first
- * @depot_tile receives the depot tile if depot was found
- * @reversed receives true if train needs to reversed first
+ * @param reverse_penalty penalty that should be added for the path that requires reversing the train first
+ * @param depot_tile receives the depot tile if depot was found
+ * @param reversed receives true if train needs to reversed first
* @return the true if depot was found.
*/
bool YapfFindNearestRailDepotTwoWay(Vehicle *v, int max_distance, int reverse_penalty, TileIndex* depot_tile, bool* reversed);