--- a/Makefile Mon Jan 01 16:10:01 2007 +0000
+++ b/Makefile Mon Jan 01 16:31:13 2007 +0000
@@ -1038,8 +1038,12 @@
install -m 644 lang/*.lng $(DATA_DIR_INSTALL)/lang
install -m 644 data/*.grf $(DATA_DIR_INSTALL)/data
install -m 644 data/opntitle.dat $(DATA_DIR_INSTALL)/data
+ # Generic menu icon
install -m 644 media/openttd.64.png $(ICON_DIR_INSTALL)
+ # Debian menu icon
install -m 644 media/openttd.32.xpm $(ICON_DIR_INSTALL)
+ # Window icon
+ install -m 644 media/openttd.32.bmp $(ICON_DIR_INSTALL)
else #MorphOS
install:
$(error make install is not supported on MorphOS)
--- a/aircraft_cmd.c Mon Jan 01 16:10:01 2007 +0000
+++ b/aircraft_cmd.c Mon Jan 01 16:31:13 2007 +0000
@@ -543,7 +543,6 @@
if (!IsValidStation(st) || st->airport_tile == 0 || GetAirport(st->airport_type)->nof_depots == 0) {
StationID station;
- if (!(p2 & DEPOT_LOCATE_HANGAR)) return CMD_ERROR;
// the aircraft has to search for a hangar on its own
station = FindNearestHangar(v);
@@ -561,7 +560,7 @@
v->current_order.refit_cargo = CT_INVALID;
v->current_order.dest = next_airport_index;
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR);
- if (p2 & DEPOT_LOCATE_HANGAR || (p2 & DEPOT_SERVICE && v->u.air.state == FLYING && !next_airport_has_hangar)) {
+ if (v->u.air.state == FLYING && !next_airport_has_hangar) {
/* The aircraft is now heading for a different hangar than the next in the orders */
AircraftNextAirportPos_and_Order(v);
v->u.air.targetairport = next_airport_index;
--- a/aircraft_gui.c Mon Jan 01 16:10:01 2007 +0000
+++ b/aircraft_gui.c Mon Jan 01 16:31:13 2007 +0000
@@ -125,7 +125,7 @@
case 2: /* rename */
v = GetVehicle(w->window_number);
SetDParam(0, v->unitnumber);
- ShowQueryString(v->string_id, STR_A030_NAME_AIRCRAFT, 31, 150, w->window_class, w->window_number, CS_ALPHANUMERAL);
+ ShowQueryString(v->string_id, STR_A030_NAME_AIRCRAFT, 31, 150, w, CS_ALPHANUMERAL);
break;
case 5: /* increase int */
mod = _ctrl_pressed? 5 : 10;
--- a/build_vehicle_gui.c Mon Jan 01 16:10:01 2007 +0000
+++ b/build_vehicle_gui.c Mon Jan 01 16:31:13 2007 +0000
@@ -396,7 +396,7 @@
EngineID sel_eng = bv->sel_engine;
if (sel_eng != INVALID_ENGINE) {
bv->rename_engine = sel_eng;
- ShowQueryString(GetCustomEngineName(sel_eng), STR_A039_RENAME_AIRCRAFT_TYPE, 31, 160, w->window_class, w->window_number, CS_ALPHANUMERAL);
+ ShowQueryString(GetCustomEngineName(sel_eng), STR_A039_RENAME_AIRCRAFT_TYPE, 31, 160, w, CS_ALPHANUMERAL);
}
break;
}
--- a/changelog.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/changelog.txt Mon Jan 01 16:31:13 2007 +0000
@@ -1,3 +1,20 @@
+0.5.0-RC2 (2006-12-31)
+------------------------------------------------------------------------
+- General Removed support for OSX older than 10.3.9. Either upgrade, or use 0.4.8 (compatible with OSX 10.2)
+- Codechange: Drastically reduce the CPU usage in certain cases (AI using CheckStationSpreadOut()) (r7585)
+- Fix: Internal bug in updating the animated_tiles table caused desyncs between (different endian) machines in MP (r7631)
+- Fix: Signal update got propagated through incompatible railtypes and under certain circumstances tunnels and rail on top (r7620)
+- Fix: Remove landscaping toolbar option from road consturction toolbar in scenario editor [FS#473] (r7586)
+- Fix: The server could under certain circumstances tell a client too late to start syncing if it has been waiting to join (r7566)
+- Fix: Removing towns in scenario editor didn't remove their subsidies causing possible crashes [FS#468] (r7563)
+- Fix: Internal and (patches) GUI were disagreeing about autorenew settings [FS#431] (r7561)
+- Fix: No new company could be created if more than 8 clients were connected, even if not all 8 companies were used (r7560)
+- Fix; Clicking 'full load' could under certain circumstances change the current depot order [FS#456] (r7559)
+- Fix: Do not wait till a crashed vehicle is removed before starting to load other vehicles [FS#464] (r7558)
+- Fix: MorhpOS compile and install fixes (r7548)
+- Fix: Removing rail station cost was calculated on occupied area not on number of tiles with an actual station on (r7547)
+
+
0.5.0-RC1 (2006-12-21)
------------------------------------------------------------------------
--- a/depot_gui.c Mon Jan 01 16:10:01 2007 +0000
+++ b/depot_gui.c Mon Jan 01 16:31:13 2007 +0000
@@ -142,89 +142,12 @@
}
}
-static void DepotSellAllWndProc(Window *w, WindowEvent *e)
+static void DepotSellAllConfirmationCallback(Window *w, bool confirmed)
{
- TileIndex tile = w->window_number;
- byte vehicle_type = WP(w, depot_d).type;
-
- switch (e->event) {
- case WE_PAINT:
- if (vehicle_type == VEH_Aircraft) {
- SetDParam(0, GetStationIndex(tile)); // Airport name
- } else {
- Depot *depot = GetDepotByTile(tile);
- assert(depot != NULL);
-
- SetDParam(0, depot->town_index);
- }
- DrawWindowWidgets(w);
-
- DrawStringCentered(150, 25, STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM, 0);
- DrawStringCentered(150, 38, STR_ARE_YOU_SURE, 0);
- break;
-
- case WE_CLICK:
- switch (e->we.click.widget) {
- case 4:
- DoCommandP(tile, vehicle_type, 0, NULL, CMD_DEPOT_SELL_ALL_VEHICLES);
- /* Fallthrough */
- case 3:
- DeleteWindow(w);
- break;
- }
- break;
- }
-}
-
-static const Widget _depot_sell_all_widgets[] = {
- { WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
- { WWT_CAPTION, RESIZE_NONE, 14, 11, 299, 0, 13, 0x0, STR_018C_WINDOW_TITLE_DRAG_THIS},
- { WWT_PANEL, RESIZE_NONE, 14, 0, 299, 14, 71, 0x0, STR_NULL},
- { WWT_PUSHTXTBTN, RESIZE_NONE, 14, 85, 144, 52, 63, STR_012E_CANCEL, STR_NULL},
- { WWT_PUSHTXTBTN, RESIZE_NONE, 14, 155, 214, 52, 63, STR_SELL, STR_NULL},
- { WIDGETS_END},
-};
-
-static const WindowDesc _depot_sell_all_desc = {
- WDP_CENTER, WDP_CENTER, 300, 72,
- WC_DEPOT_SELL_ALL, WC_VEHICLE_DEPOT,
- WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
- _depot_sell_all_widgets,
- DepotSellAllWndProc
-};
-
-static void ShowDepotSellAllWindow(TileIndex tile, byte type)
-{
- Window *w = AllocateWindowDescFront(&_depot_sell_all_desc, tile);
-
- if (w != NULL) {
- w->caption_color = GetTileOwner(tile);
- WP(w, depot_d).type = type;
- switch (type) {
- case VEH_Train:
- w->widget[1].data = STR_8800_TRAIN_DEPOT;
- w->widget[3].tooltips = STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP;
- w->widget[4].tooltips = STR_DEPOT_SELL_ALL_TRAIN_TIP;
- break;
-
- case VEH_Road:
- w->widget[1].data = STR_9003_ROAD_VEHICLE_DEPOT;
- w->widget[3].tooltips = STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP;
- w->widget[4].tooltips = STR_DEPOT_SELL_ALL_ROADVEH_TIP;
- break;
-
- case VEH_Ship:
- w->widget[1].data = STR_9803_SHIP_DEPOT;
- w->widget[3].tooltips = STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP;
- w->widget[4].tooltips = STR_DEPOT_SELL_ALL_SHIP_TIP;
- break;
-
- case VEH_Aircraft:
- w->widget[1].data = STR_A002_AIRCRAFT_HANGAR;
- w->widget[3].tooltips = STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP;
- w->widget[4].tooltips = STR_DEPOT_SELL_ALL_AIRCRAFT_TIP;
- break;
- }
+ if (confirmed) {
+ TileIndex tile = w->window_number;
+ byte vehtype = WP(w, depot_d).type;
+ DoCommandP(tile, vehtype, 0, NULL, CMD_DEPOT_SELL_ALL_VEHICLES);
}
}
@@ -849,7 +772,22 @@
case DEPOT_WIDGET_SELL_ALL:
/* Only open the confimation window if there are anything to sell */
if (WP(w, depot_d).engine_count != 0 || WP(w, depot_d).wagon_count != 0) {
- ShowDepotSellAllWindow(w->window_number, WP(w, depot_d).type);
+ static const StringID confirm_captions[] = {
+ STR_8800_TRAIN_DEPOT,
+ STR_9003_ROAD_VEHICLE_DEPOT,
+ STR_9803_SHIP_DEPOT,
+ STR_A002_AIRCRAFT_HANGAR
+ };
+ TileIndex tile = w->window_number;
+ byte vehtype = WP(w, depot_d).type - VEH_Train;
+
+ SetDParam(0, (vehtype == VEH_Aircraft) ? GetStationIndex(tile) : GetDepotByTile(tile)->town_index);
+ ShowQuery(
+ confirm_captions[vehtype],
+ STR_DEPOT_SELL_CONFIRMATION_TEXT,
+ w,
+ DepotSellAllConfirmationCallback
+ );
}
break;
--- a/docs/landscape.html Mon Jan 01 16:10:01 2007 +0000
+++ b/docs/landscape.html Mon Jan 01 16:31:13 2007 +0000
@@ -440,13 +440,13 @@
<tr><td nowrap valign=top><tt>00</tt>..<tt>06</tt> </td><td align=left>coal mine
<table>
<tr><td nowrap valign=top><tt>00</tt> </td><td align=left>wheel tower when not animated</td></tr>
-<tr><td nowrap valign=top><tt>01</tt> </td><td align=left>wheel tower when animated; animation state in m1 bits 5..0; m1 bit 6 set = sound already generated</td></tr>
+<tr><td nowrap valign=top><tt>01</tt> </td><td align=left>wheel tower when animated; animation state in m3 bits 5..0; m3 bit 6 set = sound already generated</td></tr>
</table>
</td></tr>
<tr><td nowrap valign=top><tt>07</tt>..<tt>0A</tt> </td><td align=left>power station
<table>
<tr><td nowrap valign=top><tt>08</tt> </td><td align=left>chimney</td></tr>
-<tr><td nowrap valign=top><tt>0A</tt> </td><td align=left>transformer; animation progress in m1 bits 5..2 (valid range <tt>0</tt>..<tt>7</tt>)</td></tr>
+<tr><td nowrap valign=top><tt>0A</tt> </td><td align=left>transformer; animation progress in m3(valid range <tt>0</tt>..<tt>7</tt>)</td></tr>
</table>
</td></tr>
<tr><td nowrap valign=top><tt>0B</tt>..<tt>0F</tt> </td><td align=left>sawmill</td></tr>
@@ -460,7 +460,7 @@
<tr><td nowrap valign=top><tt>1D</tt>..<tt>20</tt> </td><td align=left>oil wells
<table>
<tr><td nowrap valign=top><tt>1D</tt> </td><td align=left>not animated</td></tr>
-<tr><td nowrap valign=top><tt>1E</tt>..<tt>20</tt> </td><td align=left>various stages of animation; progress of animation in m1 bits 1..0</td></tr>
+<tr><td nowrap valign=top><tt>1E</tt>..<tt>20</tt> </td><td align=left>various stages of animation; progress of animation in m3</td></tr>
</table>
</td></tr>
<tr><td nowrap valign=top><tt>21</tt>..<tt>26</tt> </td><td align=left>farm</td></tr>
@@ -469,7 +469,7 @@
<tr><td nowrap valign=top><tt>2F</tt>..<tt>33</tt> </td><td align=left>copper ore mine
<table>
<tr><td nowrap valign=top><tt>2F</tt> </td><td align=left>wheel tower when not animated</td></tr>
-<tr><td nowrap valign=top><tt>30</tt> </td><td align=left>wheel tower when animated; animation state in m1 bits 5..0; m1 bit 6 set = sound already generated</td></tr>
+<tr><td nowrap valign=top><tt>30</tt> </td><td align=left>wheel tower when animated; animation state in m3 bits 5..0; m3 bit 6 set = sound already generated</td></tr>
<tr><td nowrap valign=top><tt>31</tt> </td><td align=left>chimney</td></tr>
</table>
</td></tr>
@@ -480,7 +480,7 @@
<tr><td nowrap valign=top><tt>48</tt>..<tt>58</tt> </td><td align=left>gold mine
<table>
<tr><td nowrap valign=top><tt>4F</tt> </td><td align=left>wheel tower when not animated</td></tr>
-<tr><td nowrap valign=top><tt>58</tt> </td><td align=left>wheel tower when animated; animation state in m1 bits 5..0; m1 bit 6 set = sound already generated</td></tr>
+<tr><td nowrap valign=top><tt>58</tt> </td><td align=left>wheel tower when animated; animation state in m3 bits 5..0; m3 bit 6 set = sound already generated</td></tr>
</table>
</td></tr>
<tr><td nowrap valign=top><tt>59</tt>..<tt>5A</tt> </td><td align=left>bank (sub-arctic or sub-tropical climate)</td></tr>
@@ -538,10 +538,10 @@
<ul>
<li>m1 bits 4..2: construction counter, for buildings under construction incremented on every periodic tile processing
</li>
-</ul></li>
<li>m1 bits 1..0: stage of construction (<tt>3</tt> = completed), incremented when the construction counter wraps around
<br>the meaning is different for some animated tiles which are never under construction (types <tt>01</tt>, <tt>1E</tt>..<tt>20</tt>, <tt>30</tt>, <tt>58</tt>; see above)
</li>
+</ul></li>
</ul>
</td></tr>
--- a/docs/landscape_grid.html Mon Jan 01 16:10:01 2007 +0000
+++ b/docs/landscape_grid.html Mon Jan 01 16:31:13 2007 +0000
@@ -170,7 +170,7 @@
<td class="bits">XXXX XXXX</td>
</tr>
<tr>
- <td rowspan=6>8</td>
+ <td rowspan=3>8</td>
<td class="caption">industry</td>
<td class="bits"><span class="abuse">X</span><span class="free">OO</span><span class="abuse">X XXXX</span></td>
<td class="bits">XXXX XXXX XXXX XXXX</td>
@@ -180,7 +180,7 @@
<td class="bits">XXXX XXXX</td>
</tr>
<tr>
- <td>bubble/sugar/toffee</td>
+ <td>bubble/sugar/toffee, gold/copper/coal, oil wells, power station</td>
<td class="bits"><span class="abuse">X</span><span class="free">OOO OOOO</span></td>
<td class="bits">-inherit-</td>
<td class="bits">XXXX XXXX</td>
@@ -198,33 +198,6 @@
<td class="bits">-inherit-</td>
</tr>
<tr>
- <td>gold/copper/coal</td>
- <td class="bits"><span class="abuse">XX</span><span class="free">OO OO</span><span class="abuse">XX</span></td>
- <td class="bits">-inherit-</td>
- <td class="bits">-inherit-</td>
- <td class="bits">-inherit-</td>
- <td class="bits">-inherit-</td>
- <td class="bits">-inherit-</td>
- </tr>
- <tr>
- <td>oil wells</td>
- <td class="bits"><span class="abuse">X</span><span class="free">OOO OO</span><span class="abuse">XX</span></td>
- <td class="bits">-inherit-</td>
- <td class="bits">-inherit-</td>
- <td class="bits">-inherit-</td>
- <td class="bits">-inherit-</td>
- <td class="bits">-inherit-</td>
- </tr>
- <tr>
- <td>power station</td>
- <td class="bits"><span class="abuse">X</span><span class="free">O</span><span class="abuse">XX XX</span><span class="free">OO</span></td>
- <td class="bits">-inherit-</td>
- <td class="bits">-inherit-</td>
- <td class="bits">-inherit-</td>
- <td class="bits">-inherit-</td>
- <td class="bits">-inherit-</td>
- </tr>
- <tr>
<td>9</td>
<td class="caption">tunnel</td>
<td class="bits">XXXX XXXX</td>
--- a/docs/openttd.6 Mon Jan 01 16:10:01 2007 +0000
+++ b/docs/openttd.6 Mon Jan 01 16:31:13 2007 +0000
@@ -1,6 +1,6 @@
.\" Hey, EMACS: -*- nroff -*-
.\" Please adjust this date whenever revising the manpage.
-.Dd December 21, 2006
+.Dd December 31, 2006
.Dt OPENTTD 6
.Sh NAME
.Nm openttd
--- a/economy.c Mon Jan 01 16:10:01 2007 +0000
+++ b/economy.c Mon Jan 01 16:31:13 2007 +0000
@@ -589,17 +589,16 @@
FOR_ALL_PLAYERS(p) {
if (p->is_active) {
- memmove(&p->old_economy, &p->cur_economy, sizeof(p->old_economy));
+ memmove(&p->old_economy[1], &p->old_economy[0], sizeof(p->old_economy) - sizeof(p->old_economy[0]));
+ p->old_economy[0] = p->cur_economy;
memset(&p->cur_economy, 0, sizeof(p->cur_economy));
- if (p->num_valid_stat_ent != 24)
- p->num_valid_stat_ent++;
+ if (p->num_valid_stat_ent != 24) p->num_valid_stat_ent++;
UpdateCompanyRatingAndValue(p, true);
PlayersCheckBankrupt(p);
- if (p->block_preview != 0)
- p->block_preview--;
+ if (p->block_preview != 0) p->block_preview--;
}
}
--- a/genworld_gui.c Mon Jan 01 16:10:01 2007 +0000
+++ b/genworld_gui.c Mon Jan 01 16:31:13 2007 +0000
@@ -176,16 +176,9 @@
}
}
-static void HeightmapScaledTooMuchCallback(bool ok_clicked)
+static void HeightmapScaledTooMuchCallback(Window *w, bool confirmed)
{
- if (ok_clicked) {
- Window *w;
- glwp_modes mode = 0;
- for (mode = 0; mode < GLWP_END; mode++) {
- w = FindWindowById(WC_GENERATE_LANDSCAPE, mode);
- if (w != NULL) StartGeneratingLandscape(mode);
- }
- }
+ if (confirmed) StartGeneratingLandscape((glwp_modes)w->window_number);
}
void GenerateLandscapeWndProc(Window *w, WindowEvent *e)
@@ -330,7 +323,11 @@
if (mode == GLWP_HEIGHTMAP && (
_heightmap_x * 2 < (1U << _patches_newgame.map_x) || _heightmap_x / 2 > (1U << _patches_newgame.map_x) ||
_heightmap_y * 2 < (1U << _patches_newgame.map_y) || _heightmap_y / 2 > (1U << _patches_newgame.map_y))) {
- ShowQuery(STR_HEIGHTMAP_SCALE_WARNING_CAPTION, STR_HEIGHTMAP_SCALE_WARNING_MESSAGE, HeightmapScaledTooMuchCallback, WC_GENERATE_LANDSCAPE, mode);
+ ShowQuery(
+ STR_HEIGHTMAP_SCALE_WARNING_CAPTION,
+ STR_HEIGHTMAP_SCALE_WARNING_MESSAGE,
+ w,
+ HeightmapScaledTooMuchCallback);
} else {
StartGeneratingLandscape(mode);
}
@@ -348,7 +345,7 @@
case 19: // Year text
WP(w, def_d).data_3 = START_DATE_QUERY;
SetDParam(0, _patches_newgame.starting_year);
- ShowQueryString(STR_CONFIG_PATCHES_INT32, STR_START_DATE_QUERY_CAPT, 8, 100, WC_GENERATE_LANDSCAPE, mode, CS_NUMERAL);
+ ShowQueryString(STR_CONFIG_PATCHES_INT32, STR_START_DATE_QUERY_CAPT, 8, 100, w, CS_NUMERAL);
break;
case 21: case 23: // Snow line buttons
/* Don't allow too fast scrolling */
@@ -363,7 +360,7 @@
case 22: // Snow line text
WP(w, def_d).data_3 = SNOW_LINE_QUERY;
SetDParam(0, _patches_newgame.snow_line_height);
- ShowQueryString(STR_CONFIG_PATCHES_INT32, STR_SNOW_LINE_QUERY_CAPT, 3, 100, WC_GENERATE_LANDSCAPE, mode, CS_NUMERAL);
+ ShowQueryString(STR_CONFIG_PATCHES_INT32, STR_SNOW_LINE_QUERY_CAPT, 3, 100, w, CS_NUMERAL);
break;
case 24: case 25: // Tree placer
ShowDropDownMenu(w, tree_placer, _patches_newgame.tree_placer, 25, 0, 0);
@@ -607,7 +604,7 @@
case 15: // Year text
WP(w, def_d).data_3 = START_DATE_QUERY;
SetDParam(0, _patches_newgame.starting_year);
- ShowQueryString(STR_CONFIG_PATCHES_INT32, STR_START_DATE_QUERY_CAPT, 8, 100, WC_GENERATE_LANDSCAPE, GLWP_SCENARIO, CS_NUMERAL);
+ ShowQueryString(STR_CONFIG_PATCHES_INT32, STR_START_DATE_QUERY_CAPT, 8, 100, w, CS_NUMERAL);
break;
case 17: case 19: // Height level buttons
/* Don't allow too fast scrolling */
@@ -622,7 +619,7 @@
case 18: // Height level text
WP(w, def_d).data_3 = FLAT_WORLD_HEIGHT_QUERY;
SetDParam(0, _patches_newgame.se_flat_world_height);
- ShowQueryString(STR_CONFIG_PATCHES_INT32, STR_FLAT_WORLD_HEIGHT_QUERY_CAPT, 3, 100, WC_GENERATE_LANDSCAPE, GLWP_SCENARIO, CS_NUMERAL);
+ ShowQueryString(STR_CONFIG_PATCHES_INT32, STR_FLAT_WORLD_HEIGHT_QUERY_CAPT, 3, 100, w, CS_NUMERAL);
break;
}
break;
@@ -722,10 +719,13 @@
static tp_info _tp;
-static void AbortGeneratingWorldCallback(bool ok_clicked)
+static void AbortGeneratingWorldCallback(Window *w, bool confirmed)
{
- if (ok_clicked) AbortGeneratingWorld();
- else if (IsGeneratingWorld() && !IsGeneratingWorldAborted()) SetMouseCursor(SPR_CURSOR_ZZZ);
+ if (confirmed) {
+ AbortGeneratingWorld();
+ } else if (IsGeneratingWorld() && !IsGeneratingWorldAborted()) {
+ SetMouseCursor(SPR_CURSOR_ZZZ);
+ }
}
static void ShowTerrainProgressProc(Window* w, WindowEvent* e)
@@ -735,7 +735,12 @@
switch (e->we.click.widget) {
case 2:
if (_cursor.sprite == SPR_CURSOR_ZZZ) SetMouseCursor(SPR_CURSOR_MOUSE);
- ShowQuery(STR_GENERATION_ABORT_CAPTION, STR_GENERATION_ABORT_MESSAGE, AbortGeneratingWorldCallback, WC_GENERATE_PROGRESS_WINDOW, 0);
+ ShowQuery(
+ STR_GENERATION_ABORT_CAPTION,
+ STR_GENERATION_ABORT_MESSAGE,
+ w,
+ AbortGeneratingWorldCallback
+ );
break;
}
break;
--- a/gui.h Mon Jan 01 16:10:01 2007 +0000
+++ b/gui.h Mon Jan 01 16:31:13 2007 +0000
@@ -126,11 +126,12 @@
void ShowBuildBridgeWindow(uint start, uint end, byte type);
void ShowBuildIndustryWindow(void);
-void ShowQueryString(StringID str, StringID caption, uint maxlen, uint maxwidth, WindowClass window_class, WindowNumber window_number, CharSetFilter afilter);
-void ShowQuery(StringID caption, StringID message, void (*ok_cancel_callback)(bool ok_clicked), WindowClass window_class, WindowNumber window_number);
+void ShowQueryString(StringID str, StringID caption, uint maxlen, uint maxwidth, Window *parent, CharSetFilter afilter);
+void ShowQuery(StringID caption, StringID message, Window *w, void (*callback)(Window*, bool));
void ShowMusicWindow(void);
/* main_gui.c */
+void HandleOnEditText(const char *str);
VARDEF byte _station_show_coverage;
VARDEF PlaceProc *_place_proc;
--- a/industry_cmd.c Mon Jan 01 16:10:01 2007 +0000
+++ b/industry_cmd.c Mon Jan 01 16:31:13 2007 +0000
@@ -123,7 +123,7 @@
if (!IsIndustryCompleted(ti->tile)) return;
- d = &_draw_industry_spec1[_m[ti->tile].m3];
+ d = &_draw_industry_spec1[GetIndustryAnimationState(ti->tile)];
AddChildSpriteScreen(SPR_IT_SUGAR_MINE_SIEVE + d->image_1, d->x, 0);
@@ -142,7 +142,7 @@
int x = 0;
if (IsIndustryCompleted(ti->tile)) {
- x = _industry_anim_offs[_m[ti->tile].m3];
+ x = _industry_anim_offs[GetIndustryAnimationState(ti->tile)];
if ( (byte)x == 0xFF)
x = 0;
}
@@ -154,7 +154,7 @@
static void IndustryDrawBubbleGenerator( const TileInfo *ti)
{
if (IsIndustryCompleted(ti->tile)) {
- AddChildSpriteScreen(SPR_IT_BUBBLE_GENERATOR_BUBBLE, 5, _industry_anim_offs_2[_m[ti->tile].m3]);
+ AddChildSpriteScreen(SPR_IT_BUBBLE_GENERATOR_BUBBLE, 5, _industry_anim_offs_2[GetIndustryAnimationState(ti->tile)]);
} else {
AddChildSpriteScreen(SPR_IT_BUBBLE_GENERATOR_SPRING, 3, 67);
}
@@ -164,7 +164,7 @@
{
const DrawIndustrySpec4Struct *d;
- d = &_industry_anim_offs_3[_m[ti->tile].m3];
+ d = &_industry_anim_offs_3[GetIndustryAnimationState(ti->tile)];
if (d->image_1 != 0xFF) {
AddChildSpriteScreen(SPR_IT_TOY_FACTORY_CLAY, 50 - d->image_1 * 2, 96 + d->image_1);
@@ -181,7 +181,7 @@
static void IndustryDrawCoalPlantSparks(const TileInfo *ti)
{
if (IsIndustryCompleted(ti->tile)) {
- uint image = GB(_m[ti->tile].m1, 2, 5);
+ uint image = GetIndustryAnimationState(ti->tile);
if (image != 0 && image < 7) {
AddChildSpriteScreen(image + SPR_IT_POWER_PLANT_TRANSFORMERS,
@@ -203,6 +203,7 @@
static void DrawTile_Industry(TileInfo *ti)
{
+ const IndustryGfx gfx = GetIndustryGfx(ti->tile);
const Industry *ind;
const DrawBuildingsTileStruct *dits;
byte z;
@@ -213,7 +214,9 @@
ormod = GENERAL_SPRITE_COLOR(ind->random_color);
/* Retrieve pointer to the draw industry tile struct */
- dits = &_industry_draw_tile_data[GetIndustryGfx(ti->tile) << 2 | GetIndustryConstructionStage(ti->tile)];
+ dits = &_industry_draw_tile_data[gfx << 2 | (_industry_section_draw_animation_state[gfx] ?
+ GetIndustryAnimationState(ti->tile) & 3 :
+ GetIndustryConstructionStage(ti->tile))];
image = dits->ground;
if (image & PALETTE_MODIFIER_COLOR && (image & PALETTE_SPRITE_MASK) == 0)
@@ -362,7 +365,7 @@
switch (GetIndustryGfx(tile)) {
case GFX_SUGAR_MINE_SIEVE:
if ((_tick_counter & 1) == 0) {
- m = _m[tile].m3 + 1;
+ m = GetIndustryAnimationState(tile) + 1;
switch (m & 7) {
case 2: SndPlayTileFx(SND_2D_RIP_2, tile); break;
@@ -373,7 +376,7 @@
m = 0;
DeleteAnimatedTile(tile);
}
- _m[tile].m3 = m;
+ SetIndustryAnimationState(tile, m);
MarkTileDirtyByTile(tile);
}
@@ -381,7 +384,7 @@
case GFX_TOFFEE_QUARY:
if ((_tick_counter & 3) == 0) {
- m = _m[tile].m3;
+ m = GetIndustryAnimationState(tile);
if (_industry_anim_offs[m] == 0xFF) {
SndPlayTileFx(SND_30_CARTOON_SOUND, tile);
@@ -391,21 +394,21 @@
m = 0;
DeleteAnimatedTile(tile);
}
- _m[tile].m3 = m;
+ SetIndustryAnimationState(tile, m);
MarkTileDirtyByTile(tile);
}
break;
case GFX_BUBBLE_CATCHER:
- if ((_tick_counter&1) == 0) {
- m = _m[tile].m3;
+ if ((_tick_counter & 1) == 0) {
+ m = GetIndustryAnimationState(tile);
if (++m >= 40) {
m = 0;
DeleteAnimatedTile(tile);
}
- _m[tile].m3 = m;
+ SetIndustryAnimationState(tile, m);
MarkTileDirtyByTile(tile);
}
@@ -414,12 +417,12 @@
// Sparks on a coal plant
case GFX_POWERPLANT_SPARKS:
if ((_tick_counter & 3) == 0) {
- m = _m[tile].m1;
- if (GB(m, 2, 5) == 6) {
- SB(_m[tile].m1, 2, 5, 0);
+ m = GetIndustryAnimationState(tile);
+ if (m == 6) {
+ SetIndustryAnimationState(tile, 0);
DeleteAnimatedTile(tile);
} else {
- _m[tile].m1 = m + (1<<2);
+ SetIndustryAnimationState(tile, m + 1);
MarkTileDirtyByTile(tile);
}
}
@@ -427,7 +430,7 @@
case GFX_TOY_FACTORY:
if ((_tick_counter & 1) == 0) {
- m = _m[tile].m3 + 1;
+ m = GetIndustryAnimationState(tile) + 1;
if (m == 1) {
SndPlayTileFx(SND_2C_MACHINERY, tile);
@@ -446,13 +449,15 @@
}
SetIndustryAnimationLoop(tile, n);
}
- _m[tile].m3 = m;
+ SetIndustryAnimationState(tile, m);
MarkTileDirtyByTile(tile);
}
break;
- case 148: case 149: case 150: case 151:
- case 152: case 153: case 154: case 155:
+ case GFX_PLASTIC_FOUNTAIN_ANIMATED_1: case GFX_PLASTIC_FOUNTAIN_ANIMATED_2:
+ case GFX_PLASTIC_FOUNTAIN_ANIMATED_3: case GFX_PLASTIC_FOUNTAIN_ANIMATED_4:
+ case GFX_PLASTIC_FOUNTAIN_ANIMATED_5: case GFX_PLASTIC_FOUNTAIN_ANIMATED_6:
+ case GFX_PLASTIC_FOUNTAIN_ANIMATED_7: case GFX_PLASTIC_FOUNTAIN_ANIMATED_8:
if ((_tick_counter & 3) == 0) {
IndustryGfx gfx = GetIndustryGfx(tile);
@@ -469,13 +474,13 @@
bool b = CHANCE16(1,7);
IndustryGfx gfx = GetIndustryGfx(tile);
- m = GB(_m[tile].m1, 0, 2) + 1;
+ m = GetIndustryAnimationState(tile) + 1;
if (m == 4 && (m = 0, ++gfx) == GFX_OILWELL_ANIMATED_3 + 1 && (gfx = GFX_OILWELL_ANIMATED_1, b)) {
- _m[tile].m1 = 0x83;
SetIndustryGfx(tile, GFX_OILWELL_NOT_ANIMATED);
+ SetIndustryConstructionStage(tile, 3);
DeleteAnimatedTile(tile);
} else {
- SB(_m[tile].m1, 0, 2, m);
+ SetIndustryAnimationState(tile, m);
SetIndustryGfx(tile, gfx);
MarkTileDirtyByTile(tile);
}
@@ -492,8 +497,9 @@
if (state < 0x1A0) {
if (state < 0x20 || state >= 0x180) {
- if (!(_m[tile].m1 & 0x40)) {
- _m[tile].m1 |= 0x40;
+ m = GetIndustryAnimationState(tile);
+ if (!(m & 0x40)) {
+ SetIndustryAnimationState(tile, m | 0x40);
SndPlayTileFx(SND_0B_MINING_MACHINERY, tile);
}
if (state & 7)
@@ -502,9 +508,9 @@
if (state & 3)
return;
}
- m = (_m[tile].m1 + 1) | 0x40;
+ m = (GetIndustryAnimationState(tile) + 1) | 0x40;
if (m > 0xC2) m = 0xC0;
- _m[tile].m1 = m;
+ SetIndustryAnimationState(tile, m);
MarkTileDirtyByTile(tile);
} else if (state >= 0x200 && state < 0x3A0) {
int i;
@@ -512,9 +518,9 @@
if (state & i)
return;
- m = (_m[tile].m1 & 0xBF) - 1;
+ m = (GetIndustryAnimationState(tile) & 0xBF) - 1;
if (m < 0x80) m = 0x82;
- _m[tile].m1 = m;
+ SetIndustryAnimationState(tile, m);
MarkTileDirtyByTile(tile);
}
} break;
@@ -563,18 +569,14 @@
case GFX_TOY_FACTORY:
case GFX_BUBBLE_CATCHER:
case GFX_TOFFEE_QUARY:
- _m[tile].m3 = 0;
+ SetIndustryAnimationState(tile, 0);
SetIndustryAnimationLoop(tile, 0);
break;
- case GFX_PLASTIC_FOUNTAIN_ANIMATED_1:
- case GFX_PLASTIC_FOUNTAIN_ANIMATED_2:
- case GFX_PLASTIC_FOUNTAIN_ANIMATED_3:
- case GFX_PLASTIC_FOUNTAIN_ANIMATED_4:
- case GFX_PLASTIC_FOUNTAIN_ANIMATED_5:
- case GFX_PLASTIC_FOUNTAIN_ANIMATED_6:
- case GFX_PLASTIC_FOUNTAIN_ANIMATED_7:
- case GFX_PLASTIC_FOUNTAIN_ANIMATED_8:
+ case GFX_PLASTIC_FOUNTAIN_ANIMATED_1: case GFX_PLASTIC_FOUNTAIN_ANIMATED_2:
+ case GFX_PLASTIC_FOUNTAIN_ANIMATED_3: case GFX_PLASTIC_FOUNTAIN_ANIMATED_4:
+ case GFX_PLASTIC_FOUNTAIN_ANIMATED_5: case GFX_PLASTIC_FOUNTAIN_ANIMATED_6:
+ case GFX_PLASTIC_FOUNTAIN_ANIMATED_7: case GFX_PLASTIC_FOUNTAIN_ANIMATED_8:
AddAnimatedTile(tile);
break;
}
@@ -608,6 +610,7 @@
static void TileLoop_Industry(TileIndex tile)
{
IndustryGfx newgfx;
+ IndustryGfx gfx;
if (!IsIndustryCompleted(tile)) {
MakeIndustryTileBigger(tile);
@@ -626,10 +629,9 @@
return;
}
-#define SET_AND_ANIMATE(tile, a, b) { SetIndustryGfx(tile, a); _m[tile].m1 = b; AddAnimatedTile(tile); }
-#define SET_AND_UNANIMATE(tile, a, b) { SetIndustryGfx(tile, a); _m[tile].m1 = b; DeleteAnimatedTile(tile); }
+ gfx = GetIndustryGfx(tile);
- switch (GetIndustryGfx(tile)) {
+ switch (gfx) {
case GFX_OILRIG_1: // coast line at oilrigs
case GFX_OILRIG_2:
case GFX_OILRIG_3:
@@ -639,38 +641,42 @@
break;
case GFX_COAL_MINE_TOWER_NOT_ANIMATED:
- if (!(_tick_counter & 0x400) && CHANCE16(1,2))
- SET_AND_ANIMATE(tile, GFX_COAL_MINE_TOWER_ANIMATED, 0x80);
- break;
-
case GFX_COPPER_MINE_TOWER_NOT_ANIMATED:
- if (!(_tick_counter & 0x400) && CHANCE16(1,2))
- SET_AND_ANIMATE(tile, GFX_COPPER_MINE_TOWER_ANIMATED, 0x80);
- break;
-
case GFX_GOLD_MINE_TOWER_NOT_ANIMATED:
- if (!(_tick_counter & 0x400) && CHANCE16(1,2))
- SET_AND_ANIMATE(tile, GFX_GOLD_MINE_TOWER_ANIMATED, 0x80);
+ if (!(_tick_counter & 0x400) && CHANCE16(1, 2)) {
+ switch (gfx) {
+ case GFX_COAL_MINE_TOWER_NOT_ANIMATED: gfx = GFX_COAL_MINE_TOWER_ANIMATED; break;
+ case GFX_COPPER_MINE_TOWER_NOT_ANIMATED: gfx = GFX_COPPER_MINE_TOWER_ANIMATED; break;
+ case GFX_GOLD_MINE_TOWER_NOT_ANIMATED: gfx = GFX_GOLD_MINE_TOWER_ANIMATED; break;
+ }
+ SetIndustryGfx(tile, gfx);
+ SetIndustryAnimationState(tile, 0x80);
+ AddAnimatedTile(tile);
+ }
break;
case GFX_OILWELL_NOT_ANIMATED:
- if (CHANCE16(1,6))
- SET_AND_ANIMATE(tile, GFX_OILWELL_ANIMATED_1, 0x80);
+ if (CHANCE16(1, 6)) {
+ SetIndustryGfx(tile, GFX_OILWELL_ANIMATED_1);
+ SetIndustryAnimationState(tile, 0);
+ AddAnimatedTile(tile);
+ }
break;
case GFX_COAL_MINE_TOWER_ANIMATED:
- if (!(_tick_counter & 0x400))
- SET_AND_UNANIMATE(tile, GFX_COAL_MINE_TOWER_NOT_ANIMATED, 0x83);
- break;
-
case GFX_COPPER_MINE_TOWER_ANIMATED:
- if (!(_tick_counter & 0x400))
- SET_AND_UNANIMATE(tile, GFX_COPPER_MINE_TOWER_NOT_ANIMATED, 0x83);
- break;
-
case GFX_GOLD_MINE_TOWER_ANIMATED:
- if (!(_tick_counter & 0x400))
- SET_AND_UNANIMATE(tile, GFX_GOLD_MINE_TOWER_NOT_ANIMATED, 0x83);
+ if (!(_tick_counter & 0x400)) {
+ switch (gfx) {
+ case GFX_COAL_MINE_TOWER_ANIMATED: gfx = GFX_COAL_MINE_TOWER_NOT_ANIMATED; break;
+ case GFX_COPPER_MINE_TOWER_ANIMATED: gfx = GFX_COPPER_MINE_TOWER_NOT_ANIMATED; break;
+ case GFX_GOLD_MINE_TOWER_ANIMATED: gfx = GFX_GOLD_MINE_TOWER_NOT_ANIMATED; break;
+ }
+ SetIndustryGfx(tile, gfx);
+ SetIndustryCompleted(tile, true);
+ SetIndustryConstructionStage(tile, 3);
+ DeleteAnimatedTile(tile);
+ }
break;
case GFX_POWERPLANT_SPARKS:
@@ -1107,31 +1113,6 @@
return t;
}
-static const byte _industry_section_bits[] = {
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 4, 2, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 4, 2, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 16,
-};
-
static bool CheckIfIndustryTilesAreFree(TileIndex tile, const IndustryTileTable *it, int type)
{
_error_message = STR_0239_SITE_UNSUITABLE;
@@ -1435,7 +1416,10 @@
DoCommand(cur_tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR);
MakeIndustry(cur_tile, i->index, it->gfx);
- if (_generating_world) _m[cur_tile].m1 = 0x1E; /* maturity */
+ if (_generating_world) {
+ SetIndustryConstructionCounter(cur_tile, 3);
+ SetIndustryConstructionStage(cur_tile, 2);
+ }
}
} while ((++it)->ti.x != -0x80);
--- a/industry_gui.c Mon Jan 01 16:10:01 2007 +0000
+++ b/industry_gui.c Mon Jan 01 16:31:13 2007 +0000
@@ -380,10 +380,7 @@
// clicked the text
WP(w,vp2_d).data_1 = line;
SetDParam(0, i->production_rate[line] * 8);
- ShowQueryString(STR_CONFIG_PATCHES_INT32,
- STR_CONFIG_GAME_PRODUCTION,
- 10, 100, w->window_class,
- w->window_number, CS_ALPHANUMERAL);
+ ShowQueryString(STR_CONFIG_PATCHES_INT32, STR_CONFIG_GAME_PRODUCTION, 10, 100, w, CS_ALPHANUMERAL);
}
}
} break;
--- a/industry_map.h Mon Jan 01 16:10:01 2007 +0000
+++ b/industry_map.h Mon Jan 01 16:31:13 2007 +0000
@@ -48,6 +48,7 @@
GFX_BUBBLE_CATCHER = 162,
GFX_TOFFEE_QUARY = 165,
GFX_SUGAR_MINE_SIEVE = 174,
+ NUM_INDUSTRY_GFXES = 175,
};
static inline IndustryID GetIndustryIndex(TileIndex t)
@@ -212,7 +213,7 @@
/**
* Get the animation loop number
* @param tile the tile to get the animation loop number of
- * @pre IsTileType(tile, MP_INDUSTRY
+ * @pre IsTileType(tile, MP_INDUSTRY)
*/
static inline byte GetIndustryAnimationLoop(TileIndex tile)
{
@@ -224,7 +225,7 @@
* Set the animation loop number
* @param tile the tile to set the animation loop number of
* @param count the new animation frame number
- * @pre IsTileType(tile, MP_INDUSTRY
+ * @pre IsTileType(tile, MP_INDUSTRY)
*/
static inline void SetIndustryAnimationLoop(TileIndex tile, byte count)
{
@@ -232,4 +233,27 @@
_m[tile].m4 = count;
}
+/**
+ * Get the animation state
+ * @param tile the tile to get the animation state of
+ * @pre IsTileType(tile, MP_INDUSTRY)
+ */
+static inline byte GetIndustryAnimationState(TileIndex tile)
+{
+ assert(IsTileType(tile, MP_INDUSTRY));
+ return _m[tile].m3;
+}
+
+/**
+ * Set the animation state
+ * @param tile the tile to set the animation state of
+ * @param count the new animation state
+ * @pre IsTileType(tile, MP_INDUSTRY)
+ */
+static inline void SetIndustryAnimationState(TileIndex tile, byte state)
+{
+ assert(IsTileType(tile, MP_INDUSTRY));
+ _m[tile].m3 = state;
+}
+
#endif /* INDUSTRY_MAP_H */
--- a/intro_gui.c Mon Jan 01 16:10:01 2007 +0000
+++ b/intro_gui.c Mon Jan 01 16:31:13 2007 +0000
@@ -41,8 +41,6 @@
{ WIDGETS_END},
};
-extern void HandleOnEditText(WindowEvent *e);
-
static inline void SetNewLandscapeType(byte landscape)
{
_opt_newgame.landscape = landscape;
@@ -88,8 +86,6 @@
case 16: HandleExitGameRequest(); break;
}
break;
-
- case WE_ON_EDIT_TEXT: HandleOnEditText(e); break;
}
}
@@ -106,20 +102,13 @@
AllocateWindowDesc(&_select_game_desc);
}
-static const Widget _ask_abandon_game_widgets[] = {
-{ WWT_CLOSEBOX, RESIZE_NONE, 4, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
-{ WWT_CAPTION, RESIZE_NONE, 4, 11, 179, 0, 13, STR_00C7_QUIT, STR_NULL},
-{ WWT_PANEL, RESIZE_NONE, 4, 0, 179, 14, 91, 0x0, STR_NULL},
-{ WWT_TEXTBTN, RESIZE_NONE, 12, 25, 84, 72, 83, STR_00C9_NO, STR_NULL},
-{ WWT_TEXTBTN, RESIZE_NONE, 12, 95, 154, 72, 83, STR_00C8_YES, STR_NULL},
-{ WIDGETS_END },
-};
+static void AskExitGameCallback(Window *w, bool confirmed)
+{
+ if (confirmed) _exit_game = true;
+}
-static void AskAbandonGameWndProc(Window *w, WindowEvent *e)
+void AskExitGame(void)
{
- switch (e->event) {
- case WE_PAINT:
- DrawWindowWidgets(w);
#if defined(_WIN32)
SetDParam(0, STR_0133_WINDOWS);
#elif defined(__APPLE__)
@@ -135,86 +124,26 @@
#else
SetDParam(0, STR_0134_UNIX);
#endif
- DrawStringMultiCenter(90, 38, STR_00CA_ARE_YOU_SURE_YOU_WANT_TO, 178);
- return;
-
- case WE_CLICK:
- switch (e->we.click.widget) {
- case 3: DeleteWindow(w); break;
- case 4: _exit_game = true; break;
- }
- break;
-
- case WE_KEYPRESS: /* Exit game on pressing 'Enter' */
- switch (e->we.keypress.keycode) {
- case WKC_RETURN:
- case WKC_NUM_ENTER:
- _exit_game = true;
- break;
- }
- break;
- }
-}
-
-static const WindowDesc _ask_abandon_game_desc = {
- WDP_CENTER, WDP_CENTER, 180, 92,
- WC_ASK_ABANDON_GAME,0,
- WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_STD_BTN | WDF_UNCLICK_BUTTONS,
- _ask_abandon_game_widgets,
- AskAbandonGameWndProc
-};
-
-void AskExitGame(void)
-{
- AllocateWindowDescFront(&_ask_abandon_game_desc, 0);
+ ShowQuery(
+ STR_00C7_QUIT,
+ STR_00CA_ARE_YOU_SURE_YOU_WANT_TO,
+ NULL,
+ AskExitGameCallback
+ );
}
-static const Widget _ask_quit_game_widgets[] = {
-{ WWT_CLOSEBOX, RESIZE_NONE, 4, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
-{ WWT_CAPTION, RESIZE_NONE, 4, 11, 179, 0, 13, STR_0161_QUIT_GAME, STR_NULL},
-{ WWT_PANEL, RESIZE_NONE, 4, 0, 179, 14, 91, 0x0, STR_NULL},
-{ WWT_TEXTBTN, RESIZE_NONE, 12, 25, 84, 72, 83, STR_00C9_NO, STR_NULL},
-{ WWT_TEXTBTN, RESIZE_NONE, 12, 95, 154, 72, 83, STR_00C8_YES, STR_NULL},
-{ WIDGETS_END },
-};
-
-static void AskQuitGameWndProc(Window *w, WindowEvent *e)
+static void AskExitToGameMenuCallback(Window *w, bool confirmed)
{
- switch (e->event) {
- case WE_PAINT:
- DrawWindowWidgets(w);
- DrawStringMultiCenter(
- 90, 38,
- _game_mode != GM_EDITOR ?
- STR_0160_ARE_YOU_SURE_YOU_WANT_TO : STR_029B_ARE_YOU_SURE_YOU_WANT_TO,
- 178
- );
- break;
-
- case WE_CLICK:
- switch (e->we.click.widget) {
- case 3: DeleteWindow(w); break;
- case 4: _switch_mode = SM_MENU; break;
- }
- break;
-
- case WE_KEYPRESS: /* Return to main menu on pressing 'Enter' */
- if (e->we.keypress.keycode == WKC_RETURN) _switch_mode = SM_MENU;
- break;
- }
+ if (confirmed) _switch_mode = SM_MENU;
}
-static const WindowDesc _ask_quit_game_desc = {
- WDP_CENTER, WDP_CENTER, 180, 92,
- WC_QUIT_GAME,0,
- WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_STD_BTN | WDF_UNCLICK_BUTTONS,
- _ask_quit_game_widgets,
- AskQuitGameWndProc
-};
-
-
void AskExitToGameMenu(void)
{
- AllocateWindowDescFront(&_ask_quit_game_desc, 0);
+ ShowQuery(
+ STR_0161_QUIT_GAME,
+ (_game_mode != GM_EDITOR) ? STR_ABANDON_GAME_QUERY : STR_QUIT_SCENARIO_QUERY,
+ NULL,
+ AskExitToGameMenuCallback
+ );
}
--- a/known-bugs.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/known-bugs.txt Mon Jan 01 16:31:13 2007 +0000
@@ -19,23 +19,25 @@
------------------------------------------------------------------------
URL: http://bugs.openttd.org
--456 'Fullload' switches between 'stop'/'service' at depot
--455 Converting to monorail behaves badly
--454 Problem with goods transfer income
+-489 [0.5.0rc1] Sound choppy on Vista
+-488 Can't build trains after year 2000
+-483 !invalid string id 0 in GetString when trying to host a game after upgrade to 0.5.0-RC1 - workaround
+-474 Overtaking car doesn't hit the against-riding car.
+-465 Crash in Linux (Debian)
+-460 vehicles not avaible - unable to build
+-459 Merging is buggy
+-458 Crash when changing Resolution on Mac OS X (x86)
-450 GUI selecting disabled numbers (newstations)
-445 unable to open previously saved game in r7425
-444 Compile issues (networking) on Sun and SGI platforms
-442 Alt-tab behaviour flawed whilst full screen (win32)
--441 Low Transparent stuff
+-441 Transparent stuff
-435 Assertion window doesn't show when in fullscreen on Mac OS X
-432 Assertion failed: AircraftController in aircraft_cmd.c (line 771)
--431 failure to autorenew (core/GUI desync)
-423 Improved loading causes high CPU use with long trains
--415 Multiplayer Desync Error... (More)
-410 Openttd in dedicated mode don't run without data files
-404 Cargo never delivered to station after bribe and before first pickup
-391 Smth stange with train depots
--390 Multiplayer Desync Error...
-379 Integer overflow with huge cities
-365 Blimp Stuck at airport
-362 Changing signal type affects whole square
@@ -69,6 +71,7 @@
------------------------------------------------------------------------
URL: http://sourceforge.net/tracker/?atid=636365&group_id=103924&func=browse
+-1623073 0.5.0 RC1 gotten money to build bridge
-1616411 Game very slow when Xorg color depth is different than 8bpp
-1573339 0.4.8.dmg Crash with intel 64bit
-1460218 0.4.7 normal industry bug (non_smooth)
@@ -86,7 +89,6 @@
-1197116 Some stations are cargo-less
-1116638 "More, but smaller changes" deficiency
-1106356 re-offered prototypes
--1085486 Subsidies: Only count when station is in right suburb
Minor Bugs for 0.5.0
------------------------------------------------------------------------
@@ -97,7 +99,6 @@
-1412031 fast forward scrolling is also fast forward :)
-1387424 overtake insolvent company is to cheap
-1382782 Loan interest calculated 'wrong'
--1236320 Bug in main menu allows moving screen
-1201284 permanent hilight in a depot
-1185852 Scrollbars get arbitrarily small
-1184634 Replace vehicles window bug
--- a/lang/american.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/american.txt Mon Jan 01 16:31:13 2007 +0000
@@ -359,7 +359,7 @@
STR_015D_LOAD_GAME :Load game
STR_015E_QUIT_GAME :Quit game
STR_015F_QUIT :Quit
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Are you sure you want to quit this game ?
+STR_ABANDON_GAME_QUERY :{YELLOW}Are you sure you want to quit this game ?
STR_0161_QUIT_GAME :{WHITE}Quit Game
STR_SORT_ORDER_TIP :{BLACK}Select sorting order (descending/ascending)
STR_SORT_CRITERIA_TIP :{BLACK}Select sorting criteria
@@ -738,7 +738,7 @@
STR_029A_PLAY_SCENARIO :{BLACK}Play Scenario
STR_PLAY_HEIGHTMAP :{BLACK}Play Heightmap
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Start a new game, using a heightmap as landscape
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Are you sure you want to quit this scenario ?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Are you sure you want to quit this scenario ?
STR_029C_QUIT_EDITOR :{WHITE}Quit Editor
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...can only be built in towns with a population of at least 1200
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Move the starting date backward 1 year
@@ -2604,6 +2604,7 @@
STR_885C_BROKEN_DOWN :{RED}Broken down
STR_885D_AGE_RUNNING_COST_YR :{BLACK}Age: {LTBLUE}{STRING}{BLACK} Running Cost: {LTBLUE}{CURRENCY}/yr
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Weight: {LTBLUE}{WEIGHT_S} {BLACK}Power: {LTBLUE}{POWER}{BLACK} Max. speed: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Weight: {LTBLUE}{WEIGHT_S} {BLACK}Power: {LTBLUE}{POWER}{BLACK} Max. speed: {LTBLUE}{VELOCITY} {BLACK}Max. T.E.: {LTBLUE}{FORCE}
STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Profit this year: {LTBLUE}{CURRENCY} (last year: {CURRENCY})
STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}Reliability: {LTBLUE}{COMMA}% {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
STR_8861_STOPPED :{RED}Stopped
@@ -2945,20 +2946,7 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Show all vehicles which have the same schedule
### depot strings
-
-STR_SELL :{BLACK}Sell
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}You are about to sell all vehicles in the depot.
-STR_ARE_YOU_SURE :{BLACK}Are you sure?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Confirm that you want to sell all trains in the depot
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Confirm that you want to sell all road vehicles in the depot
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Confirm that you want to sell all ships in the depot
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Confirm that you want to sell all aircraft in the hangar
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}Do not sell all trains in the depot
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}Do not sell all road vehicles in the depot
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}Do not sell all ships in the depot
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Do not sell all aircraft in the hangar
+STR_DEPOT_SELL_CONFIRMATION_TEXT :{YELLOW}You are about to sell all the vehicles in the depot. Are you sure?
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Sell all trains in the depot
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Sell all road vehicles in the depot
@@ -3045,6 +3033,7 @@
STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Refittable to: {GOLD}
STR_PURCHASE_INFO_ALL_TYPES :All cargo types
STR_PURCHASE_INFO_ALL_BUT :All but {GOLD}
+STR_PURCHASE_INFO_MAX_TE :{BLACK}Max. Tractive Effort: {GOLD}{FORCE}
########### String for New Landscape Generator
--- a/lang/brazilian_portuguese.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/brazilian_portuguese.txt Mon Jan 01 16:31:13 2007 +0000
@@ -358,7 +358,7 @@
STR_015D_LOAD_GAME :Abrir jogo
STR_015E_QUIT_GAME :Abandonar jogo
STR_015F_QUIT :Sair
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Tem certeza que deseja abandonar este jogo?
+STR_ABANDON_GAME_QUERY :{YELLOW}Tem certeza que deseja abandonar este jogo?
STR_0161_QUIT_GAME :{WHITE}Abandonar jogo
STR_SORT_ORDER_TIP :{BLACK}Selecione forma de classificação (descendente/ascendente)
STR_SORT_CRITERIA_TIP :{BLACK}Selecione um critério de classificação
@@ -737,7 +737,7 @@
STR_029A_PLAY_SCENARIO :{BLACK}Jogar Cenário
STR_PLAY_HEIGHTMAP :{BLACK}Jogar num mapa de altitudes
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Inica um novo jogo, a partir de um mapa de altitude
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Tem a certeza que deseja abandonar este cenário?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Tem a certeza que deseja abandonar este cenário?
STR_029C_QUIT_EDITOR :{WHITE}Sair do Editor
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...só pode ser construído em cidades com pelo menos 1200 habitantes
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Retroceder data de inicio 1 ano
@@ -2942,21 +2942,6 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Mostra todos os veículos com a mesma rota
### depot strings
-
-STR_SELL :{BLACK}Vender
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}Você estará vendendo todos os veículos do depósito
-STR_ARE_YOU_SURE :{BLACK}Tem certeza?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Confirma a venda de todos os trens
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Confirma a venda de todos os veículos
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Confirma a venda de todos os navios
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Confirma a venda de todas as aeronaves
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}Cancela a venda de todos os trens
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}Cancela a venda de todos os veículos
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}Cancela a venda de todos os navios
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Cencela a venda das aeronaves
-
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Vender todos os trens no depósito
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Vender todos os veículos no depósito
STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP :{BLACK}Vender todos os navios no depósito
--- a/lang/bulgarian.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/bulgarian.txt Mon Jan 01 16:31:13 2007 +0000
@@ -356,7 +356,7 @@
STR_015D_LOAD_GAME :Отвори игра
STR_015E_QUIT_GAME :Преустанови играта
STR_015F_QUIT :Изход
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Желаете ли да преустановите играта?
+STR_ABANDON_GAME_QUERY :{YELLOW}Желаете ли да преустановите играта?
STR_0161_QUIT_GAME :{WHITE}Преустанови играта
STR_SORT_ORDER_TIP :{BLACK}Избери вида на сортирането (намаляващо/нарастващо)
STR_SORT_CRITERIA_TIP :{BLACK}Избери критерий за сортиране
@@ -727,7 +727,7 @@
STR_029A_PLAY_SCENARIO :{BLACK}Играене на сценарий
STR_PLAY_HEIGHTMAP :{BLACK}Игра височинна карта
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Нова игра, използвайки височинна карта като терен
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Наистина ли желаете изход от сценария?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Наистина ли желаете изход от сценария?
STR_029C_QUIT_EDITOR :{WHITE}Затваряне на редактора
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...може да бъде построен само в градове с население повече от 1200
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Премести назад началната дата с 1 година
@@ -2901,21 +2901,6 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Показване на всички превозни средства които споделят разписанието
### depot strings
-
-STR_SELL :{BLACK}Продаване
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}Ще продадете всичко в депото.
-STR_ARE_YOU_SURE :{BLACK}Сигурен ли си?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Потвърдете продажбата всички влакове в депото
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Потвърдете продажбата всички автомобили в гаража
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Потвърдете продажбата всички кораби в депото
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Потвърдете продажбата на всички самолети в хангара
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}Отказ продажбата всички влакове в депото
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}Отказ продажбата всички автомобили в гаража
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}Отказ продажбата всички кораби в депото
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Отказ продажбата всички самолети в хангара
-
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Продажба всички влакове в депото
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Продажба всички автомобили в гаража
STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP :{BLACK}Продажба всички кораби в депото
--- a/lang/catalan.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/catalan.txt Mon Jan 01 16:31:13 2007 +0000
@@ -359,7 +359,7 @@
STR_015D_LOAD_GAME :Carrega el joc
STR_015E_QUIT_GAME :Abandona el joc
STR_015F_QUIT :Sortir
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Estàs segur que vols abandonar aquest joc?
+STR_ABANDON_GAME_QUERY :{YELLOW}Estàs segur que vols abandonar aquest joc?
STR_0161_QUIT_GAME :{WHITE}Abandona el Joc
STR_SORT_ORDER_TIP :{BLACK}Selecciona ordre de classificació (descendent/ascendent)
STR_SORT_CRITERIA_TIP :{BLACK}Selecciona criteri de classificació
@@ -738,7 +738,7 @@
STR_029A_PLAY_SCENARIO :{BLACK}Juga un Escenari
STR_PLAY_HEIGHTMAP :{BLACK}Juga un mapa d'alçades
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Comença un nou joc, utilitzant un mapa d'alçades com a terreny
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Estàs segur que vols sortir d'aquest escenari ?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Estàs segur que vols sortir d'aquest escenari ?
STR_029C_QUIT_EDITOR :{WHITE}Sortir de l'Editor
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...només es pot construir en poblacions de més de 1200 hab.
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Retarda la data d'inici 1 any
@@ -2604,6 +2604,7 @@
STR_885C_BROKEN_DOWN :{RED}Avariat
STR_885D_AGE_RUNNING_COST_YR :{BLACK}Edat: {LTBLUE}{STRING}{BLACK} Cost de Circulació: {LTBLUE}{CURRENCY}/any
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Pes: {LTBLUE}{WEIGHT_S} {BLACK}Potència: {LTBLUE}{POWER}{BLACK} Vel. Max.: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Pes: {LTBLUE}{WEIGHT_S} {BLACK}Potència: {LTBLUE}{POWER}{BLACK} Velocitat Max.: {LTBLUE}{VELOCITY} {BLACK}Max. T.E.: {LTBLUE}{FORCE}
STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Benefici enguany: {LTBLUE}{CURRENCY} (darrer any: {CURRENCY})
STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}Rendibilitat: {LTBLUE}{COMMA}% {BLACK}Avaries des de l'últim manteniment: {LTBLUE}{COMMA}
STR_8861_STOPPED :{RED}Parat
@@ -2945,20 +2946,7 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Mostra tots els vehicles que tenen les mateixes ordres
### depot strings
-
-STR_SELL :{BLACK}Vendre
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}Estàs a punt de vendre tots els vehicles de la cotxera
-STR_ARE_YOU_SURE :{BLACK}N'estàs segur?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Confirma que vols vendre tots els trens de la cotxera
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Confirma que vols vendre tots els vehicles de la cotxera
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Confirma que vols vendre tots els vaixells de la drassana
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Confirma que vols vendre tots els avions de l'hangar
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}No vendre tots els trens de la cotxera
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}No vendre tots els vehicles de la cotxera
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}No vendre tots els vaixells de la drassana
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}No vendre tots els avions de l'hangar
+STR_DEPOT_SELL_CONFIRMATION_TEXT :{YELLOW}Estàs a punt de vendre tots els vehicles de la cotxera. N'estàs segur?
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Vendre tots els trens de la cotxera
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Vendre tots els vehicles de la cotxera
@@ -3045,6 +3033,7 @@
STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Remodelable a: {GOLD}
STR_PURCHASE_INFO_ALL_TYPES :Totes les càrregues
STR_PURCHASE_INFO_ALL_BUT :Tots menys {GOLD}
+STR_PURCHASE_INFO_MAX_TE :{BLACK}Max. Esforç de Tracció: {GOLD}{FORCE}
########### String for New Landscape Generator
--- a/lang/czech.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/czech.txt Mon Jan 01 16:31:13 2007 +0000
@@ -1,8 +1,9 @@
##name Czech
-##ownname Cesky
+##ownname Česky
##isocode cs_CS.UTF-8
##plural 6
-##case big gen news subs
+##case nom gen acc dat voc loc ins big
+##gender m m_a m_i f n
##id 0x0000
STR_NULL :
@@ -21,148 +22,92 @@
STR_000D_ACCEPTS :{BLACK}Přijímá: {GOLD}
STR_000E :
STR_000F_PASSENGERS :cestující
-STR_000F_PASSENGERS.big :Cestující
STR_000F_PASSENGERS.gen :cestujících
-STR_000F_PASSENGERS.news :cestujících
-STR_000F_PASSENGERS.subs :Cestující
+STR_000F_PASSENGERS.big :Cestující
STR_0010_COAL :uhlí
STR_0010_COAL.big :Uhlí
-STR_0010_COAL.subs :Uhlí
STR_0011_MAIL :pošta
+STR_0011_MAIL.gen :pošty
STR_0011_MAIL.big :Pošta
-STR_0011_MAIL.gen :pošty
-STR_0011_MAIL.news :pošty
-STR_0011_MAIL.subs :Pošta
STR_0012_OIL :ropa
+STR_0012_OIL.gen :ropy
STR_0012_OIL.big :Ropa
-STR_0012_OIL.gen :ropy
-STR_0012_OIL.news :ropy
-STR_0012_OIL.subs :Ropa
STR_0013_LIVESTOCK :dobytek
-STR_0013_LIVESTOCK.big :Dobytek
STR_0013_LIVESTOCK.gen :dobytka
-STR_0013_LIVESTOCK.news :dobytka
-STR_0013_LIVESTOCK.subs :Dobytek
+STR_0013_LIVESTOCK.big :Dobytek
STR_0014_GOODS :zboží
STR_0014_GOODS.big :Zboží
-STR_0014_GOODS.subs :Zboží
STR_0015_GRAIN :zrní
STR_0015_GRAIN.big :Zrní
-STR_0015_GRAIN.subs :Zrní
STR_0016_WOOD :dřevo
-STR_0016_WOOD.big :Dřevo
STR_0016_WOOD.gen :dřeva
-STR_0016_WOOD.news :dreva
-STR_0016_WOOD.subs :Drevo
+STR_0016_WOOD.big :Dřevo
STR_0017_IRON_ORE :železná ruda
+STR_0017_IRON_ORE.gen :železné rudy
STR_0017_IRON_ORE.big :Železná ruda
-STR_0017_IRON_ORE.gen :železné rudy
-STR_0017_IRON_ORE.news :železné rudy
-STR_0017_IRON_ORE.subs :Železná ruda
STR_0018_STEEL :ocel
+STR_0018_STEEL.gen :oceli
STR_0018_STEEL.big :Ocel
-STR_0018_STEEL.gen :oceli
-STR_0018_STEEL.news :oceli
-STR_0018_STEEL.subs :Ocel
STR_0019_VALUABLES :ceniny
-STR_0019_VALUABLES.big :Ceniny
STR_0019_VALUABLES.gen :cenin
-STR_0019_VALUABLES.news :cenin
-STR_0019_VALUABLES.subs :Ceniny
+STR_0019_VALUABLES.big :Ceniny
STR_001A_COPPER_ORE :měděná ruda
-STR_001A_COPPER_ORE.big :Měděná ruda
STR_001A_COPPER_ORE.gen :měděné rudy
-STR_001A_COPPER_ORE.news :medene rudy
-STR_001A_COPPER_ORE.subs :Medena ruda
+STR_001A_COPPER_ORE.big :Měděná ruda
STR_001B_MAIZE :kukuřice
STR_001B_MAIZE.big :Kukuřice
-STR_001B_MAIZE.subs :Kukurice
STR_001C_FRUIT :ovoce
STR_001C_FRUIT.big :Ovoce
-STR_001C_FRUIT.subs :Ovoce
STR_001D_DIAMONDS :diamanty
-STR_001D_DIAMONDS.big :Diamanty
STR_001D_DIAMONDS.gen :diamantů
-STR_001D_DIAMONDS.news :diamantu
-STR_001D_DIAMONDS.subs :Diamanty
+STR_001D_DIAMONDS.big :Diamanty
STR_001E_FOOD :jídlo
+STR_001E_FOOD.gen :jídlo
STR_001E_FOOD.big :Jídlo
-STR_001E_FOOD.gen :jídlo
-STR_001E_FOOD.news :jídlo
-STR_001E_FOOD.subs :Jídlo
STR_001F_PAPER :papír
+STR_001F_PAPER.gen :papíru
STR_001F_PAPER.big :Papír
-STR_001F_PAPER.gen :papíru
-STR_001F_PAPER.news :papíru
-STR_001F_PAPER.subs :Papír
STR_0020_GOLD :zlato
-STR_0020_GOLD.big :Zlato
STR_0020_GOLD.gen :zlata
-STR_0020_GOLD.news :zlata
-STR_0020_GOLD.subs :Zlato
+STR_0020_GOLD.big :Zlato
STR_0021_WATER :voda
-STR_0021_WATER.big :Voda
STR_0021_WATER.gen :vody
-STR_0021_WATER.news :vody
-STR_0021_WATER.subs :Voda
+STR_0021_WATER.big :Voda
STR_0022_WHEAT :pšenice
STR_0022_WHEAT.big :Pšenice
-STR_0022_WHEAT.subs :Pšenice
STR_0023_RUBBER :kaučuk
-STR_0023_RUBBER.big :Kaučuk
STR_0023_RUBBER.gen :kaučuku
-STR_0023_RUBBER.news :kaucuku
-STR_0023_RUBBER.subs :Kaucuk
+STR_0023_RUBBER.big :Kaučuk
STR_0024_SUGAR :cukr
+STR_0024_SUGAR.gen :cukru
STR_0024_SUGAR.big :Cukr
-STR_0024_SUGAR.gen :cukru
-STR_0024_SUGAR.news :cukru
-STR_0024_SUGAR.subs :Cukr
STR_0025_TOYS :hračky
+STR_0025_TOYS.gen :hraček
STR_0025_TOYS.big :Hračky
-STR_0025_TOYS.gen :hraček
-STR_0025_TOYS.news :hracek
-STR_0025_TOYS.subs :Hracky
STR_0026_CANDY :bonbony
-STR_0026_CANDY.big :Bonbony
STR_0026_CANDY.gen :bonbonů
-STR_0026_CANDY.news :bonbonu
-STR_0026_CANDY.subs :Bonbony
+STR_0026_CANDY.big :Bonbony
STR_0027_COLA :kola
+STR_0027_COLA.gen :koly
STR_0027_COLA.big :Kola
-STR_0027_COLA.gen :koly
-STR_0027_COLA.news :coly
-STR_0027_COLA.subs :Cola
STR_0028_COTTON_CANDY :cukrová vata
+STR_0028_COTTON_CANDY.gen :cukrové vaty
STR_0028_COTTON_CANDY.big :Cukrová vata
-STR_0028_COTTON_CANDY.gen :cukrové vaty
-STR_0028_COTTON_CANDY.news :cukrové vaty
-STR_0028_COTTON_CANDY.subs :Cukrová vata
STR_0029_BUBBLES :bubliny
-STR_0029_BUBBLES.big :Bubliny
STR_0029_BUBBLES.gen :bublin
-STR_0029_BUBBLES.news :bublin
-STR_0029_BUBBLES.subs :Bubliny
+STR_0029_BUBBLES.big :Bubliny
STR_002A_TOFFEE :karamel
-STR_002A_TOFFEE.big :Karamel
STR_002A_TOFFEE.gen :karamelu
-STR_002A_TOFFEE.news :karamelu
-STR_002A_TOFFEE.subs :Karamel
+STR_002A_TOFFEE.big :Karamel
STR_002B_BATTERIES :baterie
-STR_002B_BATTERIES.big :Baterie
STR_002B_BATTERIES.gen :baterií
-STR_002B_BATTERIES.news :baterií
-STR_002B_BATTERIES.subs :Baterie
+STR_002B_BATTERIES.big :Baterie
STR_002C_PLASTIC :plast
-STR_002C_PLASTIC.big :Plast
STR_002C_PLASTIC.gen :plastu
-STR_002C_PLASTIC.news :plastu
-STR_002C_PLASTIC.subs :Plast
+STR_002C_PLASTIC.big :Plast
STR_002D_FIZZY_DRINKS :limonáda
-STR_002D_FIZZY_DRINKS.big :Limonáda
STR_002D_FIZZY_DRINKS.gen :limonád
-STR_002D_FIZZY_DRINKS.news :limonád
-STR_002D_FIZZY_DRINKS.subs :Limonáda
+STR_002D_FIZZY_DRINKS.big :Limonáda
STR_002E :
STR_002F_PASSENGER :cestujících
STR_0030_COAL :uhlí
@@ -267,6 +212,7 @@
STR_00B1_GAME_OPTIONS :{WHITE}Možnosti hry
STR_00B2_MESSAGE :{YELLOW}Zpráva
STR_00B3_MESSAGE_FROM :{YELLOW}Zpráva od {STRING}
+STR_POPUP_CAUTION_CAPTION :{WHITE}Varování!
STR_00B4_CAN_T_DO_THIS :{WHITE}Tohle neumůžeš udělat...
STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Nemůžeš vyčistit tuto oblast...
STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Původní copyright: {COPYRIGHT} 1995 Chris Sawyer, všechna práva vyhrazena
@@ -471,7 +417,7 @@
STR_015D_LOAD_GAME :Načíst hru
STR_015E_QUIT_GAME :Ukončit hru
STR_015F_QUIT :Ukončit program
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Opravdu chceš ukončit tuto hru?
+STR_ABANDON_GAME_QUERY :{YELLOW}Opravdu chceš ukončit tuto hru?
STR_0161_QUIT_GAME :{WHITE}Konec hry
STR_SORT_ORDER_TIP :{BLACK}Vyber způsob řazeni (sestupně/vzestupně)
STR_SORT_CRITERIA_TIP :{BLACK}Vyber, podle čeho se má třídit
@@ -506,7 +452,15 @@
STR_NO_WAITING_CARGO :{BLACK}Nečeká žádná komodita jakéhokoli druhu
STR_SELECT_ALL_FACILITIES :{BLACK}Označit všechny druhy stanic
STR_SELECT_ALL_TYPES :{BLACK}Označit všechny druhy komodit (včetne žádného čekajícího nákladu)
+STR_AVAILABLE_ENGINES_TIP :{BLACK}Ukázat seznam dostupných variant pro tento typ vozidla.
+STR_MANAGE_LIST :{BLACK}Upravit seznam
+STR_MANAGE_LIST_TIP :{BLACK}Poslat příkazy všem vozidlům v tomto seznamu
STR_REPLACE_VEHICLES :Vyměňování vozidel
+STR_SEND_TRAIN_TO_DEPOT :Poslat do depa
+STR_SEND_ROAD_VEHICLE_TO_DEPOT :Poslat do depa
+STR_SEND_SHIP_TO_DEPOT :Poslat do depa
+STR_SEND_AIRCRAFT_TO_HANGAR :Poslat do hangáru
+STR_SEND_FOR_SERVICING :Provést údržbu
############ range for months starts
STR_0162_JAN :led
@@ -842,7 +796,7 @@
STR_029A_PLAY_SCENARIO :{BLACK}Hrát mapu
STR_PLAY_HEIGHTMAP :{BLACK}Hrát z výškové mapy
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Začne novou hru s použitím výškové mapy k vytvoření krajiny
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Určite chceš opustit toto mapu?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Určite chceš opustit toto mapu?
STR_029C_QUIT_EDITOR :{WHITE}Ukončit editor
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}... může být budováno jen ve městech s populací 1200 lidí a více
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Posunout startovní rok o rok zpět
@@ -1125,6 +1079,7 @@
STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Spojovat stanice postavené vedle sebe: {ORANGE}{STRING}
STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Odjet, když je plně naložen jakýkoli náklad při 'naložit': {ORANGE}{STRING}
STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Použij vylepšený algoritmus nakládání: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Nakládat vozidla postupně: {ORANGE}{STRING}
STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflace: {ORANGE}{STRING}
STR_CONFIG_PATCHES_SELECTGOODS :{LTBLUE}Vozit zboží do stanice jen když je poptávka: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LONGBRIDGES :{LTBLUE}Povolit stavbu velmi dlouhých mostů: {ORANGE}{STRING}
@@ -1412,6 +1367,7 @@
STR_NETWORK_SERVER_OFFLINE :{SILVER}SERVER JE OFFLINE
STR_NETWORK_SERVER_FULL :{SILVER}SERVER JE PLNÝ
STR_NETWORK_VERSION_MISMATCH :{SILVER}NESOUHLASÍ VERZE
+STR_NETWORK_GRF_MISMATCH :{SILVER}NESOUHLASÍ GRAFIKY
STR_NETWORK_JOIN_GAME :{BLACK}Přidat se
@@ -2706,6 +2662,7 @@
STR_885C_BROKEN_DOWN :{RED}Porucha
STR_885D_AGE_RUNNING_COST_YR :{BLACK}Stáří: {LTBLUE}{STRING}{BLACK} Cena provozu: {LTBLUE}{CURRENCY} ročně
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Hmotnost: {LTBLUE}{WEIGHT_S} {BLACK}Výkon: {LTBLUE}{POWER}{BLACK} Max. rychlost: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Hmotnost: {LTBLUE}{WEIGHT_S} {BLACK}Výkon: {LTBLUE}{POWER}{BLACK} Max. rychlost: {LTBLUE}{VELOCITY} {BLACK}Max. tažná síla: {LTBLUE}{FORCE}
STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Příjem tento rok: {LTBLUE}{CURRENCY} (minulý rok: {CURRENCY})
STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}Spolehlivost: {LTBLUE}{COMMA}% {BLACK}Poruch od posledního servisu: {LTBLUE}{COMMA}
STR_8861_STOPPED :{RED}Zastaveno
@@ -2983,13 +2940,39 @@
STR_PERFORMANCE_DETAIL_LOAN_TIP :{BLACK}Má společnost velký dluh?
STR_PERFORMANCE_DETAIL_TOTAL_TIP :{BLACK}Celkový počet bodů z 1000 možných
-STR_NEWGRF_SETTINGS_CAPTION :{WHITE}Nastavení nových grafických souborů
+STR_NEWGRF_SETTINGS_BUTTON :{BLACK}Nastavení grafik
+STR_NEWGRF_SETTINGS_CAPTION :{WHITE}Nastavení grafických souborů
STR_NEWGRF_APPLY_CHANGES :{BLACK}Potvrdit změny
STR_NEWGRF_SET_PARAMETERS :{BLACK}Nastavit parametry
STR_NEWGRF_TIP :{BLACK}Tady je seznam všech nainstalovaných grafických setů. Nastavení změníš kliknutím na set.
-STR_NEWGRF_NO_FILES_INSTALLED :{BLACK}Žádné soubory s novou grafikou nejsou nainstalovány! Pro instrukce, jak nainstalovat nové grafické soubory, se podívej do manuálu.
+STR_NEWGRF_NO_FILES_INSTALLED :{BLACK}Žádné soubory s grafikou nejsou nainstalovány! Pro instrukce, jak nainstalovat grafické soubory, se podívej do manuálu.
STR_NEWGRF_FILENAME :{BLACK}Jméno souboru: {SILVER}{STRING}
STR_NEWGRF_GRF_ID :{BLACK}ID GRF: {SILVER}{STRING}
+STR_NEWGRF_MD5SUM :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT :{YELLOW}Právě se chystáš změnit nastavení grafik za běžící hry; může to shodit OpenTTD.{}Jsi si s tím opravdu jist/a?
+
+STR_NEWGRF_ADD :{BLACK}Přidat
+STR_NEWGRF_ADD_TIP :{BLACK}Přidat NewGRF soubor do seznamu
+STR_NEWGRF_REMOVE :{BLACK}Odebrat
+STR_NEWGRF_REMOVE_TIP :{BLACK}Odstranit označený NewGRF soubor ze seznamu
+STR_NEWGRF_MOVEUP :{BLACK}Nahoru
+STR_NEWGRF_MOVEUP_TIP :{BLACK}Posunout označený NewGRF soubor nahoru
+STR_NEWGRF_MOVEDOWN :{BLACK}Dolů
+STR_NEWGRF_MOVEDOWN_TIP :{BLACK}Posunout označený NewGRF soubor dolů
+STR_NEWGRF_FILE_TIP :{BLACK}Seznam NewGRF souborů, které jsou nainstalovány. Parametry souboru můžeš změnit kliknutím na něj.
+STR_NEWGRF_PARAMETER :{BLACK}Parametry: {SILVER}{STRING}
+STR_NEWGRF_PARAMETER_QUERY :{BLACK}Zadej parametry NewGRF souboru
+STR_NEWGRF_NO_INFO :{BLACK}Není dostupná žádná informace
+
+STR_NEWGRF_ADD_CAPTION :{WHITE}Dostupné NewGRF soubory
+STR_NEWGRF_ADD_FILE :{BLACK}Přidat do výběru
+STR_NEWGRF_ADD_FILE_TIP :{BLACK}Přidat vybraný NewGRF soubor do tvého nastavení
+STR_NEWGRF_RESCAN_FILES :{BLACK}Načíst soubory
+STR_NEWGRF_RESCAN_FILES_TIP :{BLACK}Aktualizovat seznam dostupných NewGRF souborů
+STR_NEWGRF_DUPLICATE_GRFID :{WHITE}Nelze přidat soubor: duplicitní GRF ID
+
+STR_NEWGRF_NOT_FOUND :{RED}Nenalezen odpovídající soubor
+STR_NEWGRF_DISABLED :{RED}Vypnuto
STR_CURRENCY_WINDOW :{WHITE}Vlastní měna
STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Kurz měny: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -3021,20 +3004,7 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Zobrazit všechny prostředky se stejným jízdním řádem
### depot strings
-
-STR_SELL :{BLACK}Prodat
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}Chceš prodat všechna vozidla v depu.
-STR_ARE_YOU_SURE :{BLACK}Jsi si jistý?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Potvrď, že chceš prodat všechny lodě v depu
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Potvrď, že chceš prodat všechna silniční vozidla v depu
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Potvrď, že chceš prodat všechny lodě v depu
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Potvrď, že chceš prodat všechna letadla a vrtulníky v hangáru
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}Neprodávat vlaky nacházející se v depu
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}Neprodávat silniční vozidla nacházející se v depu
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}Neprodávat lodě nacházející se v depu
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Neprodávat letadla a vrtulníky nacházející se v hangáru
+STR_DEPOT_SELL_CONFIRMATION_TEXT :{YELLOW}Chceš prodat všechna vozidla v depu. Jsi si jistý?
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Prodat všechny vlaky v depu
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Prodat všechna silniční vozidla v depu
@@ -3121,6 +3091,7 @@
STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Refitovatelné na: {GOLD}
STR_PURCHASE_INFO_ALL_TYPES :Všechny druhy nákladu
STR_PURCHASE_INFO_ALL_BUT :Všechny kromě {GOLD}
+STR_PURCHASE_INFO_MAX_TE :{BLACK}Max. tažná síla: {GOLD}{FORCE}
########### String for New Landscape Generator
--- a/lang/danish.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/danish.txt Mon Jan 01 16:31:13 2007 +0000
@@ -358,7 +358,7 @@
STR_015D_LOAD_GAME :Hent Spil
STR_015E_QUIT_GAME :Afslut Spil
STR_015F_QUIT :Afslut
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Er du sikker på, at du vil afslutte dette spil ?
+STR_ABANDON_GAME_QUERY :{YELLOW}Er du sikker på, at du vil afslutte dette spil ?
STR_0161_QUIT_GAME :{WHITE}Afslut Spil
STR_SORT_ORDER_TIP :{BLACK}Vælg sorteringsorden (faldende/stigende)
STR_SORT_CRITERIA_TIP :{BLACK}Vælg sorteringskriterie
@@ -737,7 +737,7 @@
STR_029A_PLAY_SCENARIO :{BLACK}Spil et scenarie
STR_PLAY_HEIGHTMAP :{BLACK}Spil højdekort
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Start et nyt spil med et højdekort som landskab
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Er du sikker på, at du vil afslutte dette scenarie ?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Er du sikker på, at du vil afslutte dette scenarie ?
STR_029C_QUIT_EDITOR :{WHITE}Afslut Editoren
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...kan kun bygges i byer med mindst 1200 indbyggere
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Flyt startdatoen 1 år tilbage
@@ -2922,21 +2922,6 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Vis alle transportmidler, som har den samme rute
### depot strings
-
-STR_SELL :{BLACK}Sælg
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}Du er ved at sælge alle køretøjer i værkstedet
-STR_ARE_YOU_SURE :{BLACK}Er du sikker?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Bekræft at du ønsker at sælge alle toge i remisen
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Bekræft at du ønsker at sælge alle køretøjer i værkstedet
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Bekræft at du ønsker at sælge alle skibe i dokken
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Bekræft at du ønsker at sælge alle fly i hangaren
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}Sælg ikke togene i remisen
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}Sælg ikke køretøjerne i værkstedet
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}Sælg ikke skibene i dokken
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Sælg ikke flyene i hangaren
-
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Sælg alle toge i remisen
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Sælg alle køretøjer i værkstedet
STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP :{BLACK}Sælg alle skibe i dokken
--- a/lang/dutch.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/dutch.txt Mon Jan 01 16:31:13 2007 +0000
@@ -359,7 +359,7 @@
STR_015D_LOAD_GAME :Spel laden
STR_015E_QUIT_GAME :Spel stoppen
STR_015F_QUIT :Afsluiten
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Weet je zeker dat je dit spel wilt afsluiten?
+STR_ABANDON_GAME_QUERY :{YELLOW}Weet je zeker dat je dit spel wilt afsluiten?
STR_0161_QUIT_GAME :{WHITE}Spel stoppen
STR_SORT_ORDER_TIP :{BLACK}Selecteer sorteerrichting (aflopend/oplopend)
STR_SORT_CRITERIA_TIP :{BLACK}Selecteer sorteringscriteria
@@ -738,7 +738,7 @@
STR_029A_PLAY_SCENARIO :{BLACK}Scenario spelen
STR_PLAY_HEIGHTMAP :{BLACK}Speel Hoogtekaart
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Start een nieuw spel, gebruik een hoogtekaart als landschap
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Weet je zeker dat je dit scenario wilt sluiten?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Weet je zeker dat je dit scenario wilt sluiten?
STR_029C_QUIT_EDITOR :{WHITE}Sluit editor
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...kan alleen in steden met bevolking van meer dan 1200 gebouwd worden
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Verplaats begindatum 1 jaar achteruit
@@ -2604,6 +2604,7 @@
STR_885C_BROKEN_DOWN :{RED}Kapot
STR_885D_AGE_RUNNING_COST_YR :{BLACK}Leeftijd: {LTBLUE}{STRING}{BLACK} Brandstofkosten: {LTBLUE}{CURRENCY}/jr
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Gewicht: {LTBLUE}{WEIGHT_S} {BLACK}Kracht: {LTBLUE}{POWER}{BLACK} Max. snelheid: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Gewicht: {LTBLUE}{WEIGHT_S} {BLACK}Kracht: {LTBLUE}{POWER}{BLACK} Max. snelheid: {LTBLUE}{VELOCITY} {BLACK}Max. T.K.: {LTBLUE}{FORCE}
STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Winst dit jaar: {LTBLUE}{CURRENCY} (vorig jaar: {CURRENCY})
STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}Betrouwbaarheid: {LTBLUE}{COMMA}% {BLACK}Pechgevallen sinds laatste reparatie: {LTBLUE}{COMMA}
STR_8861_STOPPED :{RED}Gestopt
@@ -2945,20 +2946,7 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Toon alle voertuigen met de zelfde orders
### depot strings
-
-STR_SELL :{BLACK}Verkoop
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}Je staat op het punt alle voertuigen in het depot te verkopen.
-STR_ARE_YOU_SURE :{BLACK}Weet je het zeker?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Bevestig dat je alle treinen in het depot wilt verkopen
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Bevestig dat je alle weg voertuigen in het depot wilt verkopen
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Bevestig dat je alle schepen in het depot wilt verkopen
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Bevestig dat je alle vliegtuigen in de hangar wilt verkopen
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}Verkoop niet alle treinen in het depot
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}Verkoop niet alle weg voertuigen in het depot
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}Verkoop niet alle schepen in het depot
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Verkoop niet alle vliegtuigen in de hangar
+STR_DEPOT_SELL_CONFIRMATION_TEXT :{YELLOW}Je staat op het punt alle voertuigen in het depot te verkopen. Weet je het zeker?
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Verkoop alle treinen in het depot
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Verkoop alle weg voertuigen in het depot
@@ -3045,6 +3033,7 @@
STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Herindeel naar: {GOLD}
STR_PURCHASE_INFO_ALL_TYPES :Alle vracht typen
STR_PURCHASE_INFO_ALL_BUT :Alles behalve {GOLD}
+STR_PURCHASE_INFO_MAX_TE :{BLACK}Max. Trekkracht: {GOLD}{FORCE}
########### String for New Landscape Generator
--- a/lang/english.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/english.txt Mon Jan 01 16:31:13 2007 +0000
@@ -359,7 +359,7 @@
STR_015D_LOAD_GAME :Load game
STR_015E_QUIT_GAME :Abandon game
STR_015F_QUIT :Exit
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Are you sure you want to abandon this game?
+STR_ABANDON_GAME_QUERY :{YELLOW}Are you sure you want to abandon this game?
STR_0161_QUIT_GAME :{WHITE}Abandon Game
STR_SORT_ORDER_TIP :{BLACK}Select sorting order (descending/ascending)
STR_SORT_CRITERIA_TIP :{BLACK}Select sorting criteria
@@ -738,7 +738,7 @@
STR_029A_PLAY_SCENARIO :{BLACK}Play Scenario
STR_PLAY_HEIGHTMAP :{BLACK}Play Heightmap
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Start a new game, using a heightmap as landscape
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Are you sure you want to quit this scenario ?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Are you sure you want to quit this scenario ?
STR_029C_QUIT_EDITOR :{WHITE}Quit Editor
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...can only be built in towns with a population of at least 1200
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Move the starting date backward 1 year
@@ -2946,20 +2946,7 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Show all vehicles that share this schedule
### depot strings
-
-STR_SELL :{BLACK}Sell
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}You are about to sell all the vehicles in the depot.
-STR_ARE_YOU_SURE :{BLACK}Are you sure?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Confirm that you want to sell all the trains in the depot
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Confirm that you want to sell all the road vehicles in the depot
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Confirm that you want to sell all the ships in the depot
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Confirm that you want to sell all the aircraft in the hangar
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}Do not sell all trains in the depot
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}Do not sell all road vehicles in the depot
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}Do not sell all ships in the depot
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Do not sell all aircraft in the hangar
+STR_DEPOT_SELL_CONFIRMATION_TEXT :{YELLOW}You are about to sell all the vehicles in the depot. Are you sure?
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Sell all trains in the depot
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Sell all road vehicles in the depot
--- a/lang/esperanto.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/esperanto.txt Mon Jan 01 16:31:13 2007 +0000
@@ -155,6 +155,7 @@
STR_00B1_GAME_OPTIONS :{WHITE}Ludaj Opcioj
STR_00B2_MESSAGE :{YELLOW}Mesaĝo
STR_00B3_MESSAGE_FROM :{YELLOW}Mesaĝo de {STRING}
+STR_POPUP_CAUTION_CAPTION :{WHITE}Atentu!
STR_00B4_CAN_T_DO_THIS :{WHITE}Ne eblas fari ĉi tion....
STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Ne eblas malplenigi la regionon....
STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Origina kopirajto {COPYRIGHT} 1995 Chris Sawyer, Ĉiuj rajtoj rezervitaj
@@ -327,12 +328,16 @@
STR_UNITS_WEIGHT_SHORT_METRIC :{COMMA}t
STR_UNITS_WEIGHT_SHORT_SI :{COMMA}kg
+STR_UNITS_WEIGHT_LONG_IMPERIAL :{COMMA} angla{P "" j} tuno{P "" j}
+STR_UNITS_WEIGHT_LONG_METRIC :{COMMA} tuno{P "" j}
STR_UNITS_WEIGHT_LONG_SI :{COMMA} kg
STR_UNITS_VOLUME_SHORT_IMPERIAL :{COMMA}gal
STR_UNITS_VOLUME_SHORT_METRIC :{COMMA}l
STR_UNITS_VOLUME_SHORT_SI :{COMMA}m³
+STR_UNITS_VOLUME_LONG_IMPERIAL :{COMMA} galjono{P "" j}
+STR_UNITS_VOLUME_LONG_METRIC :{COMMA} litro{P "" j}
STR_UNITS_VOLUME_LONG_SI :{COMMA} m³
STR_UNITS_FORCE_IMPERIAL :{COMMA}x10³ lbf
@@ -355,7 +360,7 @@
STR_015D_LOAD_GAME :Ŝarĝu ludon
STR_015E_QUIT_GAME :Foriru de la ludo
STR_015F_QUIT :Fermu
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Ĉu vi certas ke vi volas foriri?
+STR_ABANDON_GAME_QUERY :{YELLOW}Ĉu vi certas ke vi volas foriri?
STR_0161_QUIT_GAME :{WHITE}Foriri de la ludo
STR_SORT_ORDER_TIP :{BLACK}Elektu vicordo (deira/alira)
STR_SORT_CRITERIA_TIP :{BLACK}Elektu ordigaj kondiĉoj
@@ -734,7 +739,7 @@
STR_029A_PLAY_SCENARIO :{BLACK}Ludu Scenaron
STR_PLAY_HEIGHTMAP :{BLACK}Ludu Altecmapon
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Startu novan ludon, uzante altecmapon por landaspekto
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Ĉu vi certas ke vi volas forlasi ĉi tiun scenaron?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Ĉu vi certas ke vi volas forlasi ĉi tiun scenaron?
STR_029C_QUIT_EDITOR :{WHITE}Fermu Kreilon
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...nur konstruebla en urboj havantaj pli ol 1200 enloĝantojn
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Movu la komencdaton 1 jaron posten
@@ -1913,6 +1918,39 @@
############ These strings may never get a new id, or savegames will break!
##id 0x6000
+STR_SV_STNAME :{STRING}
+STR_SV_STNAME_NORTH :Norda {STRING}
+STR_SV_STNAME_SOUTH :Suda {STRING}
+STR_SV_STNAME_EAST :Orienta {STRING}
+STR_SV_STNAME_WEST :Okcidenta {STRING}
+STR_SV_STNAME_CENTRAL :Centra {STRING}
+STR_SV_STNAME_TRANSFER :Transiga {STRING}
+STR_SV_STNAME_HALT :Halteja {STRING}
+STR_SV_STNAME_VALLEY :Valo de {STRING}
+STR_SV_STNAME_HEIGHTS :Alta {STRING}
+STR_SV_STNAME_WOODS :{STRING} Arbaro
+STR_SV_STNAME_LAKESIDE :Lago ĉe {STRING}
+STR_SV_STNAME_EXCHANGE :Interŝanĝa {STRING}
+STR_SV_STNAME_AIRPORT :Flughaveno de {STRING}
+STR_SV_STNAME_OILFIELD :Olefonto de {STRING}
+STR_SV_STNAME_MINES :Minejo de {STRING}
+STR_SV_STNAME_DOCKS :Haveno de {STRING}
+STR_SV_STNAME_BUOY_1 :{STRING} Buo 1
+STR_SV_STNAME_BUOY_2 :{STRING} Buo 2
+STR_SV_STNAME_BUOY_3 :{STRING} Buo 3
+STR_SV_STNAME_BUOY_4 :{STRING} Buo 4
+STR_SV_STNAME_BUOY_5 :{STRING} Buo 5
+STR_SV_STNAME_BUOY_6 :{STRING} Buo 6
+STR_SV_STNAME_BUOY_7 :{STRING} Buo 7
+STR_SV_STNAME_BUOY_8 :{STRING} Buo 8
+STR_SV_STNAME_BUOY_9 :{STRING} Buo 9
+STR_SV_STNAME_ANNEXE :Ekstera {STRING}
+STR_SV_STNAME_SIDINGS :Flanka {STRING}
+STR_SV_STNAME_BRANCH :Branĉa {STRING}
+STR_SV_STNAME_UPPER :Supra {STRING}
+STR_SV_STNAME_LOWER :Malsupra {STRING}
+STR_SV_STNAME_HELIPORT :{STRING} Helikopterejo
+STR_SV_STNAME_FOREST :Arbaro de {STRING}
############ end of savegame specific region!
@@ -1959,6 +1997,7 @@
STR_681D_MEDIUM :Meze
STR_681E_FAST :Rapide
STR_681F_VERY_FAST :Tre Rapide
+STR_VERY_LOW :Tre Malalte
STR_6820_LOW :Malalte
STR_6821_MEDIUM :Meze
STR_6822_HIGH :Alte
@@ -1990,6 +2029,16 @@
##id 0x7000
STR_7000 :
+STR_7001 :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7002_PLAYER :(Ludanto {COMMA})
+STR_7004_NEW_FACE :{BLACK}Novan Vizaĝon
+STR_7005_COLOR_SCHEME :{BLACK}Kolorskemo
+STR_7006_COLOR_SCHEME :{GOLD}Kolorskemo:
+STR_7007_NEW_COLOR_SCHEME :{WHITE}Novan Kolorskemon
+STR_7008_COMPANY_NAME :{BLACK}Kompania Nomo
+STR_7009_PRESIDENT_NAME :{BLACK}Manaĝanta Nomo
+STR_700A_COMPANY_NAME :Kompania Nomo
+STR_700B_PRESIDENT_S_NAME :Nomo de la Manaĝanto
STR_700C_CAN_T_CHANGE_COMPANY_NAME :{WHITE}Ne povas ŝanĝi kompaninomon...
STR_700D_CAN_T_CHANGE_PRESIDENT :{WHITE}Ne povas ŝanĝi manaĝantnomon...
STR_700E_FINANCES :{WHITE}Financoj de {COMPANY} {BLACK}{PLAYERNAME}
@@ -2033,7 +2082,20 @@
STR_7032_CHANGE_THE_PRESIDENT_S :{BLACK}Ŝanĝu la nomon de la manaĝanto
STR_7033_CHANGE_THE_COMPANY_NAME :{BLACK}Ŝanĝu la nomon de la kompanio
STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}Alklaku la deziratan kolorskemon
+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_7039_VEHICLES :{GOLD}Veturiloj:
+STR_TRAINS :{WHITE}{COMMA} trajno{P "" j}
+STR_ROAD_VEHICLES :{WHITE}{COMMA} vojveturilo{P "" j}
STR_AIRCRAFT :{WHITE}{COMMA} aviadiloj
+STR_SHIPS :{WHITE}{COMMA} ŝipo{P "" j}
+STR_7042_NONE :{WHITE}Neniu
+STR_7043_FACE_SELECTION :{WHITE}Vizaĝelekto
+STR_7044_MALE :{BLACK}Vira
+STR_7045_FEMALE :{BLACK}Virina
+STR_7046_NEW_FACE :{BLACK}Novan Vizaĝon
STR_7047_CANCEL_NEW_FACE_SELECTION :{BLACK}Nuligu elekton de nova vizaĝo
STR_7048_ACCEPT_NEW_FACE_SELECTION :{BLACK}Akceptu elekton de nova vizaĝo
STR_7049_SELECT_MALE_FACES :{BLACK}Elektu virajn vizaĝojn
@@ -2076,10 +2138,13 @@
STR_706E_TYCOON :Plejpotenculo
STR_706F_BUILD_HQ :{BLACK}Faru HQ
STR_7070_BUILD_COMPANY_HEADQUARTERS :{BLACK}Konstruu kompanian ĉefkonstruaĵon / vidu kompanian ĉefkonstruaĵon
+STR_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Rekonstruu kompanian ĉefkonstruaĵon aliloke por 1% de kompanivaloro
STR_7071_CAN_T_BUILD_COMPANY_HEADQUARTERS :{WHITE}Ne povas konstrui kompanian ĉefkonstruaĵon...
STR_7072_VIEW_HQ :{BLACK}Vidu HQ
+STR_RELOCATE_HQ :{BLACK}Relokigu HQ
STR_COMPANY_PASSWORD :{BLACK}Pasvorto
STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Pasvorte protektu vian kompanion por eviti ke eksteruloj aliĝu.
+STR_SET_COMPANY_PASSWORD :Agordu kompanian pasvorton
STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Monda Recesio!{}{}Financaj spertuloj timas ke malpliboniĝas treege! Ekonomio malboniĝadas!
STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Recesio finiĝis!{}{}Komerca pliboniĝos donas konfidon al industrioj! Ekonomio pliboniĝas!
STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Ŝaltu inter granda kaj malgranda fenestro
@@ -2257,6 +2322,16 @@
STR_8081_MIGHTYMOVER_MAIL_TRUCK :Poŝtaŭto "MightyMover"
STR_8082_POWERNAUGHT_MAIL_TRUCK :Poŝtaŭto "Powernaught"
STR_8083_WIZZOWOW_MAIL_TRUCK :Poŝtaŭto "Wizzowow"
+STR_8084_WITCOMBE_OIL_TANKER :Oleŝipo "Witcombe"
+STR_8085_FOSTER_OIL_TANKER :Oleŝipo "Foster"
+STR_8086_PERRY_OIL_TANKER :Oleŝipo "Perry"
+STR_8087_TALBOTT_LIVESTOCK_VAN :Brutŝarĝaŭto "Talbott"
+STR_8088_UHL_LIVESTOCK_VAN :Brutŝarĝaŭto "Uhl"
+STR_8089_FOSTER_LIVESTOCK_VAN :Brutŝarĝaŭto "Foster"
+STR_808A_BALOGH_GOODS_TRUCK :Varŝarĝaŭto "Balogh"
+STR_808B_CRAIGHEAD_GOODS_TRUCK :Varŝarĝaŭto "Craighead"
+STR_808C_GOSS_GOODS_TRUCK :Varŝarĝaŭto "Goss"
+STR_808D_HEREFORD_GRAIN_TRUCK :Grenŝarĝaŭto "Hereford"
STR_808E_THOMAS_GRAIN_TRUCK :Grenŝarĝaŭto "Thomas"
STR_808F_GOSS_GRAIN_TRUCK :Grenŝarĝaŭto "Goss"
STR_8090_WITCOMBE_WOOD_TRUCK :Lignoŝarĝaŭto "Witcombe"
@@ -2319,6 +2394,7 @@
STR_80C9_MIGHTYMOVER_BUBBLE_TRUCK :Vezikŝarĝaŭto "MightyMover"
STR_80CA_POWERNAUGHT_BUBBLE_TRUCK :Vezikŝarĝaŭto "Powernaught"
STR_80CB_WIZZOWOW_BUBBLE_TRUCK :Vezikŝarĝaŭto "Wizzowow"
+STR_80CC_MPS_OIL_TANKER :Oleŝipo "MPS"
STR_80CD_CS_INC_OIL_TANKER :Oleŝipo "CS-Inc."
STR_80CE_MPS_PASSENGER_FERRY :Pasaĝerŝipo "MPS"
STR_80CF_FFP_PASSENGER_FERRY :Pasaĝerŝipo "FFP"
@@ -2399,7 +2475,9 @@
STR_8810_GO_NON_STOP_TO_LOAD :Iru senhalte al {STATION} (Ŝarĝu)
STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Iru senhalte al {STATION} (Transigu kaj atendu ĝis plena ŝarĝo)
STR_GO_TO_TRAIN_DEPOT :Iru al {TOWN} Trajndeponejo
+STR_SERVICE_AT_TRAIN_DEPOT :Prizorgo ĉe {TOWN} Trajndeponejo
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Iru senhalte al {TOWN} Trajndeponejo
+STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Prizorgo senhalte ĉe {TOWN} Trajndeponejo
STR_HEADING_FOR_TRAIN_DEPOT :{ORANGE}Irante al {TOWN} Trajndeponejo
STR_HEADING_FOR_TRAIN_DEPOT_VEL :{ORANGE}Irante al {TOWN} Trajndeponejo, {VELOCITY}
@@ -2408,6 +2486,7 @@
STR_INVALID_ORDER :{RED} (Nevalida Ordeno)
+STR_UNKNOWN_DESTINATION :nekonata destino
STR_8812_EMPTY :{LTBLUE}Malplena
STR_8813_FROM :{LTBLUE}{CARGO} de {STATION}
STR_FROM_MULT :{LTBLUE}{CARGO} de {STATION} (x{NUM})
@@ -2416,6 +2495,7 @@
STR_8816 :{BLACK}-
STR_8819_TRAIN_TOO_LONG :{WHITE}Trajno tro longas
STR_881A_TRAINS_CAN_ONLY_BE_ALTERED :{WHITE}Trajno nut povas esti adaptataj kiam halte en deponejo
+STR_881B_TRAINS :{WHITE}{COMPANY} - {COMMA} Trajno{P "" j}
STR_881C_NEW_RAIL_VEHICLES :{WHITE}Novaj Relaj Veturiloj
STR_NEW_ELRAIL_VEHICLES :{WHITE}Novaj Elektraj Relaj Veturiloj
@@ -2437,14 +2517,19 @@
STR_8826_GO_TO :{BLACK}Iru al
STR_8827_FULL_LOAD :{BLACK}Plene ŝarĝu
STR_8828_UNLOAD :{BLACK}Deŝarĝu
+STR_REFIT :{BLACK}Transformu
+STR_REFIT_TIP :{BLACK}Elektu ŝarĝtipon por transformo en ĉi tiu ordeno. CTRL+klako por forigi instrukcion
+STR_REFIT_ORDER :(Transformu al {STRING})
STR_8829_ORDERS :{WHITE}{VEHICLE} (Ordenoj)
STR_882A_END_OF_ORDERS :{SETX 10}- - Fino de Ordenoj - -
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
+STR_SERVICE :{BLACK}Prizorgo
STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Ne povas krei relan veturilon...
STR_882C_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Kreite: {LTBLUE}{NUM}{BLACK} Valoro: {LTBLUE}{CURRENCY}
STR_882D_VALUE :{LTBLUE}{STRING}{BLACK} Valoro: {LTBLUE}{CURRENCY}
STR_882E :{WHITE}{VEHICLE}
STR_882F_LOADING_UNLOADING :{LTBLUE}Ŝarĝante / Deŝarĝante
+STR_TRAIN_MUST_BE_STOPPED :{WHITE}Trajno estu halta en deponejo
STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT :{WHITE}Ne povas sendi trajnon al deponejo...
STR_8831_NO_MORE_SPACE_FOR_ORDERS :{WHITE}Ne plu spaco por ordenoj
STR_8832_TOO_MANY_ORDERS :{WHITE}Tro da ordenoj
@@ -2452,11 +2537,13 @@
STR_8834_CAN_T_DELETE_THIS_ORDER :{WHITE}Ne povas forviŝi ĉi tiun ordenon...
STR_8835_CAN_T_MODIFY_THIS_ORDER :{WHITE}Ne povas ŝanĝi ĉi tiun ordenon...
STR_8837_CAN_T_MOVE_VEHICLE :{WHITE}Ne povas movi veturilon
+STR_REAR_ENGINE_FOLLOW_FRONT_ERROR :{WHITE}La malantaŭa maŝino ĉiam sekvos la antaŭan
STR_8838_N_A :N/A{SKIP}
STR_8839_CAN_T_SELL_RAILROAD_VEHICLE :{WHITE}Ne povas vendi relan veturilon...
STR_883A_UNABLE_TO_FIND_ROUTE_TO :{WHITE}Ne eblas trovi lokan deponejon
STR_883B_CAN_T_STOP_START_TRAIN :{WHITE}Ne povas haltigi/starti trajnon...
STR_883C_SERVICING_INTERVAL_DAYS :{BLACK}Prizorga intervalo: {LTBLUE}{COMMA}tagoj{BLACK} Lasta prizorgo: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT :{BLACK}Prizorga intervalo: {LTBLUE}{COMMA}%{BLACK} Lasta prizorgo: {LTBLUE}{DATE_LONG}
STR_883D_TRAINS_CLICK_ON_TRAIN_FOR :{BLACK}Trajnoj - alklaku trajnon por pliaj informoj
STR_883E_BUILD_NEW_TRAINS_REQUIRES :{BLACK}Kreu novajn trajnojn (bezonas trajndeponejon)
STR_883F_TRAINS_CLICK_ON_TRAIN_FOR :{BLACK}Trajnoj - alklaku trajnon por scii pli, tiru veturilon por aldoni aŭ forigi de trajno
@@ -2486,10 +2573,14 @@
STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Enigu novan ordenon antaŭ la elektita ordeno, aŭ aldonu fine de la listo
STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}La elektita ordeno igu la veturilon atendi ĝis plena ŝarĝo
STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}La elektita ordeno igu la veturilon deŝarĝi
+STR_SERVICE_HINT :{BLACK}Transsaltu ordenon ĝis prizorgo necesos
STR_8859_NEW_NOW_AVAILABLE :{BLACK}{BIGFONT}Nova {STRING} nun haveblas!
STR_885A :{BLACK}{BIGFONT}{STRING}
+STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER :{BLACK}Kosto: {CURRENCY} Pezo: {WEIGHT_S}{}Rapideco: {VELOCITY} Forto: {POWER}{}Irkosto: po {CURRENCY} jare{}Kapablo: {CARGO}
STR_885C_BROKEN_DOWN :{RED}Rompite
STR_885D_AGE_RUNNING_COST_YR :{BLACK}Aĝo: {LTBLUE}{STRING}{BLACK} Irkosto: {LTBLUE}po {CURRENCY} jare
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Pezo: {LTBLUE}{WEIGHT_S} {BLACK}Forto: {LTBLUE}{POWER}{BLACK} Pleja rapideco: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Pezo: {LTBLUE}{WEIGHT_S} {BLACK}Forto: {LTBLUE}{POWER}{BLACK} Pleja rapideco: {LTBLUE}{VELOCITY} {BLACK}Pleja T.E.: {LTBLUE}{FORCE}
STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Ĉi-jara gajno: {LTBLUE}{CURRENCY} (lastjara: {CURRENCY})
STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}Fidebleco: {LTBLUE}{COMMA}% {BLACK}Rompiĝoj post lasta prizorgo: {LTBLUE}{COMMA}
STR_8861_STOPPED :{RED}Haltis
@@ -2506,7 +2597,11 @@
STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}La elektita ordeno igu la veturilon demeti la ŝarĝon
STR_886F_TRANSFER :{BLACK}Transigu
+STR_TRAIN_STOPPING :{RED}Haltiĝas
+STR_TRAIN_STOPPING_VEL :{RED}Haltiĝas, {VELOCITY}
STR_INCOMPATIBLE_RAIL_TYPES :Neinterŝanĝeblaj reltipoj
+STR_TRAIN_NO_POWER :{RED}Senforte
+STR_TRAIN_START_NO_CATENARY :Mankas ĉi-trake supera elektro, do la trajno ne povas starti
##id 0x9000
STR_9000_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Vojveturilo okupas la lokon
@@ -2731,6 +2826,7 @@
STR_PERFORMANCE_DETAIL_AMOUNT_INT :{BLACK}({COMMA}/{COMMA})
SET_PERFORMANCE_DETAIL_INT :{BLACK}{NUM}
############ Those following lines need to be in this order!!
+STR_PERFORMANCE_DETAIL_VEHICLES :{BLACK}Veturiloj:
STR_PERFORMANCE_DETAIL_MIN_PROFIT :{BLACK}Malpleja gajno:
STR_PERFORMANCE_DETAIL_MIN_INCOME :{BLACK}Malpleja enspezo:
STR_PERFORMANCE_DETAIL_MAX_INCOME :{BLACK}Pleja enspezo:
@@ -2794,19 +2890,6 @@
### depot strings
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}Vi intencas vendi ĉiujn veturilojn en la deponejo.
-STR_ARE_YOU_SURE :{BLACK}Ĉu vi certas?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Konfirmu ke vi volas vendi ĉiujn trajnojn en la deponejo
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Konfirmu ke vi volas vendi ĉiujn vojveturilojn en la deponejo
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Konfirmu ke vi volas vendi ĉiujn ŝipojn en la deponejo
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Konfirmu ke vi volas vendi ĉiujn aviadilojn en la hangaro
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}Ne vendu ĉiujn trajnojn en la deponejo
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}Ne vendu ĉiujn vojveturilojn en la deponejo
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}Ne vendu ĉiujn ŝipojn en la deponejo
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Ne vendu ĉiujn aviadilojn en la hangaro
-
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Vendu ĉiujn trajnojn en la deponejo
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Vendu ĉiujn vojveturilojn en la deponejo
STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP :{BLACK}Vendu ĉiujn ŝipojn en la deponejo
--- a/lang/estonian.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/estonian.txt Mon Jan 01 16:31:13 2007 +0000
@@ -21,6 +21,7 @@
STR_000D_ACCEPTS :{BLACK}Võtab vastu: {GOLD}
STR_000E :
STR_000F_PASSENGERS :Reisijad
+STR_000F_PASSENGERS.g :Reisijate
STR_0010_COAL :Kivisüsi
STR_0010_COAL.g :Kivisöe
STR_0011_MAIL :Post
@@ -28,7 +29,9 @@
STR_0012_OIL :Nafta
STR_0012_OIL.g :Nafta
STR_0013_LIVESTOCK :Kariloomad
+STR_0013_LIVESTOCK.g :Kariloomade
STR_0014_GOODS :Kaubad
+STR_0014_GOODS.g :Kaupade
STR_0015_GRAIN :Teravili
STR_0015_GRAIN.g :Teravilja
STR_0016_WOOD :Puit
@@ -38,6 +41,7 @@
STR_0018_STEEL :Teras
STR_0018_STEEL.g :Terase
STR_0019_VALUABLES :Väärisasjad
+STR_0019_VALUABLES.g :Väärisasjade
STR_001A_COPPER_ORE :Vasemaak
STR_001A_COPPER_ORE.g :Vasemaagi
STR_001B_MAIZE :Mais
@@ -45,81 +49,119 @@
STR_001C_FRUIT :Puuviljad
STR_001C_FRUIT.g :Puuviljade
STR_001D_DIAMONDS :Teemantid
+STR_001D_DIAMONDS.g :Teemantite
STR_001D_DIAMONDS.genitiiv :Teemantite
STR_001E_FOOD :Toit
+STR_001E_FOOD.g :Toidu
STR_001E_FOOD.genitiiv :Toidu
STR_001F_PAPER :Paber
+STR_001F_PAPER.g :Paberi
STR_001F_PAPER.genitiiv :Paberi
STR_0020_GOLD :Kuld
+STR_0020_GOLD.g :Kulla
STR_0020_GOLD.genitiiv :Kulla
STR_0021_WATER :Vesi
+STR_0021_WATER.g :Vee
STR_0021_WATER.genitiiv :Vee
STR_0022_WHEAT :Nisu
+STR_0022_WHEAT.g :Nisu
STR_0022_WHEAT.genitiiv :Nisu
STR_0023_RUBBER :Kumm
+STR_0023_RUBBER.g :Kummi
STR_0023_RUBBER.genitiiv :Kummi
STR_0024_SUGAR :Suhkur
+STR_0024_SUGAR.g :Suhkru
STR_0024_SUGAR.genitiiv :Suhkru
STR_0025_TOYS :Mänguasjad
+STR_0025_TOYS.g :Mänguasjade
STR_0025_TOYS.genitiiv :Mänguasjade
STR_0026_CANDY :Maiustused
+STR_0026_CANDY.g :Maiustuste
STR_0026_CANDY.genitiiv :Maiustuste
STR_0027_COLA :Koola
+STR_0027_COLA.g :Koola
STR_0027_COLA.genitiiv :Koola
STR_0028_COTTON_CANDY :Suhkruvatt
+STR_0028_COTTON_CANDY.g :Suhkruvati
STR_0028_COTTON_CANDY.genitiiv :Suhkruvati
STR_0029_BUBBLES :Mullid
+STR_0029_BUBBLES.g :Mullide
STR_0029_BUBBLES.genitiiv :Mullide
STR_002A_TOFFEE :Iiris
+STR_002A_TOFFEE.g :Iirise
STR_002A_TOFFEE.genitiiv :Iirise
STR_002B_BATTERIES :Patareid
+STR_002B_BATTERIES.g :Patareide
STR_002B_BATTERIES.genitiiv :Patareide
STR_002C_PLASTIC :Plastmass
+STR_002C_PLASTIC.g :Plastmassi
STR_002C_PLASTIC.genitiiv :Plastmassi
STR_002D_FIZZY_DRINKS :Kihisevad joogid
+STR_002D_FIZZY_DRINKS.g :Kihisevate jookide
STR_002D_FIZZY_DRINKS.genitiiv :Kihisevate jookide
STR_002E :
STR_002F_PASSENGER :Reisija
+STR_002F_PASSENGER.g :Reisijate
STR_002F_PASSENGER.genitiiv :Reisijate
STR_0030_COAL :Kivisüsi
+STR_0030_COAL.g :Kivisöe
STR_0030_COAL.genitiiv :Kivisöe
STR_0031_MAIL :Post
+STR_0031_MAIL.g :Posti
STR_0032_OIL :Nafta
+STR_0032_OIL.g :Nafta
STR_0032_OIL.genitiiv :Nafta
STR_0033_LIVESTOCK :Kariloom
-STR_0033_LIVESTOCK.genitiiv :Kariloomade
+STR_0033_LIVESTOCK.g :Kariloomade
STR_0034_GOODS :Kaubad
+STR_0034_GOODS.g :Kaupade
STR_0034_GOODS.genitiiv :Kaupade
STR_0035_GRAIN :Teravili
+STR_0035_GRAIN.g :Teravilja
STR_0035_GRAIN.genitiiv :Teravilja
STR_0036_WOOD :Puit
+STR_0036_WOOD.g :Puidu
STR_0036_WOOD.genitiiv :Puidu
STR_0037_IRON_ORE :Rauamaak
+STR_0037_IRON_ORE.g :Rauamaagi
STR_0037_IRON_ORE.genitiiv :Rauamaagi
STR_0038_STEEL :Teras
+STR_0038_STEEL.g :Terase
STR_0038_STEEL.genitiiv :Terase
STR_0039_VALUABLES :Väärisesemed
+STR_0039_VALUABLES.g :Väärisesemete
STR_0039_VALUABLES.genitiiv :Väärisesemete
STR_003A_COPPER_ORE :Vasemaak
+STR_003A_COPPER_ORE.g :Vasemaagi
STR_003A_COPPER_ORE.genitiiv :Vasemaagi
STR_003B_MAIZE :Mais
+STR_003B_MAIZE.g :Maisi
STR_003C_FRUIT :Puuviljad
+STR_003C_FRUIT.g :Puuviljade
STR_003C_FRUIT.genitiiv :Puuviljade
STR_003D_DIAMOND :Teemant
+STR_003D_DIAMOND.g :Teemantite
STR_003D_DIAMOND.genitiiv :Teemantite
STR_003E_FOOD :Toit
+STR_003E_FOOD.g :Toidu
STR_003E_FOOD.genitiiv :Toidu
STR_003F_PAPER :Paber
+STR_003F_PAPER.g :Paberi
STR_003F_PAPER.genitiiv :Paberi
STR_0040_GOLD :Kuld
+STR_0040_GOLD.g :Kulla
STR_0040_GOLD.genitiiv :Kulla
STR_0041_WATER :Vesi
+STR_0041_WATER.g :Vee
STR_0041_WATER.genitiiv :Vee
STR_0042_WHEAT :Nisu
+STR_0042_WHEAT.g :Nisu
STR_0042_WHEAT.genitiiv :Nisu
STR_0043_RUBBER :Kumm
+STR_0043_RUBBER.g :kummi
STR_0043_RUBBER.genitiiv :Kummi
STR_0044_SUGAR :Suhkur
+STR_0044_SUGAR.g :Suhkru
STR_0044_SUGAR.genitiiv :Suhkru
STR_0045_TOY :Mänguasjad
STR_0045_TOY.genitiiv :Mänguasjade
@@ -160,7 +202,7 @@
STR_QUANTITY_GOLD :{COMMA} kotitäi{P s t} kulda
STR_QUANTITY_WATER :{VOLUME} vett
STR_QUANTITY_WHEAT :{WEIGHT} nisu
-STR_QUANTITY_RUBBER :{VOLUME} Kummi
+STR_QUANTITY_RUBBER :{VOLUME} kummi
STR_QUANTITY_SUGAR :{WEIGHT} suhkrut
STR_QUANTITY_TOYS :{COMMA} mänguas{P i ja}
STR_QUANTITY_SWEETS :{COMMA} kontitäi{P s t} maiustusi
@@ -214,9 +256,9 @@
STR_POPUP_CAUTION_CAPTION :{WHITE}Ettevaatust!
STR_00B4_CAN_T_DO_THIS :{WHITE}Seda ei saa teha....
STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Seda ala ei saa puhastada....
-STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Originaali autoriõigus {COPYRIGHT} 1995 Chris Sawyer, Kõik õigused kaitstud
+STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Originaali autorikaitse {COPYRIGHT} 1995 Chris Sawyer, kõik õigused kaitstud
STR_00B7_VERSION :{BLACK}OpenTTD versioon {REV}
-STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2006 OpenTTD tiim
+STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2006 OpenTTD meeskond
STR_TRANSLATED_BY :{BLACK} Tõlgi(d) -
STR_00C5 :{BLACK}{CROSS}
@@ -270,9 +312,9 @@
STR_00F5_TRAINS :{BLACK}{TINYFONT}Rongid
STR_00F6_ROAD_VEHICLES :{BLACK}{TINYFONT}Maanteesõidukid
STR_00F7_SHIPS :{BLACK}{TINYFONT}Laevad
-STR_00F8_AIRCRAFT :{BLACK}{TINYFONT}Õhusõiduk
+STR_00F8_AIRCRAFT :{BLACK}{TINYFONT}Õhusõidukid
STR_00F9_TRANSPORT_ROUTES :{BLACK}{TINYFONT}Veoliinid
-STR_00FA_COAL_MINE :{BLACK}{TINYFONT}Kivisöe kaevandus
+STR_00FA_COAL_MINE :{BLACK}{TINYFONT}Kivisöekaevandus
STR_00FB_POWER_STATION :{BLACK}{TINYFONT}Elektrijaam
STR_00FC_FOREST :{BLACK}{TINYFONT}Mets
STR_00FD_SAWMILL :{BLACK}{TINYFONT}Saeveski
@@ -290,7 +332,7 @@
STR_0109_DIAMOND_MINE :{BLACK}{TINYFONT}Teemantikaevandus
STR_010A_COPPER_ORE_MINE :{BLACK}{TINYFONT}Vasemaagi kaevandus
STR_010B_FRUIT_PLANTATION :{BLACK}{TINYFONT}Puuviljaistandus
-STR_010C_RUBBER_PLANTATION :{BLACK}{TINYFONT}Kummipuu istandus
+STR_010C_RUBBER_PLANTATION :{BLACK}{TINYFONT}Kummipuuistandus
STR_010D_WATER_SUPPLY :{BLACK}{TINYFONT}Veepumbad
STR_010E_WATER_TOWER :{BLACK}{TINYFONT}Veetorn
STR_010F_LUMBER_MILL :{BLACK}{TINYFONT}Saeveski
@@ -312,7 +354,7 @@
STR_011F_DOCK :{BLACK}{TINYFONT}Sadam
STR_0120_ROUGH_LAND :{BLACK}{TINYFONT}Konarlik maa
STR_0121_GRASS_LAND :{BLACK}{TINYFONT}Muru
-STR_0122_BARE_LAND :{BLACK}{TINYFONT}Paljas maa
+STR_0122_BARE_LAND :{BLACK}{TINYFONT}Lage maa
STR_0123_FIELDS :{BLACK}{TINYFONT}Põllud
STR_0124_TREES :{BLACK}{TINYFONT}Puud
STR_0125_ROCKS :{BLACK}{TINYFONT}Kivid
@@ -327,8 +369,8 @@
STR_012E_CANCEL :{BLACK}Loobu
STR_012F_OK :{BLACK}OK
STR_0130_RENAME :{BLACK}Nime muutmine
-STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Liiga palu nimesid on määratletud
-STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Nimi on juba kasutusel
+STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Liiga palju määratletud nimesid
+STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Valitud nimi on juba kasutusel
STR_0133_WINDOWS :Windows
STR_0134_UNIX :Unix
@@ -348,7 +390,7 @@
STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Rongi kogumahutavus:
STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
-STR_0140_NEW_GAME :{BLACK}Uus mäng
+STR_0140_NEW_GAME :{BLACK}Alusta mängu
STR_0141_LOAD_GAME :{BLACK}Laadi mängu
STR_SINGLE_PLAYER :{BLACK}Üksikmängija
STR_MULTIPLAYER :{BLACK}Võrgumäng
@@ -416,7 +458,7 @@
STR_015D_LOAD_GAME :Laadi mäng
STR_015E_QUIT_GAME :Lahku mängust
STR_015F_QUIT :Välju
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Oled sa kindel, et tahad sellest mängust lahkuda?
+STR_ABANDON_GAME_QUERY :{YELLOW}Oled sa kindel, et tahad sellest mängust lahkuda?
STR_0161_QUIT_GAME :{WHITE}Mängust lahkumine
STR_SORT_ORDER_TIP :{BLACK}Sorteerimise järjekorra valimine (kahanev/kasvav)
STR_SORT_CRITERIA_TIP :{BLACK}Sorteerimistingimuse valimine
@@ -428,7 +470,7 @@
STR_SORT_BY_TRANSPORTED :{BLACK}Transporditud
STR_SORT_BY_NAME :{BLACK}Nimi
STR_SORT_BY_DROPDOWN_NAME :Nimi
-STR_SORT_BY_DATE :{BLACK}Kuupäev
+STR_SORT_BY_DATE :{BLACK}Daatum
STR_SORT_BY_NUMBER :Number
STR_SORT_BY_PROFIT_LAST_YEAR :Eelmise aasta kasum
STR_SORT_BY_PROFIT_THIS_YEAR :Selle aasta kasum
@@ -462,18 +504,18 @@
STR_SEND_FOR_SERVICING :Saada teenindusse
############ range for months starts
-STR_0162_JAN :Jaan
-STR_0163_FEB :Veebr
-STR_0164_MAR :Märts
-STR_0165_APR :Apr
-STR_0166_MAY :Mai
-STR_0167_JUN :Juuni
-STR_0168_JUL :Juuli
-STR_0169_AUG :Aug
-STR_016A_SEP :Sept
-STR_016B_OCT :Okt
-STR_016C_NOV :Nov
-STR_016D_DEC :Dets
+STR_0162_JAN :jaan
+STR_0163_FEB :veebr
+STR_0164_MAR :märts
+STR_0165_APR :apr
+STR_0166_MAY :mai
+STR_0167_JUN :juuni
+STR_0168_JUL :juuli
+STR_0169_AUG :aug
+STR_016A_SEP :sept
+STR_016B_OCT :okt
+STR_016C_NOV :nov
+STR_016D_DEC :dets
############ range for months ends
STR_016E :{TINYFONT}{STRING}{} {STRING}
@@ -685,7 +727,7 @@
STR_022E_LANDSCAPE_GENERATION :{BLACK}Maastiku loomine
STR_022F_TOWN_GENERATION :{BLACK}Linnade loomine
STR_0230_INDUSTRY_GENERATION :{BLACK}Tööstuste loomine
-STR_0231_ROAD_CONSTRUCTION :{BLACK}Tee-ehitus
+STR_0231_ROAD_CONSTRUCTION :{BLACK}Teede ehitamine
STR_0233_TOWN_GENERATION :{WHITE}Linnade loomine
STR_0234_NEW_TOWN :{BLACK}Uus linn
STR_0235_CONSTRUCT_NEW_TOWN :{BLACK}Ehita uus linn
@@ -793,9 +835,9 @@
STR_0298_LOAD_SCENARIO :{WHITE}Laadi stsenaariumit
STR_0299_SAVE_SCENARIO :{WHITE}Salvesta stsenaarium
STR_029A_PLAY_SCENARIO :{BLACK}Mängi stsenaariumit
-STR_PLAY_HEIGHTMAP :{BLACK}Mängi Kõrguskaarti
+STR_PLAY_HEIGHTMAP :{BLACK}Mängi kõrguskaardil
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Alusta uut mängu kasutades kõrguskaarti maastikuna
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Kas sa oled kindel, et sa tahad kaardi tegemise lõpetada?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Kas sa oled kindel, et sa tahad kaardi tegemise lõpetada?
STR_029C_QUIT_EDITOR :{WHITE}Lahku redaktorist
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...saab ainult ehitada linna, mille rahvastikuarv ületab 1200
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Liiguta algusaega aasta võrra tagasi
@@ -988,9 +1030,9 @@
STR_OPTIONS_FULLSCREEN :{BLACK}Täisekraan
STR_OPTIONS_FULLSCREEN_TIP :{BLACK}Märgistades selle kasti, toimub mäng täisekraanis
-STR_OPTIONS_RES :{BLACK}Ekraani resolutsioon
+STR_OPTIONS_RES :{BLACK}Kuvari eraldusvõime
STR_OPTIONS_RES_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_OPTIONS_RES_TIP :{BLACK}Ekraani resolutsiooni valimine
+STR_OPTIONS_RES_TIP :{BLACK}Kuvari eraldusvõime valimine
STR_OPTIONS_SCREENSHOT_FORMAT :{BLACK}Ekraanitõmmise formaat
STR_OPTIONS_SCREENSHOT_FORMAT_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
@@ -1114,9 +1156,9 @@
STR_CONFIG_PATCHES_INVISIBLE_TREES :{LTBLUE}Nähtamatud puud (läbipaistvate ehitistega): {ORANGE}{STRING}
STR_CONFIG_PATCHES_LAND_GENERATOR :{LTBLUE}Maaala Generaator: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LAND_GENERATOR_ORIGINAL :Orginaalne
+STR_CONFIG_PATCHES_LAND_GENERATOR_ORIGINAL :Algupärane
STR_CONFIG_PATCHES_LAND_GENERATOR_TERRA_GENESIS :TerraGenesis
-STR_CONFIG_PATCHES_OIL_REF_EDGE_DISTANCE :{LTBLUE}Maks. distants kaardi äärest Õli puurkaevudele {ORANGE}{STRING}
+STR_CONFIG_PATCHES_OIL_REF_EDGE_DISTANCE :{LTBLUE}Suurim kaugus kaardi äärest nafta puuraukudeni {ORANGE}{STRING}
STR_CONFIG_PATCHES_SNOWLINE_HEIGHT :{LTBLUE}Lumepiiri kõrgus: {ORANGE}{STRING}
STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN :{LTBLUE}Maa mägisus (TerraGenesis ainult) : {ORANGE}{STRING}
STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH :Väga sile
@@ -1125,7 +1167,7 @@
STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_ROUGH :Väga mägine
STR_CONFIG_PATCHES_TREE_PLACER :{LTBLUE}Puude panemis süsteem: {ORANGE}{STRING}
STR_CONFIG_PATCHES_TREE_PLACER_NONE :Pole
-STR_CONFIG_PATCHES_TREE_PLACER_ORIGINAL :Orginaalne
+STR_CONFIG_PATCHES_TREE_PLACER_ORIGINAL :Algupärane
STR_CONFIG_PATCHES_TREE_PLACER_IMPROVED :Täiustatud
STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION :{LTBLUE}Kõrgustekaardi pööramine: {ORANGE}{STRING}
STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE :Vastu-päevapidi
@@ -1170,7 +1212,7 @@
STR_CONFIG_PATCHES_COLORED_NEWS_YEAR :{LTBLUE}Värvilised uudised ilmuvad aastast {ORANGE}{STRING}
STR_CONFIG_PATCHES_STARTING_YEAR :{LTBLUE}Alustamise aeg: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_YEAR :{LTBLUE}Mäng lõpeb aastal: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ENDING_YEAR :{LTBLUE}Mäng lõppeb aastal: {ORANGE}{STRING}
STR_CONFIG_PATCHES_SMOOTH_ECONOMY :{LTBLUE}Luba sujuv majandus (väiksemad muutused)
STR_CONFIG_PATCHES_ALLOW_SHARES :{LTBLUE}Luba teiste ettevõtete aktsiate ostmine
STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY :{LTBLUE}Venitades paigutatud signaaltulede tihedus: {ORANGE}{STRING} ühik(ut)
@@ -1380,14 +1422,14 @@
STR_NETWORK_SELECT_MAP :{BLACK}Vali kaart:
STR_NETWORK_SELECT_MAP_TIP :{BLACK}Millist kaarti sa tahad mängida?
STR_NETWORK_NUMBER_OF_CLIENTS :{BLACK}Maksimaalne klientide arv:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP :{BLACK}Maksimaalse klientide arvu valminine. Mängijaid võib olla ka sellest vähem
+STR_NETWORK_NUMBER_OF_CLIENTS_TIP :{BLACK}Määra suurim klientide arv. Kõik vabad kohad ei pea täidetud olema
STR_NETWORK_COMBO1 :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
STR_NETWORK_LAN :kohtvõrk (LAN)
STR_NETWORK_INTERNET :Internet
STR_NETWORK_LAN_INTERNET :LAN / Internet
STR_NETWORK_INTERNET_ADVERTISE :Internet (reklaami)
STR_NETWORK_COMBO2 :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_0_PLAYERS :0 mängjat
+STR_NETWORK_0_PLAYERS :0 mängijat
STR_NETWORK_1_PLAYERS :1 mängija
STR_NETWORK_2_PLAYERS :2 mängijat
STR_NETWORK_3_PLAYERS :3 mängijat
@@ -1451,7 +1493,7 @@
STR_NETWORK_CONNECTING_1 :{BLACK}(1/6) Ühendan...
STR_NETWORK_CONNECTING_2 :{BLACK}(2/6) Kontrollin õigusi...
STR_NETWORK_CONNECTING_3 :{BLACK}(3/6) Ootel...
-STR_NETWORK_CONNECTING_4 :{BLACK}(4/6) Kaardi laadimine...
+STR_NETWORK_CONNECTING_4 :{BLACK}(4/6) kaardi allalaadimine...
STR_NETWORK_CONNECTING_5 :{BLACK}(5/6) Andmete töötlemine...
STR_NETWORK_CONNECTING_6 :{BLACK}(6/6) Registreerimine...
@@ -1576,7 +1618,7 @@
STR_1005_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Sobiv rongitee puudub
STR_1007_ALREADY_BUILT :{WHITE}...juba ehitatud
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Raudtee tuleb eelnevalt eemaldada
-STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Raudtee-ehitus
+STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Raudteede ehitamine
STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Elektriraudtee ehitus
STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Monorelsi ehitus
STR_100C_MAGLEV_CONSTRUCTION :{WHITE}MagLevi ehitus
@@ -1613,8 +1655,8 @@
##id 0x1800
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Enne on vaja maantee eemaldada
-STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Tee-ehitus käib
-STR_1802_ROAD_CONSTRUCTION :{WHITE}Tee-ehitus
+STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Teede ehitamine
+STR_1802_ROAD_CONSTRUCTION :{WHITE}Teede ehitamine
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Vali sillatüüp
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Siia ei saa maanteed ehitada...
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Siit ei saa maanteed eemaldada...
@@ -1622,7 +1664,7 @@
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Siia ei saa depood ehitada...
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Siia ei saa bussijaama ehitada...
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Siia ei saa laadimisplatsi ehitada...
-STR_180A_ROAD_CONSTRUCTION :Teede ehitamine
+STR_180A_ROAD_CONSTRUCTION :Teeehitus
STR_180B_BUILD_ROAD_SECTION :{BLACK}Ehita tee osa
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Depoo ehitamine (sõidukite ehitamiseks ja hooldamiseks)
STR_180D_BUILD_BUS_STATION :{BLACK}Ehita bussijaam
@@ -1685,7 +1727,7 @@
STR_202B_SERVICES_ALREADY_SUBSIDISED :{BLACK}Juba toetatavad teenused
STR_202C_FROM_TO :{ORANGE}{STRING} kohast {STATION} kohta {STATION}{YELLOW} ({COMPANY}
STR_202D_UNTIL :{YELLOW}, kuni {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Toetuse pakkumine lõppes:{}{}Transporditeenuse {STRING} kohast {STRING} kohta {STRING} eest ei maksta enam toetusi.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED :{BLACK}{BIGFONT}Toetuse pakkumine lõppes: {}{}transporditeenuse {STRING} kohast {STRING} kohta {STRING} eest ei maksta enam toetusi.
STR_202F_SUBSIDY_WITHDRAWN_SERVICE :{BLACK}{BIGFONT}Toetuse maksmise aeg sai läbi:{}{}{STRING}kohast {STATION} kohta {STATION} eest ei maksta enam edaspidi toetust.
STR_2030_SERVICE_SUBSIDY_OFFERED :{BLACK}{BIGFONT}Transporditeenusele pakutakse toetust:{}{}{STRING} kohast {STRING} kohta {STRING}. Esimesele, kes teenust pakkuma hakkab, makstakse aasta läbi toetusi!
STR_2031_SERVICE_SUBSIDY_AWARDED :{BLACK}{BIGFONT}Teenusetoetust makstakse ettevõttele {COMPANY}!{}{}{STRING} kohast {STATION} kohta {STATION} teenuse eest makstakse järgmisel aastal 50% rohkem!
@@ -1725,7 +1767,7 @@
STR_2052_FUND_THE_CONSTRUCTION_OF :{WHITE}{STRING}{}{YELLOW} Uute ärihoonete ehitamise rahastamine selles linnas.{} Hind: {CURRENCY}
STR_2053_BUY_1_YEAR_S_EXCLUSIVE :{WHITE}{STRING}{}{YELLOW} Üheks aastaks monopoolsete transpordiõiguste ostmine selles linnas. Linna võimud lubavad reisijate ja kauba veoks kasutada ainult sinu jaamasid.{} Hind: {CURRENCY}
STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC :{WHITE}{STRING}{}{YELLOW} Linnavõimudele ettevõtu reitingu tõstmise eesmärgil altkäemaksu pakkumine. Vahele jäädes korral tuleb trahvi maksta.{} Hind: {CURRENCY}
-STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING :{BIGFONT}{BLACK}Liikluskaos linnas {TOWN}!{}{}Ettevõtte {COMPANY} poolt rahastatav tee-ehituse programm tekitab 6 kuud häireid liikluses maanteedel!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING :{BIGFONT}{BLACK}Liikluskaos linnas {TOWN}!{}{}Ettevõtte {COMPANY} poolt rahastatud teedeehitus tekitab 6 kuu jooksul maanteedel liiklushäireid!
STR_2056 :{TINYFONT}{WHITE}{TOWN}
STR_2057 :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_2058_UNDER_CONSTRUCTION :{STRING} (ehitusel)
@@ -2056,7 +2098,7 @@
STR_680B_VEHICLE_RUNNING_COSTS :{LTBLUE}Sõidukite hoolduskulud: {ORANGE}{STRING}
STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR :{LTBLUE}Konkurentide ehituskiirus: {ORANGE}{STRING}
STR_680D_INTELLIGENCE_OF_COMPETITORS :{LTBLUE}Konkurentide intelligentsus: {ORANGE}{STRING}
-STR_680E_VEHICLE_BREAKDOWNS :{LTBLUE}Sõidukite katkiminemine: {ORANGE}{STRING}
+STR_680E_VEHICLE_BREAKDOWNS :{LTBLUE}Sõidukite lagunemine: {ORANGE}{STRING}
STR_680F_SUBSIDY_MULTIPLIER :{LTBLUE}Subsiidiumi suurus: {ORANGE}{STRING}
STR_6810_COST_OF_CONSTRUCTION :{LTBLUE}Ehitamise hind: {ORANGE}{STRING}
STR_6811_TERRAIN_TYPE :{LTBLUE}Maastiku tüüp: {ORANGE}{STRING}
@@ -2069,7 +2111,7 @@
STR_26816_NONE :Pole
STR_6816_LOW :Madal
-STR_6817_NORMAL :Normaalne
+STR_6817_NORMAL :Harilik
STR_6818_HIGH :Kõrge
STR_6819 :{BLACK}{SMALLLEFTARROW}
STR_681A :{BLACK}{SMALLRIGHTARROW}
@@ -2084,7 +2126,7 @@
STR_6822_HIGH :Kõrge
STR_6823_NONE :Puudub
STR_6824_REDUCED :Vähendatud
-STR_6825_NORMAL :Normaalne
+STR_6825_NORMAL :Harilik
STR_6826_X1_5 :1,5x
STR_6827_X2 :2x
STR_6828_X3 :3x
@@ -2111,7 +2153,7 @@
##id 0x7000
STR_7000 :
STR_7001 :{WHITE}{COMPANY}{BLACK}{PLAYERNAME}
-STR_7002_PLAYER :(Mängija {COMMA})
+STR_7002_PLAYER :(mängija {COMMA})
STR_7004_NEW_FACE :{BLACK}Uus nägu
STR_7005_COLOR_SCHEME :{BLACK}Värvivalik
STR_7006_COLOR_SCHEME :{GOLD}Värvivalik:
@@ -2122,7 +2164,7 @@
STR_700B_PRESIDENT_S_NAME :Presidendi nimi
STR_700C_CAN_T_CHANGE_COMPANY_NAME :{WHITE}Ei saa ettevõtte nime muuta...
STR_700D_CAN_T_CHANGE_PRESIDENT :{WHITE}Ei saa presidendi nime muuta...
-STR_700E_FINANCES :{WHITE}{COMPANY} Finantsid{BLACK}{PLAYERNAME}
+STR_700E_FINANCES :{WHITE}{COMPANY} finantsaruanne {BLACK}{PLAYERNAME}
STR_700F_EXPENDITURE_INCOME :{WHITE}Kulud/Tulud
STR_7010 :{WHITE}{NUM}
STR_7011_CONSTRUCTION :{GOLD}Ehitamine
@@ -2167,7 +2209,7 @@
STR_7036_REPAY_PART_OF_LOAN :{BLACK}Maksa laen osaliselt tagasi
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(President)
STR_7038_INAUGURATED :{GOLD}Asutatud: {WHITE}{NUM}
-STR_7039_VEHICLES :{GOLD}Sõidukid:
+STR_7039_VEHICLES :{GOLD}Sõidukeid:
STR_TRAINS :{WHITE}{COMMA} rong{P "" i}
STR_ROAD_VEHICLES :{WHITE}{COMMA} veoki {P "" s}
STR_AIRCRAFT :{WHITE}{COMMA} lennuk
@@ -2205,7 +2247,7 @@
STR_7060_CAN_T_BUY_COMPANY :{WHITE}Ettevõtet ei saa osta...
STR_7061_CARGO_PAYMENT_RATES :{WHITE}Veoste hinnagraafik
STR_7062_DAYS_IN_TRANSIT :{BLACK}{TINYFONT}Päevi teel
-STR_7063_PAYMENT_FOR_DELIVERING :{BLACK}{TINYFONT}Makstav summa 10 ühiku (või 10'000 liitri) veoste veo eest iga 20 ruudu kohta
+STR_7063_PAYMENT_FOR_DELIVERING :{BLACK}{TINYFONT}Makstav summa 10 ühiku (või 10'000 liitri) veo eest iga 20 ruudu kohta
STR_7064_TOGGLE_GRAPH_FOR_CARGO :{BLACK}Lülita veoste graafik sisse/välja
STR_7065 :{BLACK}{TINYFONT}{STRING}
STR_7066_ENGINEER :Insener
@@ -2249,9 +2291,9 @@
STR_LIVERY_MAGLEV :Maglev'i Mootor
STR_LIVERY_DMU :DMU
STR_LIVERY_EMU :EMU
-STR_LIVERY_PASSENGER_WAGON_STEAM :Reisijate Vagun (Aur)
-STR_LIVERY_PASSENGER_WAGON_DIESEL :Reisijate Vagun (Diisel)
-STR_LIVERY_PASSENGER_WAGON_ELECTRIC :Reisijate Vagun(Elektriline)
+STR_LIVERY_PASSENGER_WAGON_STEAM :Reisivagun (auru)
+STR_LIVERY_PASSENGER_WAGON_DIESEL :Reisivagun (diisel)
+STR_LIVERY_PASSENGER_WAGON_ELECTRIC :Reisivagun (elektri)
STR_LIVERY_FREIGHT_WAGON :Kaubavagun
STR_LIVERY_BUS :Buss
STR_LIVERY_TRUCK :Veoauto
@@ -2298,95 +2340,95 @@
STR_8018_SH_40_ELECTRIC :SH '40' (Elektrivedur)
STR_8019_T_I_M_ELECTRIC :'T.I.M.' (Elektrivedur)
STR_801A_ASIASTAR_ELECTRIC :'AsiaStar' (Elektrivedur)
-STR_801B_PASSENGER_CAR :Reisiate Vagun
+STR_801B_PASSENGER_CAR :Reisivagun
STR_801C_MAIL_VAN :Postivagun
STR_801D_COAL_CAR :Söevagun
-STR_801E_OIL_TANKER :Õli Tanker
-STR_801F_LIVESTOCK_VAN :Kariloomade Vagun
+STR_801E_OIL_TANKER :Naftatanker
+STR_801F_LIVESTOCK_VAN :Kariloomade veok
STR_8020_GOODS_VAN :Kaubavagun
STR_8021_GRAIN_HOPPER :Teraviljavagun
-STR_8022_WOOD_TRUCK :Puiduveo Vagun
-STR_8023_IRON_ORE_HOPPER :Rauamaagi Vagun
-STR_8024_STEEL_TRUCK :Terase Vagun
+STR_8022_WOOD_TRUCK :Puiduveok
+STR_8023_IRON_ORE_HOPPER :Rauamaagi vagun
+STR_8024_STEEL_TRUCK :Teraseveok
STR_8025_ARMORED_VAN :Soomusvagun
STR_8026_FOOD_VAN :Toiduvagun
STR_8027_PAPER_TRUCK :Paberivagun
-STR_8028_COPPER_ORE_HOPPER :Vasemaagi Vagun
+STR_8028_COPPER_ORE_HOPPER :Vasemaagi vagun
STR_8029_WATER_TANKER :Vee Tanker
-STR_802A_FRUIT_TRUCK :Puuvilja Vagun
-STR_802B_RUBBER_TRUCK :Kummi Vagun
-STR_802C_SUGAR_TRUCK :Suhkru Vagun
-STR_802D_COTTON_CANDY_HOPPER :Suhkruvati Vagun
-STR_802E_TOFFEE_HOPPER :Iirise Vagun
-STR_802F_BUBBLE_VAN :Mullide Vagun
-STR_8030_COLA_TANKER :Koola Vagun
-STR_8031_CANDY_VAN :Maiustuste Vagun
-STR_8032_TOY_VAN :Mänguasjade Vagun
-STR_8033_BATTERY_TRUCK :Patareide Vagun
-STR_8034_FIZZY_DRINK_TRUCK :Kihisevate Jookide Vagun
-STR_8035_PLASTIC_TRUCK :Plastiku Vagun
+STR_802A_FRUIT_TRUCK :Puuviljavagun
+STR_802B_RUBBER_TRUCK :Kummivagun
+STR_802C_SUGAR_TRUCK :Suhkruvagun
+STR_802D_COTTON_CANDY_HOPPER :Suhkruvati vagun
+STR_802E_TOFFEE_HOPPER :Iirisevagun
+STR_802F_BUBBLE_VAN :Mullivagun
+STR_8030_COLA_TANKER :Koolavagun
+STR_8031_CANDY_VAN :Maiustuste vagun
+STR_8032_TOY_VAN :Mänguasjavagun
+STR_8033_BATTERY_TRUCK :Patareivagun
+STR_8034_FIZZY_DRINK_TRUCK :Kihisevate jookide vagun
+STR_8035_PLASTIC_TRUCK :Plastiku vagun
STR_8036_X2001_ELECTRIC :'X2001' (Elektri)
STR_8037_MILLENNIUM_Z1_ELECTRIC :'Millennium Z1' (Elektri)
STR_8038_WIZZOWOW_Z99 :Wizzowow Z99
-STR_8039_PASSENGER_CAR :Reisijate Vagun
+STR_8039_PASSENGER_CAR :Reisivagun
STR_803A_MAIL_VAN :Postivagun
-STR_803B_COAL_CAR :Kivisöe Vagun
-STR_803C_OIL_TANKER :Õli Tanker
-STR_803D_LIVESTOCK_VAN :Kariloomade Vagun
+STR_803B_COAL_CAR :Kivisöe vagun
+STR_803C_OIL_TANKER :Naftatanker
+STR_803D_LIVESTOCK_VAN :Kariloomade vagun
STR_803E_GOODS_VAN :Kaubavagun
-STR_803F_GRAIN_HOPPER :Teravilja Vagun
-STR_8040_WOOD_TRUCK :Puidu Vagun
-STR_8041_IRON_ORE_HOPPER :Rauamaagi Vagun
-STR_8042_STEEL_TRUCK :Terase Vagun
+STR_803F_GRAIN_HOPPER :Teravilja vagun
+STR_8040_WOOD_TRUCK :Puidu vagun
+STR_8041_IRON_ORE_HOPPER :Rauamaagi vagun
+STR_8042_STEEL_TRUCK :Terase vagun
STR_8043_ARMORED_VAN :Soomusvagun
-STR_8044_FOOD_VAN :Toidu Vagun
-STR_8045_PAPER_TRUCK :Paberi Vagun
-STR_8046_COPPER_ORE_HOPPER :Vasemaagi Vagun
+STR_8044_FOOD_VAN :Toidu vagun
+STR_8045_PAPER_TRUCK :Paberi vagun
+STR_8046_COPPER_ORE_HOPPER :Vasemaagi vagun
STR_8047_WATER_TANKER :Vee Tanker
-STR_8048_FRUIT_TRUCK :Puuvilja Vagun
-STR_8049_RUBBER_TRUCK :Kummi Vagun
+STR_8048_FRUIT_TRUCK :Puuvilja vagun
+STR_8049_RUBBER_TRUCK :Kummi vagun
STR_804A_SUGAR_TRUCK :Suhkruvagun
-STR_804B_COTTON_CANDY_HOPPER :Suhkruvati Vagun
+STR_804B_COTTON_CANDY_HOPPER :Suhkruvati vagun
STR_804C_TOFFEE_HOPPER :Iirise vagun
-STR_804D_BUBBLE_VAN :Mullide Vagun
-STR_804E_COLA_TANKER :Koola Vagun
-STR_804F_CANDY_VAN :Maiustuste Vagun
+STR_804D_BUBBLE_VAN :Mullivagun
+STR_804E_COLA_TANKER :Koolatanker
+STR_804F_CANDY_VAN :Maiustuste vagun
STR_8050_TOY_VAN :Mänguasjade vagun
-STR_8051_BATTERY_TRUCK :Patareide Vagun
-STR_8052_FIZZY_DRINK_TRUCK :Kihisevate Jookide Vagun
-STR_8053_PLASTIC_TRUCK :Plastiku Vagun
+STR_8051_BATTERY_TRUCK :Patareivagun
+STR_8052_FIZZY_DRINK_TRUCK :Kihisevate jookide vagun
+STR_8053_PLASTIC_TRUCK :Plastiku vagun
STR_8054_LEV1_LEVIATHAN_ELECTRIC :Lev1 'Leviathan' (Elektri)
STR_8055_LEV2_CYCLOPS_ELECTRIC :Lev2 'Cyclops' (Elektri)
STR_8056_LEV3_PEGASUS_ELECTRIC :Lev3 'Pegasus' (Elektri)
STR_8057_LEV4_CHIMAERA_ELECTRIC :Lev4 'Chimaera' (Elektri)
STR_8058_WIZZOWOW_ROCKETEER :Wizzowow Rocketeer
-STR_8059_PASSENGER_CAR :Reisijate Vagun
+STR_8059_PASSENGER_CAR :Reisivagun
STR_805A_MAIL_VAN :Postivagun
-STR_805B_COAL_CAR :Kivisöe Vagun
-STR_805C_OIL_TANKER :Õli Tanker
-STR_805D_LIVESTOCK_VAN :Kariloomade Vagun
+STR_805B_COAL_CAR :Kivisöe vagun
+STR_805C_OIL_TANKER :Naftatanker
+STR_805D_LIVESTOCK_VAN :Kariloomade vagun
STR_805E_GOODS_VAN :Kaubavagun
-STR_805F_GRAIN_HOPPER :Teravilja Vagun
-STR_8060_WOOD_TRUCK :Puidu Vagun
-STR_8061_IRON_ORE_HOPPER :Rauamaagi Vagun
-STR_8062_STEEL_TRUCK :Terase Vagun
+STR_805F_GRAIN_HOPPER :Teravilja vagun
+STR_8060_WOOD_TRUCK :Puidu vagun
+STR_8061_IRON_ORE_HOPPER :Rauamaagi vagun
+STR_8062_STEEL_TRUCK :Terase vagun
STR_8063_ARMORED_VAN :Soomusvagun
STR_8064_FOOD_VAN :Toiduvagun
STR_8065_PAPER_TRUCK :Paberivagun
-STR_8066_COPPER_ORE_HOPPER :Vasemaagi Vagun
+STR_8066_COPPER_ORE_HOPPER :Vasemaagi vagun
STR_8067_WATER_TANKER :Veetanker
-STR_8068_FRUIT_TRUCK :Puuvilja Vagun
-STR_8069_RUBBER_TRUCK :Kummi Vagun
+STR_8068_FRUIT_TRUCK :Puuvilja vagun
+STR_8069_RUBBER_TRUCK :Kummivagun
STR_806A_SUGAR_TRUCK :Suhkruvagun
-STR_806B_COTTON_CANDY_HOPPER :Suhkruvati Vagun
-STR_806C_TOFFEE_HOPPER :Iirise Vagun
+STR_806B_COTTON_CANDY_HOPPER :Suhkruvati vagun
+STR_806C_TOFFEE_HOPPER :Iirise vagun
STR_806D_BUBBLE_VAN :Mullivagun
STR_806E_COLA_TANKER :Koola Tanker
-STR_806F_CANDY_VAN :Maiustuste Vagun
-STR_8070_TOY_VAN :Mänguasjade Vagun
-STR_8071_BATTERY_TRUCK :Patareide Vagun
-STR_8072_FIZZY_DRINK_TRUCK :Kihisevate Jookide Vagun
-STR_8073_PLASTIC_TRUCK :Plastiku Vagun
+STR_806F_CANDY_VAN :Maiustuste vagun
+STR_8070_TOY_VAN :Mänguasjavagun
+STR_8071_BATTERY_TRUCK :Patareide vagun
+STR_8072_FIZZY_DRINK_TRUCK :Kihisevate jookide vagun
+STR_8073_PLASTIC_TRUCK :Plastiku vagun
STR_8074_MPS_REGAL_BUS :MPS Kuninglik Buss
STR_8075_HEREFORD_LEOPARD_BUS :Herefordi Leopardi Buss
STR_8076_FOSTER_BUS :Foster Buss
@@ -2403,9 +2445,9 @@
STR_8081_MIGHTYMOVER_MAIL_TRUCK :MightyMover Postiauto
STR_8082_POWERNAUGHT_MAIL_TRUCK :Powernaught Postiauto
STR_8083_WIZZOWOW_MAIL_TRUCK :Wizzowow Postiauto
-STR_8084_WITCOMBE_OIL_TANKER :Witcombe Õliveoauto
-STR_8085_FOSTER_OIL_TANKER :Foster Õliveoauto
-STR_8086_PERRY_OIL_TANKER :Perry Õliveoauto
+STR_8084_WITCOMBE_OIL_TANKER :Witcombe naftaveok
+STR_8085_FOSTER_OIL_TANKER :Foster naftaveok
+STR_8086_PERRY_OIL_TANKER :Perry naftaveok
STR_8087_TALBOTT_LIVESTOCK_VAN :Talbott Karjaveoauto
STR_8088_UHL_LIVESTOCK_VAN :Uhl Karjaveoauto
STR_8089_FOSTER_LIVESTOCK_VAN :Foster Karjaveoauto
@@ -2442,9 +2484,9 @@
STR_80A8_BALOGH_FRUIT_TRUCK :Balogh Veeveoauto
STR_80A9_UHL_FRUIT_TRUCK :Uhl Puuviljaveoauto
STR_80AA_KELLING_FRUIT_TRUCK :Kelling Puuviljaveoauto
-STR_80AB_BALOGH_RUBBER_TRUCK :Balogh Kummiveoauto
-STR_80AC_UHL_RUBBER_TRUCK :Uhl Kummiveoauto
-STR_80AD_RMT_RUBBER_TRUCK :RMT Kummiveoauto
+STR_80AB_BALOGH_RUBBER_TRUCK :Balogh kummiveok
+STR_80AC_UHL_RUBBER_TRUCK :Uhl kummiveok
+STR_80AD_RMT_RUBBER_TRUCK :RMT kummiveok
STR_80AE_MIGHTYMOVER_SUGAR_TRUCK :MightyMover Suhkruveoauto
STR_80AF_POWERNAUGHT_SUGAR_TRUCK :Powernaught Suhkruveoauto
STR_80B0_WIZZOWOW_SUGAR_TRUCK :Wizzowow Suhkruveoauto
@@ -2475,8 +2517,8 @@
STR_80C9_MIGHTYMOVER_BUBBLE_TRUCK :MightyMover Mulliveoauto
STR_80CA_POWERNAUGHT_BUBBLE_TRUCK :Powernaught Mulliveoauto
STR_80CB_WIZZOWOW_BUBBLE_TRUCK :Wizzowow Mulliveoauto
-STR_80CC_MPS_OIL_TANKER :MPS Õlitanker
-STR_80CD_CS_INC_OIL_TANKER :CS-Inc. Õlitanker
+STR_80CC_MPS_OIL_TANKER :MPS naftatanker
+STR_80CD_CS_INC_OIL_TANKER :CS-Inc. naftatanker
STR_80CE_MPS_PASSENGER_FERRY :MPS Praam
STR_80CF_FFP_PASSENGER_FERRY :FFP Praam
STR_80D0_BAKEWELL_300_HOVERCRAFT :Bakewell 300 Hõljuk
@@ -2538,7 +2580,7 @@
##id 0x8800
STR_8800_TRAIN_DEPOT :{WHITE}{TOWN} Rongi Depoo
-STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Rahvas rõõmustab. . .{}Esimene rong saabus {STATION}i!
+STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Rahvas rõõmustab. . .{}Esimene rong saabus {STATION} jaama!
STR_8802_DETAILS :{WHITE}{STRING} (Detailid)
STR_8803_TRAIN_IN_THE_WAY :{WHITE}Rong on ees
STR_8804 :{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2572,7 +2614,7 @@
STR_8813_FROM :{LTBLUE}{CARGO} {STATION}'st
STR_FROM_MULT :{LTBLUE}{CARGO} jaamast {STATION} (x{NUM})
STR_8814_TRAIN_IS_WAITING_IN_DEPOT :{WHITE}Rong {COMMA} ootab depoos
-STR_8815_NEW_VEHICLES :{BLACK}Uus Sõiduk
+STR_8815_NEW_VEHICLES :{BLACK}Uus sõiduk
STR_8816 :{BLACK}-
STR_8819_TRAIN_TOO_LONG :{WHITE}Rong on liiga pikk
STR_881A_TRAINS_CAN_ONLY_BE_ALTERED :{WHITE}Ronge saab ainult siis muuta kui nad on peatatud depoo sees
@@ -2658,12 +2700,12 @@
STR_8859_NEW_NOW_AVAILABLE :{BLACK}{BIGFONT}Uus {STRING} on nüüd olemas!
STR_885A :{BLACK}{BIGFONT}{STRING}
STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER :{BLACK}Maksumus: {CURRENCY} Mass: {WEIGHT_S}{}Kiirus: {VELOCITY} Võimsus: {POWER}{}Kulu: {CURRENCY}/aastas{}Mahutus: {CARGO}
-STR_885C_BROKEN_DOWN :{RED}Läks katki
+STR_885C_BROKEN_DOWN :{RED}Lagunes
STR_885D_AGE_RUNNING_COST_YR :{BLACK}Vanus: {LTBLUE}{STRING}{BLACK} Kulud: {LTBLUE}{CURRENCY}/aastas
-STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Mass: {LTBLUE}{WEIGHT_S} {BLACK}Energia: {LTBLUE}{POWER}{BLACK} Maks. Kiirus: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Mass: {LTBLUE}{WEIGHT_S} {BLACK}Võimsus: {LTBLUE}{POWER}{BLACK} Suurim kiirus: {LTBLUE}{VELOCITY}
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Mass: {LTBLUE}{WEIGHT_S} {BLACK}Võimsus: {LTBLUE}{POWER}{BLACK} Max. speed: {LTBLUE}{VELOCITY} {BLACK}Suurim veojõud: {LTBLUE}{FORCE}
STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Selle aasta kasum: {LTBLUE}{CURRENCY} (eelmisel aastal: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}Töötamisusaldus: {LTBLUE}{COMMA}% {BLACK}Katki minekuid eelmisest hooldusest: {LTBLUE}{COMMA}
+STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}Töökindlus: {LTBLUE}{COMMA}% {BLACK}Lagunemisi alates eelmisest hoolduskorrast: {LTBLUE}{COMMA}
STR_8861_STOPPED :{RED}Peatatud
STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL :{WHITE}Ohu korral ei ole võimalik sundida rongi signaali vahele jätma
STR_8863_CRASHED :{RED}Kokkupõrge!
@@ -2697,7 +2739,7 @@
STR_900D_AGE_RUNNING_COST_YR :{BLACK}Vanus: {LTBLUE}{STRING}{BLACK} Hoolduskulud: {LTBLUE}{CURRENCY}/aastas
STR_900E_MAX_SPEED :{BLACK}Maksimaalne kiirus: {LTBLUE}{VELOCITY}
STR_900F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Selle aasta kasum: {LTBLUE}{CURRENCY} (viimasel aastal: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS :{BLACK}Vastupidavus: {LTBLUE}{COMMA}% {BLACK}Katkiminekuid viimasest hooldusest: {LTBLUE}{COMMA}
+STR_9010_RELIABILITY_BREAKDOWNS :{BLACK}Töökindlus: {LTBLUE}{COMMA}% {BLACK}Lagunemisi alates viimasest hooldusest: {LTBLUE}{COMMA}
STR_9011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Ehitatud: {LTBLUE}{NUM}{BLACK} Väärtus: {LTBLUE}{CURRENCY}
STR_9012_CAPACITY :{BLACK}Mahutavus: {LTBLUE}{CARGO}
STR_9013_MUST_BE_STOPPED_INSIDE :{WHITE}...peab garaaþis olema
@@ -2731,9 +2773,9 @@
STR_902C_NAME_ROAD_VEHICLE :{WHITE}Nimeta maanteeveok ümber
STR_902D_CAN_T_NAME_ROAD_VEHICLE :{WHITE}Ei saa maanteveokit ümber nimetada...
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Nimeta maanteeveok ümber
-STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Rahvas rõõmustab . . .{}Esimene buss saabus {STATION}s!
-STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Rahvas rõõmustab . . .{}Esimene maanteesõiduk saabus jaama {STATION}!
-STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Maanteesõiduki kokkupõrge rongiga!{}Juht suri tules peale rongiga kokkupõrget
+STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Rahvas rõõmustab . . .{}Esimene buss saabus {STATION} jaama!
+STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Rahvas rõõmustab . . .{}Esimene maanteesõiduk saabus {STATION} jaama!
+STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Rongikokkupõrge!{}Juht suri peale õnnetust tules
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Maanteesõiduki kokkupõrge rongiga!{}{COMMA} suri tules peale kokkupõrget rongiga
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Maanteesõidukit ei saa ringi pöörata...
STR_ONLY_TURN_SINGLE_UNIT :{WHITE}Sa ei saa pöörata sõidukeid millel on mitu üksust
@@ -2771,7 +2813,7 @@
STR_9812_AGE_RUNNING_COST_YR :{BLACK}Vanus: {LTBLUE}{STRING}{BLACK} Hoolduskulud: {LTBLUE}{CURRENCY}/aastas
STR_9813_MAX_SPEED :{BLACK}Maks. kiirus: {LTBLUE}{VELOCITY}
STR_9814_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Selle aasta kasum: {LTBLUE}{CURRENCY} (viimasel: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS :{BLACK}Vastupidavus: {LTBLUE}{COMMA}% {BLACK}Katkiminemisi alates viimasest hooldusest: {LTBLUE}{COMMA}
+STR_9815_RELIABILITY_BREAKDOWNS :{BLACK}Töökindlus: {LTBLUE}{COMMA}% {BLACK}Lagunemisi alates viimasest hooldusest: {LTBLUE}{COMMA}
STR_9816_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Ehitati: {LTBLUE}{NUM}{BLACK} Väärtus: {LTBLUE}{CURRENCY}
STR_9817_CAPACITY :{BLACK}Mahutavus: {LTBLUE}{CARGO}
STR_9818_CAN_T_STOP_START_SHIP :{WHITE}Ei saa peatada/käivitada laeva...
@@ -2804,7 +2846,7 @@
STR_9831_NAME_SHIP :{WHITE}Anna laevale nimi
STR_9832_CAN_T_NAME_SHIP :{WHITE}Ei saa laeva ümber nimetada...
-STR_9833_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Rahvas rõõmustab . . .{}Esimene laev saabus {STATION}i
+STR_9833_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Rahvas rõõmustab . . .{}Esimene laev saabus {STATION} sadamasse!
STR_9834_POSITION_BUOY_WHICH_CAN :{BLACK}Aseta teemärgisena kasutatav poi
STR_9835_CAN_T_POSITION_BUOY_HERE :{WHITE}Poid ei saa siia asetada...
STR_9836_RENAME :{BLACK}Nimeta ümber
@@ -2841,7 +2883,7 @@
STR_A00D_AGE_RUNNING_COST_YR :{BLACK}Vanus: {LTBLUE}{STRING}{BLACK} Hoolduskulud: {LTBLUE}{CURRENCY}/aastas
STR_A00E_MAX_SPEED :{BLACK}Maks. kiirus: {LTBLUE}{VELOCITY}
STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Selle aasta kasum: {LTBLUE}{CURRENCY} (eelmisel aastal: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS :{BLACK}Vastupidavus: {LTBLUE}{COMMA}% {BLACK}Katkiminemisi viimasest hooldusest: {LTBLUE}{COMMA}
+STR_A010_RELIABILITY_BREAKDOWNS :{BLACK}Töökindlus: {LTBLUE}{COMMA}% {BLACK}Lagunemisi alates viimasest hooldusest: {LTBLUE}{COMMA}
STR_A011_BUILT_VALUE :{LTBLUE}{STRING}{BLACK} Ehitusaasta: {LTBLUE}{NUM}{BLACK} Väärtus: {LTBLUE}{CURRENCY}
STR_A012_CAN_T_SEND_AIRCRAFT_TO :{WHITE}Ei saa lennukit angaari saata...
STR_HEADING_FOR_HANGAR :{ORANGE}Suundub {STATION} Angaari
@@ -3003,20 +3045,7 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Näita kõiki sama sõidukavaga sõidukeid
### depot strings
-
-STR_SELL :{BLACK}Müü
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}Sa müüd hetkel kõik oma autod garaažist
-STR_ARE_YOU_SURE :{BLACK}Kas sa oled kindel?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Kinnita, et sa tahad müüa kõiki ronge jaamast
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Kinnita, et sa tahad müüa kõiki autosi garaažist
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Kinnita, et sa tahad müüa kõiki laevaangaaris olevaid laevu
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Kinnita, et sa tahad müüa kõiki lennukeid angaaris
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}Ära müü kõiki ronge jaamast
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}Ära müü kõiki autosi garaažist
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}Ära müü kõiki laevu sadamast
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Ära müü kõiki lennukeid angaarist
+STR_DEPOT_SELL_CONFIRMATION_TEXT :{YELLOW}Sa oled müümas kõiki depoos asuvaid masinaid. Kas sa oled kindel?
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Müü kõik rongid jaamast
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Müü kõik autod garaažist
@@ -3094,7 +3123,7 @@
STR_PURCHASE_INFO_RUNNINGCOST :{BLACK}Hoodluskulud: {GOLD}{CURRENCY}/aasta
STR_PURCHASE_INFO_CAPACITY :{BLACK}Mahutuvus: {GOLD}{CARGO} {STRING}
STR_PURCHASE_INFO_DESIGNED_LIFE :{BLACK}Kujundatud: {GOLD}{NUM}{BLACK} Vanus: {GOLD}{COMMA} aastat
-STR_PURCHASE_INFO_RELIABILITY :{BLACK}Maks. Vastupidavus: {GOLD}{COMMA}%
+STR_PURCHASE_INFO_RELIABILITY :{BLACK}Suurim töökindlus: {GOLD}{COMMA}%
STR_PURCHASE_INFO_COST :{BLACK}Maksuvus: {GOLD}{CURRENCY}
STR_PURCHASE_INFO_WEIGHT_CWEIGHT :{BLACK}Kaal: {GOLD}{WEIGHT_S} ({WEIGHT_S})
STR_PURCHASE_INFO_COST_SPEED :{BLACK}Maksumus: {GOLD}{CURRENCY}{BLACK} Kiirus: {GOLD}{VELOCITY}
@@ -3120,7 +3149,7 @@
STR_QUANTITY_OF_SEA_LAKES :{BLACK}Merepinna tase:
STR_SMOOTHNESS :{BLACK}Tasapinnalisus:
STR_SNOW_LINE_HEIGHT :{BLACK}Lumepiiri kõrgus:
-STR_DATE :{BLACK}Kuupäev:
+STR_DATE :{BLACK}Algus:
STR_NUMBER_OF_TOWNS :{BLACK}Linnade arv:
STR_NUMBER_OF_INDUSTRIES :{BLACK}Tehaste arv
STR_GENERATE_DATE :{BLACK}{DATE_LONG}
--- a/lang/finnish.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/finnish.txt Mon Jan 01 16:31:13 2007 +0000
@@ -358,7 +358,7 @@
STR_015D_LOAD_GAME :Lataa peli
STR_015E_QUIT_GAME :Lopeta peli
STR_015F_QUIT :Poistu
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Lopetetaanko peli?
+STR_ABANDON_GAME_QUERY :{YELLOW}Lopetetaanko peli?
STR_0161_QUIT_GAME :{WHITE}Lopeta peli
STR_SORT_ORDER_TIP :{BLACK}Valitse järjestys (laskeva/nouseva).
STR_SORT_CRITERIA_TIP :{BLACK}Valitse järjestyskriteeri.
@@ -729,7 +729,7 @@
STR_029A_PLAY_SCENARIO :{BLACK}Pelaa skenaariota
STR_PLAY_HEIGHTMAP :{BLACK}Pelaa korkeuskartta
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Aloita uusi peli, käyttäen korkeuskarttaa maastona
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Lopetetaanko skenaario?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Lopetetaanko skenaario?
STR_029C_QUIT_EDITOR :{WHITE}Sulje muokkain
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...voidaan rakentaa vain kaupunkeihin, joissa on yli 1200 asukasta.
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Siirrä aloituspäivää vuodella taaksepäin.
@@ -2919,21 +2919,6 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Näytä kaikki ajoneuvot, joilla on sama aikataulu
### depot strings
-
-STR_SELL :{BLACK}Myy
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}Olet myymässä kaikki varikolla olevat ajoneuvot.
-STR_ARE_YOU_SURE :{BLACK}Oletko varma?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Vahvista kaikkien varikolla olevien junien myyminen
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Vahvista kaikkien varikolla olevien ajoneuvojen myyminen
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Vahvista kaikkien telakalla olevien laivojen myyminen
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Vahvista että haluat myydä kaikki hallissa olevat ilma-alukset
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}Älä myy kaikkia varikolla olevia junia
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}Älä myy varikolla olevia ajoneuvoja
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}Älä myy telakalla olevia laivoja
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Älä myy hallissa olevia ilma-aluksia
-
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Myy kaikki varikolla olevat junat
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Myy kaikki varikolla olevat ajoneuvot
STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP :{BLACK}Myy kaikki telakalla olevat laivat
--- a/lang/french.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/french.txt Mon Jan 01 16:31:13 2007 +0000
@@ -360,7 +360,7 @@
STR_015D_LOAD_GAME :Charger une partie
STR_015E_QUIT_GAME :Abandonner la partie
STR_015F_QUIT :Quitter le jeu
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Êtes vous sur de vouloir abandonner cette partie?
+STR_ABANDON_GAME_QUERY :{YELLOW}Êtes vous sur de vouloir abandonner cette partie?
STR_0161_QUIT_GAME :{WHITE}Abandonner
STR_SORT_ORDER_TIP :{BLACK}Choisir l'ordre de tri croissant/décroissant
STR_SORT_CRITERIA_TIP :{BLACK}Choisir le critère de tri
@@ -739,7 +739,7 @@
STR_029A_PLAY_SCENARIO :{BLACK}Jouer Scénario
STR_PLAY_HEIGHTMAP :{BLACK}Jouer une carte d'altitude
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Démarrer une nouvelle partie, utilisant une carte d'altitude comme paysage
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Voulez-vous vraiment quitter ce scénario ?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Voulez-vous vraiment quitter ce scénario ?
STR_029C_QUIT_EDITOR :{WHITE}Quitter Éditeur
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...peut seulement être construit dans des villes ayant une population d'au moins 1200 habitants
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Reculer la date de départ d'un an
@@ -1077,7 +1077,7 @@
STR_CONFIG_PATCHES_SE_FLAT_WORLD_HEIGHT :{LTBLUE}Le terrain d'un scénario plat a pour altitude : {ORANGE}{STRING}
STR_CONFIG_PATCHES_STATION_SPREAD :{LTBLUE}Etendue max. des stations: {ORANGE}{STRING} {RED}Attention: Valeur élevée = jeu lent
-STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}Entretenir automatiquement les hélicoptères à l'heliport: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}Entretenir automatiquement les hélicoptères à l'héliport: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Relier la barre d'outils Paysage avec celle des rails/routes/eau et aéroport: {ORANGE}{STRING}
STR_CONFIG_PATCHES_REVERSE_SCROLLING :{LTBLUE}Inverser la direction lors du défilement avec la souris : {ORANGE}{STRING}
STR_CONFIG_PATCHES_MEASURE_TOOLTIP :{LTBLUE}Montrer une infobulle de mesure lors de l'utilisation de divers outils de construction: {ORANGE}{STRING}
@@ -1974,7 +1974,7 @@
STR_SV_STNAME_BRANCH :{STRING} Embranchement
STR_SV_STNAME_UPPER :Haut {STRING}
STR_SV_STNAME_LOWER :Bas {STRING}
-STR_SV_STNAME_HELIPORT :{STRING} Héli-port
+STR_SV_STNAME_HELIPORT :{STRING} Héliport
STR_SV_STNAME_FOREST :{STRING} Forêt
############ end of savegame specific region!
@@ -2468,9 +2468,9 @@
STR_80FA_FLASHBANG_X1 :Flashbang X1
STR_80FB_JUGGERPLANE_M1 :Juggerplane M1
STR_80FC_FLASHBANG_WIZZER :Flashbang Wizzer
-STR_80FD_TRICARIO_HELICOPTER :Tricario Hélicoptère
-STR_80FE_GURU_X2_HELICOPTER :Guru X2 Hélicoptère
-STR_80FF_POWERNAUT_HELICOPTER :Powernaut Hélicoptère
+STR_80FD_TRICARIO_HELICOPTER :Hélicoptère Tricario
+STR_80FE_GURU_X2_HELICOPTER :Hélicoptère Guru X2
+STR_80FF_POWERNAUT_HELICOPTER :Hélicoptère Powernaut
STR_8100_MESSAGE_FROM_VEHICLE_MANUFACTURE :{WHITE}Communiqué du fabriquant d'engins
STR_8101_WE_HAVE_JUST_DESIGNED_A :{GOLD}Nous venons juste d'inventer: {STRING} - Voulez vous l'exclusivité de ce véhicule pendant un an, afin que nous puissions le tester avant sa mise sur le marché ?
STR_8102_RAILROAD_LOCOMOTIVE :{G=f}locomotive
@@ -2605,6 +2605,7 @@
STR_885C_BROKEN_DOWN :{RED}En panne
STR_885D_AGE_RUNNING_COST_YR :{BLACK}Âge: {LTBLUE}{STRING}{BLACK} Coût d'entretien: {LTBLUE}{CURRENCY}/an
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Poids: {LTBLUE}{WEIGHT_S} {BLACK}Puissance: {LTBLUE}{POWER}{BLACK} Vitesse max.: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Poids: {LTBLUE}{WEIGHT_S} {BLACK}Puissance: {LTBLUE}{POWER}{BLACK} Vitesse max.: {LTBLUE}{VELOCITY} {BLACK}E.T. max.: {LTBLUE}{FORCE}
STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Profit cette année: {LTBLUE}{CURRENCY} (année précédente: {CURRENCY})
STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}Fiabilité: {LTBLUE}{COMMA}% {BLACK}Pannes depuis le dernier entretien: {LTBLUE}{COMMA}
STR_8861_STOPPED :{RED}Stoppé
@@ -2946,20 +2947,7 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Afficher tous les véhicules partageant ce programme
### depot strings
-
-STR_SELL :{BLACK}Vendre
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}Vous êtes sur le point de vendre tous les véhicules du dépot
-STR_ARE_YOU_SURE :{BLACK}Etes-vous sûr?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Confirmer la vente de tous les trains du dépôt
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Confirmer la vente de tous les véhicules routiers du dépôt
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Confirmer la vente de tous les navires du dépôt
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Confirmer la vente de tous les aéronefs du hangar
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}Ne pas vendre tous les trains du dépôt
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}Ne pas vendre tous les véhicules routiers du dépôt
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}Ne pas vendre tous les navires du dépôt
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Ne pas vendre tous les aéronefs du hangar
+STR_DEPOT_SELL_CONFIRMATION_TEXT :{YELLOW}Vous êtes sur le point de vendre tous les véhicules du dépôt. Etes-vous sûr ?
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Vendre tous les trains du dépôt
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Vendre tous les véhicules routiers du dépôt
@@ -3046,6 +3034,7 @@
STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Réaménageable pour: {GOLD}
STR_PURCHASE_INFO_ALL_TYPES :Tous les types de cargaison
STR_PURCHASE_INFO_ALL_BUT :Tous sauf {GOLD}
+STR_PURCHASE_INFO_MAX_TE :{BLACK}Effort de traction max.: {GOLD}{FORCE}
########### String for New Landscape Generator
@@ -3109,14 +3098,14 @@
STR_INTERNATIONAL_AIRPORT :{BLACK}International
STR_COMMUTER_AIRPORT :{BLACK}de Banlieue
STR_INTERCONTINENTAL_AIRPORT :{BLACK}Intercontinental
-STR_HELIPORT :{BLACK}Héli-tour
-STR_HELIDEPOT :{BLACK}Héli-dépôt
-STR_HELISTATION :{BLACK}Héli-station
+STR_HELIPORT :{BLACK}Hélitour
+STR_HELIDEPOT :{BLACK}Hélidépôt
+STR_HELISTATION :{BLACK}Hélistation
STR_SMALL_AIRPORTS :{BLACK}Petits aéroports
STR_LARGE_AIRPORTS :{BLACK}Grands aéroports
STR_HUB_AIRPORTS :{BLACK}Aéroports Internodaux
-STR_HELIPORTS :{BLACK}Héli-ports
+STR_HELIPORTS :{BLACK}Héliports
############ Tooltip measurment
--- a/lang/galician.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/galician.txt Mon Jan 01 16:31:13 2007 +0000
@@ -286,8 +286,10 @@
STR_013E_CAPACITIES :{BLACK}Capacidades
STR_013E_TOTAL_CARGO :{BLACK}Carga Total
STR_013F_CAPACITY :{BLACK}Capacidade: {LTBLUE}{CARGO}
+STR_CAPACITY_MULT :{BLACK}Capacidade: {LTBLUE}{CARGO} (x{NUM})
STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Carga total (capacidade) deste tren:
STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
STR_0140_NEW_GAME :{BLACK}Nova Partida
STR_0141_LOAD_GAME :{BLACK}Cargar Partida
STR_SINGLE_PLAYER :{BLACK}Un Xogador
@@ -355,7 +357,7 @@
STR_015D_LOAD_GAME :Cargar Partida
STR_015E_QUIT_GAME :Saír ó menu principal
STR_015F_QUIT :Saír do programa
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}¿Está seguro de que desexa saír da partida?
+STR_ABANDON_GAME_QUERY :{YELLOW}¿Está seguro de que desexa saír da partida?
STR_0161_QUIT_GAME :{WHITE}Saír ó menú principal
STR_SORT_ORDER_TIP :{BLACK}Selecciona o modo de ordeamento(descendente/ascendente)
STR_SORT_CRITERIA_TIP :{BLACK}Selecciona o criterio de orde
@@ -384,7 +386,13 @@
STR_ENGINE_SORT_RUNNING_COST :Coste Mantemento
STR_ENGINE_SORT_POWER_VS_RUNNING_COST :Potencia/Coste Mantemento
STR_ENGINE_SORT_CARGO_CAPACITY :Capacidade De Carga
+STR_NO_WAITING_CARGO :{BLACK}Non queda ningún tipo de carga en espera
+STR_MANAGE_LIST :{BLACK}Xestionar lista
STR_REPLACE_VEHICLES :Reemplazar Vehículos
+STR_SEND_TRAIN_TO_DEPOT :Enviar o Depósito
+STR_SEND_ROAD_VEHICLE_TO_DEPOT :Enviar o Depósito
+STR_SEND_SHIP_TO_DEPOT :Enviar o Depósito
+STR_SEND_AIRCRAFT_TO_HANGAR :Enviar o Hangar
############ range for months starts
STR_0162_JAN :Xan
@@ -714,7 +722,7 @@
STR_0298_LOAD_SCENARIO :{WHITE}Cargar Escenario
STR_0299_SAVE_SCENARIO :{WHITE}Grabar Escenario
STR_029A_PLAY_SCENARIO :{BLACK}Xogar Escenario
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}¿Estás seguro de que desexas saír deste escenario?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}¿Estás seguro de que desexas saír deste escenario?
STR_029C_QUIT_EDITOR :{WHITE}Saír do Editor
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...só se pode construír en cidades con polo menos 1200 hab.
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Move-lo ano de comezo un ano hacia atrás
@@ -894,6 +902,7 @@
STR_CURR_SIT :Tolar Esloveno (SIT)
STR_CURR_SEK :Corona Sueca(SEK)
STR_CURR_YTL :Lira Turca (YTL)
+STR_CURR_BRR :Real Brasileño (BRL)
STR_CURR_CUSTOM :Persoal...
@@ -1173,6 +1182,7 @@
STR_DRAG_DROP :{BLACK}Arrastrar e Soltar
STR_STATION_DRAG_DROP :{BLACK}Construír estación arrastrando e soltando
+STR_SELECT_STATION_TYPE_TIP :{BLACK}Selecciona o tipo da estación a construir
STR_FAST_FORWARD :{BLACK}Avance rápido da partida
STR_MESSAGE_HISTORY :{WHITE}Historial de Mensaxes
@@ -1409,6 +1419,7 @@
STR_NETWORK_SERVER :Servidor
STR_NETWORK_CLIENT :Cliente
+STR_NETWORK_SPECTATORS :Espectadores
STR_NETWORK_CLIENTLIST_NONE :(ningún)
STR_NETWORK_CLIENTLIST_KICK :Patear
@@ -2129,6 +2140,12 @@
STR_LIVERY_MAGLEV :Máquina Maglev
STR_LIVERY_DMU :DMU
STR_LIVERY_EMU :EMU
+STR_LIVERY_PASSENGER_WAGON_STEAM :Vagón De Pasaxeiros (Vapor)
+STR_LIVERY_PASSENGER_WAGON_DIESEL :Vagón De Pasaxeiros (Diésel)
+STR_LIVERY_PASSENGER_WAGON_ELECTRIC :Vagón De Pasaxeiros (Eléctrico)
+STR_LIVERY_FREIGHT_WAGON :Vagón de Carga
+STR_LIVERY_BUS :Autobús
+STR_LIVERY_TRUCK :Camión
STR_LIVERY_PASSENGER_SHIP :Barco de Pasaxeiros
STR_LIVERY_FREIGHT_SHIP :Barco de Carga
STR_LIVERY_HELICOPTER :Helicóptero
@@ -2436,15 +2453,18 @@
STR_UNKNOWN_DESTINATION :destino descoñecido
STR_8812_EMPTY :{LTBLUE}Valeiro
STR_8813_FROM :{LTBLUE}{CARGO} de {STATION}
+STR_FROM_MULT :{LTBLUE}{CARGO} desde {STATION} (x{NUM})
STR_8814_TRAIN_IS_WAITING_IN_DEPOT :{WHITE}O tren {COMMA} está a esperar no depósito
STR_8815_NEW_VEHICLES :{BLACK}Novos Vehículos
STR_8816 :{BLACK}-
STR_8819_TRAIN_TOO_LONG :{WHITE}O tren é demasiado longo
STR_881A_TRAINS_CAN_ONLY_BE_ALTERED :{WHITE}Os trens só se poden alterar cando estean parados nunha estación
STR_881B_TRAINS :{WHITE}{COMPANY} - {COMMA} Trens
+
STR_881C_NEW_RAIL_VEHICLES :{WHITE}Novos Vehículos de Ferrocarril
STR_881D_NEW_MONORAIL_VEHICLES :{WHITE}Novos Vehículos de Monorraíl
STR_881E_NEW_MAGLEV_VEHICLES :{WHITE}Novos Vehículos de Maglev
+
STR_881F_BUILD_VEHICLE :{BLACK}Construír Vehículo
STR_CLONE_ROAD_VEHICLE :{BLACK}Clonar Vehículo
STR_CLONE_ROAD_VEHICLE_INFO :{BLACK}Esto construíra unha copia do vehículo. CTRL+Click compartirá as ordes
@@ -2518,6 +2538,7 @@
STR_885C_BROKEN_DOWN :{RED}Roto
STR_885D_AGE_RUNNING_COST_YR :{BLACK}Idade: {LTBLUE}{STRING}{BLACK} Coste de Mantemento: {LTBLUE}{CURRENCY}/ano
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Peso: {LTBLUE}{WEIGHT_S} {BLACK}Potencia: {LTBLUE}{POWER}{BLACK} Velocidade Máx.: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Peso: {LTBLUE}{WEIGHT_S} {BLACK}Potencia: {LTBLUE}{POWER}{BLACK} Vel. máx.: {LTBLUE}{VELOCITY} {BLACK}T.E. Máx.: {LTBLUE}{FORCE}
STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Beneficios este ano: {LTBLUE}{CURRENCY} (último ano: {CURRENCY})
STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}Fiabilidade: {LTBLUE}{COMMA}% {BLACK}Roturas dende o último servicio: {LTBLUE}{COMMA}
STR_8861_STOPPED :{RED}Parado
@@ -2794,6 +2815,19 @@
STR_NEWGRF_NO_FILES_INSTALLED :{BLACK}¡Non hai ficheiros newgrf instalados! Consulta no manual as instruccións para instalar novos gráficos
STR_NEWGRF_FILENAME :{BLACK}Ficheiro: {SILVER}{STRING}
STR_NEWGRF_GRF_ID :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_MD5SUM :{BLACK}Suma MD5: {SILVER}{STRING}
+
+STR_NEWGRF_ADD :{BLACK}Engadir
+STR_NEWGRF_REMOVE :{BLACK}Eliminar
+STR_NEWGRF_REMOVE_TIP :{BLACK}Elimina-lo arquivo NewGRF seleccionado da lista
+STR_NEWGRF_MOVEUP :{BLACK}Mover Arriba
+STR_NEWGRF_MOVEUP_TIP :{BLACK}Move-lo arquivo NewGRF seleccionado arriba na lista
+STR_NEWGRF_MOVEDOWN :{BLACK}Mover Abaixo
+STR_NEWGRF_MOVEDOWN_TIP :{BLACK}Move-lo arquivo NewGRF seleccionado abaixo na lista
+STR_NEWGRF_PARAMETER :{BLACK}Parámetros: {SILVER}{STRING}
+
+
+STR_NEWGRF_DISABLED :{RED}Desactivado
STR_CURRENCY_WINDOW :{WHITE}Moeda persoalizada
STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Taxa de cambio: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -2825,11 +2859,9 @@
### depot strings
-STR_SELL :{BLACK}Vender
-STR_ARE_YOU_SURE :{BLACK}¿Estás seguro?
-
-
-
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Vender tódolos trens do depósito
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP :{BLACK}Vender tódolos barcos no depósito
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP :{BLACK}Vender tódalas aeronaves do hangar
STR_DEPOT_AUTOREPLACE_TRAIN_TIP :{BLACK}Autorreemprazar tódolos trens no depósito
@@ -2900,9 +2932,11 @@
STR_WORLD_GENERATION_CAPTION :{WHITE}Xeración do mundo
STR_RANDOM_SEED :{BLACK}Semilla Aleatoria:
STR_RANDOM_SEED_HELP :{BLACK}Pincha para introducir unha semilla
+STR_LAND_GENERATOR :{BLACK}Xerador de terreo:
STR_TERRAIN_TYPE :{BLACK}Tipo de terreo:
STR_QUANTITY_OF_SEA_LAKES :{BLACK}Nivel do mar:
STR_SMOOTHNESS :{BLACK}Suavidade:
+STR_SNOW_LINE_HEIGHT :{BLACK}Altura da liña de neve:
STR_DATE :{BLACK}Data:
STR_NUMBER_OF_TOWNS :{BLACK}Num. de cidades:
STR_NUMBER_OF_INDUSTRIES :{BLACK}Num. de industrias:
@@ -2945,5 +2979,7 @@
STR_MEASURE_LENGTH :{BLACK}Lonxitude: {NUM}
STR_MEASURE_AREA :{BLACK}Área: {NUM} x {NUM}
+STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Lonxitude: {NUM}{}Diferencia de altura: {NUM} m
+STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Área: {NUM} x {NUM}{}Diferencia de altura: {NUM} m
########
--- a/lang/german.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/german.txt Mon Jan 01 16:31:13 2007 +0000
@@ -360,7 +360,7 @@
STR_015D_LOAD_GAME :Spiel laden
STR_015E_QUIT_GAME :Spiel beenden
STR_015F_QUIT :Beenden
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Bist du sicher, dass du das Spiel beenden willst?
+STR_ABANDON_GAME_QUERY :{YELLOW}Bist du sicher, dass du das Spiel beenden willst?
STR_0161_QUIT_GAME :{WHITE}Spiel beenden
STR_SORT_ORDER_TIP :{BLACK}Sortierreihenfolge auswählen (absteigend/aufsteigend)
STR_SORT_CRITERIA_TIP :{BLACK}Sortierkriterium auswählen
@@ -739,7 +739,7 @@
STR_029A_PLAY_SCENARIO :{BLACK}Szenario spielen
STR_PLAY_HEIGHTMAP :{BLACK}Reliefkarte spielen
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Ein neues Spiel mit Reliefkarte als Landschaft starten
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Bist du dir sicher, dass du das Szenario verlassen willst?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Bist du dir sicher, dass du das Szenario verlassen willst?
STR_029C_QUIT_EDITOR :{WHITE}Bearbeitung beenden
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...kann nur in Städten mit mehr als 1200 Einwohnern gebaut werden
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Startdatum auf 1 Jahr früher setzen
@@ -1310,6 +1310,7 @@
STR_NETWORK_SERVER_OFFLINE :{SILVER}SERVER OFFLINE
STR_NETWORK_SERVER_FULL :{SILVER}SERVER VOLL
STR_NETWORK_VERSION_MISMATCH :{SILVER}Versionskonflikt festgestellt
+STR_NETWORK_GRF_MISMATCH :{SILVER}NEWGRF KONFLIKT
STR_NETWORK_JOIN_GAME :{BLACK}Spiel betreten
@@ -2604,6 +2605,7 @@
STR_885C_BROKEN_DOWN :{RED}Panne
STR_885D_AGE_RUNNING_COST_YR :{BLACK}Alter: {LTBLUE}{STRING}{BLACK} Betriebskosten: {LTBLUE}{CURRENCY}/Jahr
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Gewicht: {LTBLUE}{WEIGHT_S} {BLACK}Leistung: {LTBLUE}{POWER}{BLACK} Höchstgeschwindigk.: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Gewicht: {LTBLUE}{WEIGHT_S} {BLACK}Leistung: {LTBLUE}{POWER}{BLACK} Höchstgeschw.: {LTBLUE}{VELOCITY} {BLACK}Max. Zugkraft: {LTBLUE}{FORCE}
STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Profit lfd. Jahr: {LTBLUE}{CURRENCY} (letztes Jahr: {CURRENCY})
STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}Zuverlässigkeit: {LTBLUE}{COMMA}% {BLACK}Ausfälle seit letzter Wartung: {LTBLUE}{COMMA}
STR_8861_STOPPED :{RED}Angehalten
@@ -2945,20 +2947,7 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Zeige alle Fahrzeuge mit demselben Fahrplan
### depot strings
-
-STR_SELL :{BLACK}Verkaufen
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}Du bist dabei alle Fahrzeuge im Depot zu verkaufen
-STR_ARE_YOU_SURE :{BLACK}Bist du sicher?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Bestätige bitte dass du alle Züge im Depot verkaufen möchtest
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Bestätige bitte dass du alle Fahrzeuge im Depot verkaufen möchtest
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Bestätige bitte dass du alle Schiffe in der Werft verkaufen möchtest
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Bestätige bitte dass du alle Flugzeuge im Hangar verkaufen möchtest
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}Verkaufe nicht alle Züge im Depot
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}Verkaufe nicht alle Fahrzeuge im Depot
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}Verkaufe nicht alle Schiffe in der Werft
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Verkaufe nicht alle Flugzeuge im Hangar
+STR_DEPOT_SELL_CONFIRMATION_TEXT :{YELLOW}Möchtest du alle Fahrzeuge in diesem Depot verkaufen?
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Verkaufe alle Züge im Depot
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Verkaufe alle Fahrzeuge im Depot
@@ -3045,6 +3034,7 @@
STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Umrüstbar auf: {GOLD}
STR_PURCHASE_INFO_ALL_TYPES :Alle Frachtarten
STR_PURCHASE_INFO_ALL_BUT :Alles außer {GOLD}
+STR_PURCHASE_INFO_MAX_TE :{BLACK}Max. Zugkraft: {GOLD}{FORCE}
########### String for New Landscape Generator
--- a/lang/hungarian.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/hungarian.txt Mon Jan 01 16:31:13 2007 +0000
@@ -425,7 +425,7 @@
STR_015D_LOAD_GAME :Jaték betöltése
STR_015E_QUIT_GAME :Kilépés a játékból
STR_015F_QUIT :Kilépés
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Biztosan kilépsz ebből a játékból ?
+STR_ABANDON_GAME_QUERY :{YELLOW}Biztosan kilépsz ebből a játékból ?
STR_0161_QUIT_GAME :{WHITE}Kilépés a játékból
STR_SORT_ORDER_TIP :{BLACK}Csökkenő/növekvő sorbarendezés
STR_SORT_CRITERIA_TIP :{BLACK}Sorbarendezési kritérium
@@ -803,7 +803,7 @@
STR_029A_PLAY_SCENARIO :{BLACK}Játék saját pályán
STR_PLAY_HEIGHTMAP :{BLACK}Játék magasságtérképen
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Új játékot kezd egy magasságtérkép alapján
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Biztosan abba akarod hagyni a pálya szerkesztését ?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Biztosan abba akarod hagyni a pálya szerkesztését ?
STR_029C_QUIT_EDITOR :{WHITE}Kilépés a szerkesztőből
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...csak 1200-nál nagyobb lakosságú városokba építhető
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}A kezdődátum visszább állítása egy évvel
@@ -2705,6 +2705,7 @@
STR_885C_BROKEN_DOWN :{RED}Lerobbant
STR_885D_AGE_RUNNING_COST_YR :{BLACK}Kor: {LTBLUE}{STRING}{BLACK} Működtetési költség: {LTBLUE}{CURRENCY}/év
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Súly: {LTBLUE}{WEIGHT_S} {BLACK}Teljesítmény: {LTBLUE}{POWER}{BLACK} Végsebesség: {LTBLUE} {VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Súly: {LTBLUE}{WEIGHT_S} {BLACK}Telj.: {LTBLUE}{POWER}{BLACK} Max. seb.: {LTBLUE}{VELOCITY} {BLACK}Max. húzóerő: {LTBLUE}{FORCE}
STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Idei haszon: {LTBLUE}{CURRENCY} (tavalyi: {CURRENCY})
STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}Megbízhatóság: {LTBLUE}{COMMA}% {BLACK}Lerobbanások az utolsó javítás óta: {LTBLUE}{COMMA}
STR_8861_STOPPED :{RED}Áll
@@ -3046,20 +3047,7 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Megmutatja az összes járművet, aminek ugyanaz a menetrendje
### depot strings
-
-STR_SELL :{BLACK}Elad
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}Te éppen a depotban lévő járműveket készülsz eladni
-STR_ARE_YOU_SURE :{BLACK}Biztos vagy benne?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Erősítsd meg, hogy el akarod adni az összes depóbeli vonatot
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Erősítsd meg, hogy el akarod adni az összes depóbeli közúti járművet
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Erősítsd meg, hogy el akarod adni az összes dokkbeli hajót
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Erősítsd meg, hogy a hangárban lévő összes repülőt el akarod adni
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}Ne add el az összes depóbeli vonatot
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}Ne add el a depóbeli összes közúti járművet
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}Ne add el az összes dokkbeli hajót
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Ne add el a hangárbeli összes repülőt
+STR_DEPOT_SELL_CONFIRMATION_TEXT :{YELLOW}Biztosan eladod a depóban lévő összes járművet?
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Összes depóbeli vonat eladása
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Összes depóbeli jármű eladása
@@ -3146,6 +3134,7 @@
STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Átalakítható: {GOLD}
STR_PURCHASE_INFO_ALL_TYPES :Minden szállítmány típusra
STR_PURCHASE_INFO_ALL_BUT :Mindenre, kivéve {GOLD}
+STR_PURCHASE_INFO_MAX_TE :{BLACK}Maximális húzó erő: {GOLD}{FORCE}
########### String for New Landscape Generator
--- a/lang/icelandic.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/icelandic.txt Mon Jan 01 16:31:13 2007 +0000
@@ -357,7 +357,7 @@
STR_015D_LOAD_GAME :Opna leik
STR_015E_QUIT_GAME :Hætta leik
STR_015F_QUIT :Hætta
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Ertu viss um að þú viljir hætta í þessum leik ?
+STR_ABANDON_GAME_QUERY :{YELLOW}Ertu viss um að þú viljir hætta í þessum leik ?
STR_0161_QUIT_GAME :{WHITE}Hætta leik
STR_SORT_ORDER_TIP :{BLACK}Velja uppröðun (minnkandi/stækkandi)
STR_SORT_CRITERIA_TIP :{BLACK}Velja uppröðun
@@ -717,7 +717,7 @@
STR_0298_LOAD_SCENARIO :{WHITE}Opna kort
STR_0299_SAVE_SCENARIO :{WHITE}Vista kort
STR_029A_PLAY_SCENARIO :{BLACK}Spila kort
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Ertu viss um að þú viljir hætta í þessu korti ?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Ertu viss um að þú viljir hætta í þessu korti ?
STR_029C_QUIT_EDITOR :{WHITE}Hætta í kortagerð
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...aðeins hægt að byggja í bæjum með fleiri en 1200 íbúum
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Færa byrjunardagsetninguna aftur um 1 ár
@@ -2826,10 +2826,6 @@
-
-
-
-
STR_REPLACE_VEHICLES_WHITE :{WHITE}Endurnýja {STRING}
STR_REPLACE_VEHICLES_START :{BLACK}Hefja skipti
STR_REPLACE_VEHICLES_STOP :{BLACK}Stöðva skipti
--- a/lang/italian.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/italian.txt Mon Jan 01 16:31:13 2007 +0000
@@ -359,7 +359,7 @@
STR_015D_LOAD_GAME :Carica partita
STR_015E_QUIT_GAME :Abbandona partita
STR_015F_QUIT :Esci
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Sei sicuro di voler abbandonare la partita in corso?
+STR_ABANDON_GAME_QUERY :{YELLOW}Sei sicuro 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
@@ -738,7 +738,7 @@
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_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Sei sicuro di voler abbondonare questo scenario?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Sei sicuro di voler abbondonare 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 un'anno
@@ -2946,20 +2946,7 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Mostra tutti i veicoli con la stessa lista ordini
### depot strings
-
-STR_SELL :{BLACK}Vendi
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}Stai per vendere tutti i veicoli nel deposito
-STR_ARE_YOU_SURE :{BLACK}Sei sicuro?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Conferma la vendita di tutti i treni nel deposito
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Conferma la vendita di tutti gli veicoli stradali nel deposito
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Conferma la vendita di tutte le navi nel deposito
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Conferma la vendita di tutti gli aerei nell'hangar
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}Non vendere tutti i treni nel deposito
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}Non vendere tutti i veicoli stradali nel deposito
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}Non vendere tutte le navi nel deposito
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Non vendere tutti gli aerei nell'hangar
+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
--- a/lang/norwegian.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/norwegian.txt Mon Jan 01 16:31:13 2007 +0000
@@ -359,7 +359,7 @@
STR_015D_LOAD_GAME :Last inn spill
STR_015E_QUIT_GAME :Avslutt gjeldende spill
STR_015F_QUIT :Avslutt OpenTTD
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Er du sikker på du vil avslutte dette spillet ?
+STR_ABANDON_GAME_QUERY :{YELLOW}Er du sikker på du vil avslutte dette spillet ?
STR_0161_QUIT_GAME :{WHITE}Avslutt spill
STR_SORT_ORDER_TIP :{BLACK}Velg sorteringsrekkefølge (synkende/stigende)
STR_SORT_CRITERIA_TIP :{BLACK}Velg sorteringskriterier
@@ -738,7 +738,7 @@
STR_029A_PLAY_SCENARIO :{BLACK}Spill scenario
STR_PLAY_HEIGHTMAP :{BLACK}Spill høydekart
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Start et nytt spill, bruk et høydekart som landskap
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Er du sikker på du vil forlate dette scenariet?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Er du sikker på du vil forlate dette scenariet?
STR_029C_QUIT_EDITOR :{WHITE}Avslutt redigeringsprogrammet
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...kan kun bygges i byer med mer en 1200 innbyggere
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Flytt startdatoen tilbake ett år
@@ -2603,6 +2603,7 @@
STR_885C_BROKEN_DOWN :{RED}Havarert
STR_885D_AGE_RUNNING_COST_YR :{BLACK}Alder: {LTBLUE}{STRING}{BLACK} Driftkostnad: {LTBLUE}{CURRENCY}/år
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Vekt: {LTBLUE}{WEIGHT_S} {BLACK}Kraft: {LTBLUE}{POWER}{BLACK} Maks. fart: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Vekt: {LTBLUE}{WEIGHT_S} {BLACK}Kraft: {LTBLUE}{POWER}{BLACK} Høyeste fart: {LTBLUE}{VELOCITY} {BLACK}Høyeste hastighet.: {LTBLUE}{FORCE}
STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Inntekt i år: {LTBLUE}{CURRENCY} (sist år: {CURRENCY})
STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}Pålitelighet: {LTBLUE}{COMMA} % {BLACK}Havarier siden forrige vedlikehold: {LTBLUE}{COMMA}
STR_8861_STOPPED :{RED}Stoppet
@@ -2944,20 +2945,7 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Vis alle kjøretøy som har samme ruteplan
### depot strings
-
-STR_SELL :{BLACK}Selg
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}Du er i ferd med å selge alle kjøretøyene i depotet
-STR_ARE_YOU_SURE :{BLACK}Er du sikker?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Bekreft at du vil selge alle togene i depotet
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Bekreft at du vil selge alle bilene i depotet
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Bekreft at du vil selge alle skipene i depotet
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Bekreft at du vil slge all flyene i hangaren
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}Ikke selg alle skip i depodet
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}Ikke selg alle bilene i garasjen
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}Ikke selg alle skip i depodet
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Ikke selg alle flyene i hangaren
+STR_DEPOT_SELL_CONFIRMATION_TEXT :{YELLOW}Du er nå i ferd med å selge alle kjøretøyene i depoet. Er du sikker på at du vil dette?
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Selg alle tog i depodet
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Selg alle kjøretøy i garasjen
@@ -3043,6 +3031,7 @@
STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Utstyrbart til: {GOLD}
STR_PURCHASE_INFO_ALL_TYPES :Alle varetyper
STR_PURCHASE_INFO_ALL_BUT :Alt utenom {GOLD}
+STR_PURCHASE_INFO_MAX_TE :{BLACK}Maks. trekkraft: {GOLD}{FORCE}
########### String for New Landscape Generator
--- a/lang/polish.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/polish.txt Mon Jan 01 16:31:13 2007 +0000
@@ -412,7 +412,7 @@
STR_015D_LOAD_GAME :Wczytaj grę
STR_015E_QUIT_GAME :Opuść grę
STR_015F_QUIT :Wyjście
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Jesteś pewien że chcesz skończyć grę?
+STR_ABANDON_GAME_QUERY :{YELLOW}Jesteś pewien że chcesz skończyć grę?
STR_0161_QUIT_GAME :{WHITE}Wyjście
STR_SORT_ORDER_TIP :{BLACK}Wybierz porządek sortowania (malejąco/rosnąco)
STR_SORT_CRITERIA_TIP :{BLACK}Wybierz kryterium sortowania
@@ -825,7 +825,7 @@
STR_029A_PLAY_SCENARIO :{BLACK}Zagraj Scenariusz
STR_PLAY_HEIGHTMAP :{BLACK}Zagraj z mapy wysokości
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Rozpocznij nowa grę używając mapy wysokości jako krajobrazu
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Jesteś pewien że chcesz opuścić scenariusz?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Jesteś pewien że chcesz opuścić scenariusz?
STR_029C_QUIT_EDITOR :{WHITE}Wyjście z edytora
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...można zbudować jedynie w miastach o populacji przynajmniej 1200
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Zmień datę początkową do tyłu o 1 rok
@@ -2594,7 +2594,7 @@
STR_80FE_GURU_X2_HELICOPTER :Helikopter Guru X2
STR_80FF_POWERNAUT_HELICOPTER :Helikopter Powernaut
STR_8100_MESSAGE_FROM_VEHICLE_MANUFACTURE :{WHITE}Wiadomość od producenta pojazdów
-STR_8101_WE_HAVE_JUST_DESIGNED_A :{GOLD}Właśnie zaprojektowaliśmy now{G y a e} {STRING.b} - czy jesteś zainteresowany w rocznej wyłączności na użycie tego pojazdu, żebyśmy mogli zobaczyć jak się sprawuje przed wypuszczeniem na rynek?
+STR_8101_WE_HAVE_JUST_DESIGNED_A :{GOLD}Właśnie zaprojektowaliśmy now{G y ą e} {STRING.b} - czy jesteś zainteresowany w rocznej wyłączności na użycie tego pojazdu, żebyśmy mogli zobaczyć przed wypuszczeniem na rynek jak się sprawuje?
STR_8102_RAILROAD_LOCOMOTIVE :{G=f}lokomotywa
STR_8102_RAILROAD_LOCOMOTIVE.b :{G=f}lokomotywę
STR_8103_ROAD_VEHICLE :{G=m}samochód
@@ -2733,6 +2733,7 @@
STR_885C_BROKEN_DOWN :{RED}Awaria
STR_885D_AGE_RUNNING_COST_YR :{BLACK}Wiek: {LTBLUE}{STRING}{BLACK} Utrzymanie: {LTBLUE}{CURRENCY}/rok
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Waga: {LTBLUE}{WEIGHT_S} {BLACK}Moc: {LTBLUE}{POWER}{BLACK} Max. prędkość: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Waga: {LTBLUE}{WEIGHT_S} {BLACK}Moc: {LTBLUE}{POWER}{BLACK} Max. prędkość: {LTBLUE}{VELOCITY} {BLACK}Max. S.P.: {LTBLUE}{FORCE}
STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Zysk w tym roku: {LTBLUE}{CURRENCY} (w ostatnim roku: {CURRENCY})
STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}Niezawodność: {LTBLUE}{COMMA}% {BLACK}Awarie od ostatniego serwisowania: {LTBLUE}{COMMA}
STR_8861_STOPPED :{RED}Zatrzymany
@@ -2949,7 +2950,7 @@
STR_A030_NAME_AIRCRAFT :{WHITE}Nazwa samolotu
STR_A031_CAN_T_NAME_AIRCRAFT :{WHITE}Nie można zmienić nazwy samolotu...
STR_A032_NAME_AIRCRAFT :{BLACK}Nazwa samolotu
-STR_A033_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwszy samolot przyleciał do {STATION}!
+STR_A033_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Mieszkańcy świętują . . .{}Pierwszy samolot przyleciał na {STATION}!
STR_A034_PLANE_CRASH_DIE_IN_FIREBALL :{BLACK}{BIGFONT}Katastrofa lotnicza!{}{COMMA} ofiar{P a y ""} na {STATION}
STR_PLANE_CRASH_OUT_OF_FUEL :{BLACK}{BIGFONT}Wypadek lotniczy!{}Samolot rozbił się z powodu braku paliwa, zginęło {COMMA} osób!
STR_A036 :{TINYFONT}{BLACK}{STATION}
@@ -3074,20 +3075,7 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Pokaż wszystkie pojazdy współdzielące te polecenia
### depot strings
-
-STR_SELL :{BLACK}Sprzedaj
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}Sprzedasz wszystkie pojazdy z zajezdni
-STR_ARE_YOU_SURE :{BLACK}Jesteś pewien?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Potwierdź chęć sprzedaży wszystkich pociągów z zajezdni
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Potwierdź chęć sprzedaży wszystkich samochodów z zajezdni
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Potwierdź chęć sprzedaży wszystkich statków ze stoczni
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Potwierdź chęć sprzedaży wszystkich samolotów z hangaru
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}Nie sprzedawaj wszystkich pociągów z zajezdni
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}Nie sprzedawaj wszystkich samochodów z zajezdni
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}Nie sprzedawaj wszystkich statków ze stoczni
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Nie sprzedawaj wszystkich samolotów z hangaru
+STR_DEPOT_SELL_CONFIRMATION_TEXT :{YELLOW}Sprzedasz wszystkie pojazdy z zajezdni. Jesteś pewien?
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Sprzedaj wszystkie pociągi z zajezdni
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Sprzedaj wszystkie samochody z zajezdni
@@ -3174,6 +3162,7 @@
STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Można przebudować na: {GOLD}
STR_PURCHASE_INFO_ALL_TYPES :Wszystkie typy towarów
STR_PURCHASE_INFO_ALL_BUT :Wszystko oprócz {GOLD}}
+STR_PURCHASE_INFO_MAX_TE :{BLACK}Max. Siła Pociągowa: {GOLD}{FORCE}
########### String for New Landscape Generator
--- a/lang/portuguese.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/portuguese.txt Mon Jan 01 16:31:13 2007 +0000
@@ -359,7 +359,7 @@
STR_015D_LOAD_GAME :Abrir jogo
STR_015E_QUIT_GAME :Abandonar jogo
STR_015F_QUIT :Sair
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Tem a certeza que deseja abandonar este jogo?
+STR_ABANDON_GAME_QUERY :{YELLOW}Tem a certeza que deseja abandonar este jogo?
STR_0161_QUIT_GAME :{WHITE}Abandonar jogo
STR_SORT_ORDER_TIP :{BLACK}Seleccione forma de ordenação (descendente/ascendente)
STR_SORT_CRITERIA_TIP :{BLACK}Seleccione critério de ordenação
@@ -738,7 +738,7 @@
STR_029A_PLAY_SCENARIO :{BLACK}Jogar Cenário
STR_PLAY_HEIGHTMAP :{BLACK}Jogar mapa de alturas
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Iniciar novo jogo, usando um mapa de alturas como paisagem
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Tem a certeza que deseja abandonar este cenário ?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Tem a certeza que deseja abandonar este cenário ?
STR_029C_QUIT_EDITOR :{WHITE}Sair do Editor
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...só pode ser construído em cidades com pelo menos 1200 habitantes
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Retroceder data de inicio 1 ano
@@ -1079,7 +1079,7 @@
STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}Manutenção automática de helicópteros em heliportos: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Ligar ferramentas de paisagem com as de construção: {ORANGE}{STRING}
STR_CONFIG_PATCHES_REVERSE_SCROLLING :{LTBLUE}Ao deslizar com o rato, mover a vista na direcção oposta: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MEASURE_TOOLTIP :{LTBLUE}Mostrar as medidas quando se usam ferramentas de construção: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MEASURE_TOOLTIP :{LTBLUE}Mostrar medidas ao usar ferramentas de construção: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LIVERIES :{LTBLUE}Mostrar estampagens da companhia: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LIVERIES_NONE :Nenhum
STR_CONFIG_PATCHES_LIVERIES_OWN :Própria companhia
@@ -2604,6 +2604,7 @@
STR_885C_BROKEN_DOWN :{RED}Avariado
STR_885D_AGE_RUNNING_COST_YR :{BLACK}Idade: {LTBLUE}{STRING}{BLACK} Custo de circulação: {LTBLUE}{CURRENCY}/ano
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Peso: {LTBLUE}{WEIGHT_S} {BLACK}Potência: {LTBLUE}{POWER}{BLACK} Velocidade Máx.: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Peso: {LTBLUE}{WEIGHT_S} {BLACK}Potência: {LTBLUE}{POWER}{BLACK} Veloc. máx.: {LTBLUE}{VELOCITY} {BLACK}F. Trac. Máx.: {LTBLUE}{FORCE}
STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Lucros deste ano: {LTBLUE}{CURRENCY} (último ano: {CURRENCY})
STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}Fiabilidade: {LTBLUE}{COMMA}% {BLACK}Avarias desde a última manutenção: {LTBLUE}{COMMA}
STR_8861_STOPPED :{RED}Parado
@@ -2945,20 +2946,7 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Mostra todos os veículos que seguem o mesmo trajecto
### depot strings
-
-STR_SELL :{BLACK}Vender
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}Está prestes a vender todos os veículos no depósito
-STR_ARE_YOU_SURE :{BLACK}Tem a certeza?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Confirme que deseja vender todos os combóios no depósito
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Confirme que deseja vender todos os veículos de estrada no depósito
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Confirme que deseja vender todos os navios no depósito
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Confirme que quer vender todas as aeronaves no hangar
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}Não vender os combóios no depósito
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}Não vender os veículos de estrada no depósito
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}Não vender os navios no depósito
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Não vender as aeronaves no hangar
+STR_DEPOT_SELL_CONFIRMATION_TEXT :{YELLOW}Está prestes a vender todos os veículos no depósito. Tem a certeza?
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Vender todos os combóios no depósito
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Vender todos os veículos no depósito
@@ -3045,6 +3033,7 @@
STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Reconvertível em: {GOLD}
STR_PURCHASE_INFO_ALL_TYPES :Todos os tipos de carga
STR_PURCHASE_INFO_ALL_BUT :Todas menos {GOLD}
+STR_PURCHASE_INFO_MAX_TE :{BLACK}Máx. Força de Tracção: {GOLD}{FORCE}
########### String for New Landscape Generator
--- a/lang/romanian.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/romanian.txt Mon Jan 01 16:31:13 2007 +0000
@@ -154,6 +154,7 @@
STR_00B1_GAME_OPTIONS :{WHITE}Optiuni
STR_00B2_MESSAGE :{YELLOW}Mesaj
STR_00B3_MESSAGE_FROM :{YELLOW}Mesaj de la {STRING}
+STR_POPUP_CAUTION_CAPTION :{WHITE}Atentie!
STR_00B4_CAN_T_DO_THIS :{WHITE}Nu pot face asta....
STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Nu pot curãta terenul....
STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, toate drepturile rezervate
@@ -358,7 +359,7 @@
STR_015D_LOAD_GAME :Încarcã joc
STR_015E_QUIT_GAME :Iesire în meniul principal
STR_015F_QUIT :Iesire din joc
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Esti sigur cã vrei sã renunti la acest joc?
+STR_ABANDON_GAME_QUERY :{YELLOW}Esti sigur cã vrei sã renunti la acest joc?
STR_0161_QUIT_GAME :{WHITE}Iesire din joc
STR_SORT_ORDER_TIP :{BLACK}Alegeti ordinea de sortare ascendenta/descendenta
STR_SORT_CRITERIA_TIP :{BLACK}Alegeti criteriul de sortare
@@ -737,7 +738,7 @@
STR_029A_PLAY_SCENARIO :{BLACK}Joacã scenariu
STR_PLAY_HEIGHTMAP :{BLACK}Reda harta inaltimi
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Porneste un nou joc, folosind o scara de inaltimi ca peisaj
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Esti sigur cã vrei sã renunti la acest scenariu?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Esti sigur cã vrei sã renunti la acest scenariu?
STR_029C_QUIT_EDITOR :{WHITE}Iesire din editor
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...Se poate construi doar in orase cu populatia de cel putin 1200
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Schimbã data de start cu un an în urmã
@@ -1308,6 +1309,7 @@
STR_NETWORK_SERVER_OFFLINE :{SILVER}SERVER OFFLINE
STR_NETWORK_SERVER_FULL :{SILVER}SERVER PLIN
STR_NETWORK_VERSION_MISMATCH :{SILVER}VERSIUNE DIFERITA
+STR_NETWORK_GRF_MISMATCH :{SILVER}NEWGRF NEPOTRIVIRE
STR_NETWORK_JOIN_GAME :{BLACK}Intrã în joc
@@ -2602,6 +2604,7 @@
STR_885C_BROKEN_DOWN :{RED}Defectiune
STR_885D_AGE_RUNNING_COST_YR :{BLACK}Vechimea: {LTBLUE}{STRING}{BLACK} Cost de rulare: {LTBLUE}{CURRENCY}/an
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Greutate: {LTBLUE}{WEIGHT_S} {BLACK}Putere: {LTBLUE}{POWER}{BLACK} Vitezã max.: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Greutate: {LTBLUE}{WEIGHT_S} {BLACK}Putere: {LTBLUE}{POWER}{BLACK} Viteza max.: {LTBLUE}{VELOCITY} {BLACK}E.T. max.: {LTBLUE}{FORCE}
STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Profit anul acesta: {LTBLUE}{CURRENCY} (anul trecut: {CURRENCY})
STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}Eficientã: {LTBLUE}{COMMA}% {BLACK}Defectiuni de la ultimul service: {LTBLUE}{COMMA}
STR_8861_STOPPED :{RED}Oprit
@@ -2888,6 +2891,7 @@
STR_NEWGRF_FILENAME :{BLACK}Nume fisier: {SILVER}{STRING}
STR_NEWGRF_GRF_ID :{BLACK}ID GRF: {SILVER}{STRING}
STR_NEWGRF_MD5SUM :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT :{YELLOW}Esti pe cale sa faci modificari intr-un joc activ. Aceasta poate destabiliza OpenTTD.{}Esti absolut sigur ca vrei sa faci asta?
STR_NEWGRF_ADD :{BLACK}Adauga
STR_NEWGRF_ADD_TIP :{BLACK}Adauga un fisier NewGRF in lista
@@ -2942,20 +2946,7 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Arata toate vehiculele care se incadreaza in acest program
### depot strings
-
-STR_SELL :{BLACK}Vinde
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}Esti pe punctul de a vinde toate vehiculele din depou.
-STR_ARE_YOU_SURE :{BLACK}Esti sigur?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Confirma vinderea tuturor trenurilor din depou
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Confirma vinderea tuturor autovehiculelor din depou
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Confirma vindere tuturor vaselor din depou
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Confirma vinderea tuturor aeronavelor din hangar
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}Nu vinde toate trenurile din depou
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}Nu vinde toate autovehiculele din depou
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}Nu vinde toate vasele din depou
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Nu vinde toate aeronavele din hangar
+STR_DEPOT_SELL_CONFIRMATION_TEXT :{YELLOW}Esti pe cale sa vinzi toate vehiculele din depou. Esti sigur?
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Vinde toate trenurile din the depou
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Vinde toate autovehiculele din depou
@@ -3042,6 +3033,7 @@
STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Rearanjabil in: {GOLD}
STR_PURCHASE_INFO_ALL_TYPES :Toate tipurile de incarcaturi
STR_PURCHASE_INFO_ALL_BUT :Toate, cu exceptia {GOLD}
+STR_PURCHASE_INFO_MAX_TE :{BLACK}Efort tractor max.: {GOLD}{FORCE}
########### String for New Landscape Generator
--- a/lang/russian.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/russian.txt Mon Jan 01 16:31:13 2007 +0000
@@ -358,7 +358,7 @@
STR_015D_LOAD_GAME :Загрузить игру
STR_015E_QUIT_GAME :В главное меню
STR_015F_QUIT :Выход
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Вы действительно хотите выйти из игры?
+STR_ABANDON_GAME_QUERY :{YELLOW}Вы действительно хотите выйти из игры?
STR_0161_QUIT_GAME :{WHITE}В главное меню
STR_SORT_ORDER_TIP :{BLACK}Выбор направления сортировки (убывание/возрастание)
STR_SORT_CRITERIA_TIP :{BLACK}Выбор критерия сортировки
@@ -737,7 +737,7 @@
STR_029A_PLAY_SCENARIO :{BLACK}Играть Сценарий
STR_PLAY_HEIGHTMAP :{BLACK}Играть РЕЛЬЕФ
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Начать новую игру, используя РЕЛЬЕФ в качестве шаблона карты
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Вы уверены что хотите выйти из этого сценария ?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Вы уверены что хотите выйти из этого сценария ?
STR_029C_QUIT_EDITOR :{WHITE}Выход из Редактора
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...может быть построен только в городах с населением не менее 1200
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Уменьшить год начала игры на 1
@@ -2945,20 +2945,7 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Показать весь транспорт с этим расписанием
### depot strings
-
-STR_SELL :{BLACK}Продать
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}Продать весь транспорт в депо
-STR_ARE_YOU_SURE :{BLACK}Вы уверены?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Подтвердите, что вы хотите продать все поезда в депо
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Подтвердите, что вы хотите продать все авто в гараже
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Подтвердите, что вы хотите продать все суда в доке
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Подтвердите, что вы хотите продать весь авиатранспорт в ангаре
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}Не продавать все поезда в депо
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}Не продавать все авто в гараже
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}Не продавать все суда в доке
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Не продавать весь авиатранспорт в ангаре
+STR_DEPOT_SELL_CONFIRMATION_TEXT :{YELLOW}Весь транспорт в депо будет продан. Вы уверены?
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Продать все поезда в депо
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Продать все авто в гараже
--- a/lang/slovak.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/slovak.txt Mon Jan 01 16:31:13 2007 +0000
@@ -423,7 +423,7 @@
STR_015D_LOAD_GAME :Nahrat hru
STR_015E_QUIT_GAME :Ukoncit hru
STR_015F_QUIT :Ukoncit OpenTTD
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Si si isty ze chces ukoncit tuto hru ?
+STR_ABANDON_GAME_QUERY :{YELLOW}Si si isty ze chces ukoncit tuto hru ?
STR_0161_QUIT_GAME :{WHITE}Ukoncit hru
STR_SORT_ORDER_TIP :{BLACK}Vyber sposob triedenia (zostupny/vzostupny)
STR_SORT_CRITERIA_TIP :{BLACK}Vyber kriterium triedenia
@@ -802,7 +802,7 @@
STR_029A_PLAY_SCENARIO :{BLACK}Hrat scenar
STR_PLAY_HEIGHTMAP :{BLACK}Hrat vyskovu mapu
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Zacat novu hru s pouzitim vyskovej mapy ako krajiny
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Si si isty ze chces ukoncit tento scenar ?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Si si isty ze chces ukoncit tento scenar ?
STR_029C_QUIT_EDITOR :{WHITE}Ukoncit Editor
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...moze byt postavene v mestach z populaciou vacsou ako 1200
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Posunut zaciatok o rok dozadu
@@ -3009,21 +3009,6 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Zobrazit vsetky vozidla s rovnakym zoznamom prikazov
### depot strings
-
-STR_SELL :{BLACK}Predat
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}Všetky vozidlá budú poslané do depa
-STR_ARE_YOU_SURE :{BLACK}Ste si istí?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Potvrdte predaj vlakov v depe
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Potvrdte predaj všetkých vozidiel v garáži
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Potvrdte predaj všetkých lodí v lodenici
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Potvrdte predaj všetkých lietadiel v hangári
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}Nepredavat všetky vlaky v depe
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}Nepredavat všetky vozidlá v garáži
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}Nepredavat všetky lode v lodenici
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Nepredavat všetky lietadlá v hangári
-
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Predat všetky vlaky v depe
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Predat všetky vozidlá v garáži
STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP :{BLACK}Predat všetky lode v lodenici
--- a/lang/spanish.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/spanish.txt Mon Jan 01 16:31:13 2007 +0000
@@ -360,7 +360,7 @@
STR_015D_LOAD_GAME :Cargar juego
STR_015E_QUIT_GAME :Abandonar juego
STR_015F_QUIT :Salir
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}¿Estás seguro que deseas abandonar este juego?
+STR_ABANDON_GAME_QUERY :{YELLOW}¿Estás seguro que deseas abandonar este juego?
STR_0161_QUIT_GAME :{WHITE}Abandonar Juego
STR_SORT_ORDER_TIP :{BLACK}Seleccione ordenación (descendiente/ascendinte)
STR_SORT_CRITERIA_TIP :{BLACK}Seleccione criterio de orden
@@ -739,7 +739,7 @@
STR_029A_PLAY_SCENARIO :{BLACK}Jugar Escenario
STR_PLAY_HEIGHTMAP :{BLACK}Jugar Mapa de alturas
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Empezar juego nuevo, usando mapa de altura como terreno
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}¿Está seguro de que desea salir de este escenario?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}¿Está seguro de que desea salir de este escenario?
STR_029C_QUIT_EDITOR :{WHITE}Salir del Editor
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...solo puede ser construido en poblaciones con una población superior a 1200
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Retrocede la fecha de inicio en 1 año
@@ -2605,6 +2605,7 @@
STR_885C_BROKEN_DOWN :{RED}Averiado
STR_885D_AGE_RUNNING_COST_YR :{BLACK}Edad: {LTBLUE}{STRING}{BLACK} Coste Operativo: {LTBLUE}{CURRENCY}/año
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Peso: {LTBLUE}{WEIGHT_S} {BLACK}Potencia: {LTBLUE}{POWER}{BLACK} Velocidad Máx.: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Peso: {LTBLUE}{WEIGHT_S} {BLACK}Potencia: {LTBLUE}{POWER}{BLACK} Max. velocidad: {LTBLUE}{VELOCITY} {BLACK}Max. T.E.: {LTBLUE}{FORCE}
STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Beneficio este año: {LTBLUE}{CURRENCY} (último año: {CURRENCY})
STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}Fiabilidad: {LTBLUE}{COMMA}% {BLACK}Averías desde último mantenimiento: {LTBLUE}{COMMA}
STR_8861_STOPPED :{RED}Parado
@@ -2946,20 +2947,7 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Ver todos los vehículos que tienen el mismo calendario
### depot strings
-
-STR_SELL :{BLACK}Vender
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}Estás a punto de vender todos los vehículos del depósito
-STR_ARE_YOU_SURE :{BLACK}¿Estás seguro?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Confirmar que quiero vender todos los tenes del depósito
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Confirmar que quiero vender todos los vehículos del depósito
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Confirmar que quiero vender todos los barcos del depósito
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Confirma que deseas vender todas las aeronaves del hangar
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}No vender todos los trenes del depósito
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}No vender todos los vehículos del depósito
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}No vender todos los barcos del depósito
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}No vender todas las aeronaves del hangar
+STR_DEPOT_SELL_CONFIRMATION_TEXT :{YELLOW}Vas a vender todos los vehículos que tienes en el depósito. ¿Estás seguro?
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Vender todos los trenes del depósito
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Vender todos los vehículos del depósito
@@ -3046,6 +3034,7 @@
STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Convertible a: {GOLD}
STR_PURCHASE_INFO_ALL_TYPES :Todos los tipos de carga
STR_PURCHASE_INFO_ALL_BUT :Todo excepto {GOLD}
+STR_PURCHASE_INFO_MAX_TE :{BLACK}Max. Esfuerzo de Tracción {GOLD}{FORCE}
########### String for New Landscape Generator
--- a/lang/swedish.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/swedish.txt Mon Jan 01 16:31:13 2007 +0000
@@ -359,7 +359,7 @@
STR_015D_LOAD_GAME :Ladda ett spel
STR_015E_QUIT_GAME :Avsluta spelet
STR_015F_QUIT :Avsluta
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Vill du verkligen avsluta spelet?
+STR_ABANDON_GAME_QUERY :{YELLOW}Vill du verkligen avsluta spelet?
STR_0161_QUIT_GAME :{WHITE}Avsluta spelet
STR_SORT_ORDER_TIP :{BLACK}Välj sorteringsordning (fallande/stigande)
STR_SORT_CRITERIA_TIP :{BLACK}Välj sortering
@@ -738,7 +738,7 @@
STR_029A_PLAY_SCENARIO :{BLACK}Spela scenario
STR_PLAY_HEIGHTMAP :{BLACK}Spela höjdkarta
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Starta ett nytt spel, och använd en höjdkarta som landskap
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Vill du verkligen avsluta detta scenario?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Vill du verkligen avsluta detta scenario?
STR_029C_QUIT_EDITOR :{WHITE}Avsluta editor
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...kan bara byggas i städer med minst 1200 invånare
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Flytta startdatumet 1 år bakåt
@@ -1021,6 +1021,7 @@
STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Kombinera tågstationer som byggs bredvid varandra: {ORANGE}{STRING}
STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Lämna stationen när något gods är fullt, om 'full load': {ORANGE}{STRING}
STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Använd förbättrad algoritm: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Lasta fordon gradvis: {ORANGE}{STRING}
STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflation: {ORANGE}{STRING}
STR_CONFIG_PATCHES_SELECTGOODS :{LTBLUE}Leverera gods till en station enbart om någon frågar efter det: {ORANGE}{STRING}
STR_CONFIG_PATCHES_LONGBRIDGES :{LTBLUE}Tillåt väldigt långa broar: {ORANGE}{STRING}
@@ -2192,7 +2193,7 @@
STR_LIVERY_DMU :DMU
STR_LIVERY_EMU :EMU
STR_LIVERY_PASSENGER_WAGON_STEAM :Passagerarvagn (Ånga)
-STR_LIVERY_PASSENGER_WAGON_DIESEL :Passagerarvagn (Disel)
+STR_LIVERY_PASSENGER_WAGON_DIESEL :Passagervagn (Diesel)
STR_LIVERY_PASSENGER_WAGON_ELECTRIC :Passagerarvagn (Elektricitet)
STR_LIVERY_FREIGHT_WAGON :Fraktvagn
STR_LIVERY_BUS :Buss
@@ -2603,6 +2604,7 @@
STR_885C_BROKEN_DOWN :{RED}Motorstopp
STR_885D_AGE_RUNNING_COST_YR :{BLACK}Ålder: {LTBLUE}{STRING}{BLACK} Löpande kostnad: {LTBLUE}{CURRENCY}/år
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Vikt: {LTBLUE}{WEIGHT_S} {BLACK}Effekt: {LTBLUE}{POWER}{BLACK} Tophastighet: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Vikt: {LTBLUE}{WEIGHT_S} {BLACK}Kraft: {LTBLUE}{POWER}{BLACK} Maxhastighet: {LTBLUE}{VELOCITY} {BLACK}Maximal Dragkraft: {LTBLUE}{FORCE}
STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Vinst detta år: {LTBLUE}{CURRENCY} (förra året: {CURRENCY})
STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}Tillförlitlighet: {LTBLUE}{COMMA}% {BLACK}Motorstopp sedan senaste service: {LTBLUE}{COMMA}
STR_8861_STOPPED :{RED}Stoppat
@@ -2944,20 +2946,7 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Visa alla fordon som har samma schema
### depot strings
-
-STR_SELL :{BLACK}Sälj
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}Du är på väg att sälja alla fordon i depån.
-STR_ARE_YOU_SURE :{BLACK}Är du säker?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Bekräfta att du vill sälja alla tåg i depån
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Bekräfta att du vill sälja alla fordon i depån
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Bekräfta att du vill sälja alla skepp i depån
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Bekräfta att du vill sälja alla flygplan i hangaren
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}Sälj inte alla tåg i depån
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}Sälj inte alla fordon i depån
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}Sälj inte alla skepp i depån
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Sälj inte alla flygplan i hangaren
+STR_DEPOT_SELL_CONFIRMATION_TEXT :{YELLOW}Du är på väg att sälja alla fordon i depån. Är du säker?
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Sälj alla tåg i depån
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Sälj alla vägfordon i depån
@@ -3044,6 +3033,7 @@
STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Upprustningsbar till: {GOLD}
STR_PURCHASE_INFO_ALL_TYPES :Alla typer av last
STR_PURCHASE_INFO_ALL_BUT :Alla utom {GOLD}
+STR_PURCHASE_INFO_MAX_TE :{BLACK}Maximal Dragkraft: {GOLD}{FORCE}
########### String for New Landscape Generator
@@ -3064,8 +3054,8 @@
STR_NUMBER_OF_TOWNS :{BLACK}Antal städer:
STR_NUMBER_OF_INDUSTRIES :{BLACK}Antal industrier:
STR_GENERATE_DATE :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP :{BLACK}Flytta snölinjens höjd upp ett steg
-STR_SNOW_LINE_DOWN :{BLACK}Flytta snölinjens höjd ner ett steg
+STR_SNOW_LINE_UP :{BLACK}Höj snölinjens höjd ett upp
+STR_SNOW_LINE_DOWN :{BLACK}Sänk snölinjens höjd ett ner
STR_SNOW_LINE_QUERY_CAPT :{WHITE}Ändra snölinjens höjd
STR_START_DATE_QUERY_CAPT :{WHITE}Ändra Startår
STR_HEIGHTMAP_SCALE_WARNING_CAPTION :{WHITE}Skala-varning
@@ -3080,7 +3070,7 @@
STR_PROGRESS :{WHITE}{NUM}% färdigt
STR_GENERATION_PROGRESS :{BLACK}{NUM} / {NUM}
STR_WORLD_GENERATION :{BLACK}Generera Värld
-STR_TREE_GENERATION :{BLACK}Träd generering
+STR_TREE_GENERATION :{BLACK}Generera Träd
STR_UNMOVABLE_GENERATION :{BLACK}Icke flyttbar generering
STR_CLEARING_TILES :{BLACK}Svår och stenig markgenerering
STR_SETTINGUP_GAME :{BLACK}Ställer in spel
@@ -3109,7 +3099,7 @@
STR_INTERCONTINENTAL_AIRPORT :{BLACK}Jättestor flygplats
STR_HELIPORT :{BLACK}Helikopterplatta
STR_HELIDEPOT :{BLACK}Helikopterhangar
-STR_HELISTATION :{BLACK}Helikopterplatta
+STR_HELISTATION :{BLACK}Helikopterstation
STR_SMALL_AIRPORTS :{BLACK}Små flygfält
STR_LARGE_AIRPORTS :{BLACK}Stora Flygplatser
--- a/lang/turkish.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/turkish.txt Mon Jan 01 16:31:13 2007 +0000
@@ -88,7 +88,7 @@
STR_QUANTITY_MAIL :{COMMA} çanta posta
STR_QUANTITY_OIL :{VOLUME} petrol
STR_QUANTITY_LIVESTOCK :{COMMA} tane hayvan
-STR_QUANTITY_GOODS :{COMMA} kasa esya
+STR_QUANTITY_GOODS :{COMMA} kasa eşya
STR_QUANTITY_GRAIN :{WEIGHT} tahıl
STR_QUANTITY_WOOD :{WEIGHT} odun
STR_QUANTITY_IRON_ORE :{WEIGHT} demir
@@ -359,7 +359,7 @@
STR_015D_LOAD_GAME :Yükle
STR_015E_QUIT_GAME :Bitir
STR_015F_QUIT :Çıkış
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Oyunu bitirmek istediğinizden emin misiniz?
+STR_ABANDON_GAME_QUERY :{YELLOW}Oyunu bitirmek istediğinizden emin misiniz?
STR_0161_QUIT_GAME :{WHITE}Oyunu Bitir
STR_SORT_ORDER_TIP :{BLACK}Sıralama türü seçin (azalan/artan)
STR_SORT_CRITERIA_TIP :{BLACK}Sıralama kriteri seçin
@@ -550,7 +550,7 @@
STR_01E5 :{DKGREEN}{TINYFONT}{COMMA}
STR_01E6 :{DKGREEN}{TINYFONT}------
STR_01E7 :{DKGREEN}{TINYFONT}"{STRING}"
-STR_01E8_TRACK_XTITLE :{BLACK}{TINYFONT}Sarki{SETX 88}Basligi
+STR_01E8_TRACK_XTITLE :{BLACK}{TINYFONT}Sarki{SETX 88}Başlığı
STR_01E9_SHUFFLE :{TINYFONT}Rastgele
STR_01EA_PROGRAM :{TINYFONT}{BLACK}Program
STR_01EB_MUSIC_PROGRAM_SELECTION :{WHITE}Müzik Programi Seçimi
@@ -738,11 +738,11 @@
STR_029A_PLAY_SCENARIO :{BLACK}Senaryo Oyna
STR_PLAY_HEIGHTMAP :{BLACK}Yükseklik Haritası Oyna
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Yükseklik haritasını kullanarak yeni oyun başlat
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Bu senaryodan çıkmak istediğinizden emin misiniz ?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Bu senaryodan çıkmak istediğinizden emin misiniz ?
STR_029C_QUIT_EDITOR :{WHITE}Editörden Çık
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...nüfusu en az 1200 olan şehirlere yapılabilir
-STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Baslama yılını düşür
-STR_029F_MOVE_THE_STARTING_DATE :{BLACK}Baslama yılını arttır
+STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Başlama yılını düşür
+STR_029F_MOVE_THE_STARTING_DATE :{BLACK}Başlama yılını arttır
STR_02A0_ENDS_OF_BRIDGE_MUST_BOTH :{WHITE}...köprünün uçları karada olmalı
STR_02A1_SMALL :{BLACK}Küçük
STR_02A2_MEDIUM :{BLACK}Orta
@@ -1012,7 +1012,7 @@
STR_CONFIG_PATCHES_OFF :Kapalı
STR_CONFIG_PATCHES_ON :Açık
STR_CONFIG_PATCHES_VEHICLESPEED :{LTBLUE}Durum çubuğunda arabanın hızını göster: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES :{LTBLUE}Sahil ve eğimli araziye inşaat: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_BUILDONSLOPES :{LTBLUE}Sahile ve eğimli araziye inşaat: {ORANGE}{STRING}
STR_CONFIG_PATCHES_CATCHMENT :{LTBLUE}Daha gerçekçi kapsama alanı: {ORANGE}{STRING}
STR_CONFIG_PATCHES_EXTRADYNAMITE :{LTBLUE}Şehrin yollarını, köprülerini yıkma izinli: {ORANGE}{STRING}
STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Çok uzun trenlere izin ver: {ORANGE}{STRING}
@@ -1350,7 +1350,7 @@
STR_NETWORK_LANGUAGE_SPOKEN :{BLACK}Konuşulan dil:
STR_NETWORK_LANGUAGE_TIP :{BLACK}Diğer oyuncular sunucuda hangi dilin konuşulacağını bilecek
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}Oyunu Baslat
+STR_NETWORK_START_GAME :{BLACK}Oyunu Başlat
STR_NETWORK_START_GAME_TIP :{BLACK}Rastgele harita ya da senaryoda network oyunu aç
STR_NETWORK_LOAD_GAME :{BLACK}Oyun Yükle
STR_NETWORK_LOAD_GAME_TIP :{BLACK}Kayıtlı oyunu devam ettir (doğru oyuncu olarak bağlandığından emin ol)
@@ -2106,7 +2106,7 @@
STR_7032_CHANGE_THE_PRESIDENT_S :{BLACK}Müdürün ismini değiştir
STR_7033_CHANGE_THE_COMPANY_NAME :{BLACK}Şirket ismini değiştir
STR_7034_CLICK_ON_SELECTED_NEW_COLOR :{BLACK}İstediginiz rengi seçin
-STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Kredi miktarını arttır
+STR_7035_INCREASE_SIZE_OF_LOAN :{BLACK}Kredi ödünç al
STR_7036_REPAY_PART_OF_LOAN :{BLACK}Krediyi öde
STR_7037_PRESIDENT :{WHITE}{PLAYERNAME}{}{GOLD}(Manager)
STR_7038_INAUGURATED :{GOLD}Kuruluş: {WHITE}{NUM}
@@ -2156,9 +2156,9 @@
STR_7068_TRANSPORT_COORDINATOR :Nakliyeci
STR_7069_ROUTE_SUPERVISOR :Rota Yöneticisi
STR_706A_DIRECTOR :Yönetmen
-STR_706B_CHIEF_EXECUTIVE :Bas Yönetici
+STR_706B_CHIEF_EXECUTIVE :Baş Yönetici
STR_706C_CHAIRMAN :Başkan
-STR_706D_PRESIDENT :Basbakan
+STR_706D_PRESIDENT :Başbakan
STR_706E_TYCOON :Kodaman(Tycoon)
STR_706F_BUILD_HQ :{BLACK}Bina Yap
STR_7070_BUILD_COMPANY_HEADQUARTERS :{BLACK}Şirket binasi yap / şirket binasina bak
@@ -2603,6 +2603,7 @@
STR_885C_BROKEN_DOWN :{RED}Bozuldu
STR_885D_AGE_RUNNING_COST_YR :{BLACK}Yaş: {LTBLUE}{STRING}{BLACK} Bakım: {LTBLUE}{CURRENCY}/sene
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Ağırlık: {LTBLUE}{WEIGHT_S} {BLACK}Güç: {LTBLUE}{POWER}{BLACK} Mak. hız: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Ağırlık: {LTBLUE}{WEIGHT_S} {BLACK}Güç: {LTBLUE}{POWER}{BLACK} Mak. hız: {LTBLUE}{VELOCITY} {BLACK}Max. Ç.G.: {LTBLUE}{FORCE}
STR_885F_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Bu seneki kâr: {LTBLUE}{CURRENCY} (geçen sene: {CURRENCY})
STR_8860_RELIABILITY_BREAKDOWNS :{BLACK}güvenilirlik: {LTBLUE}%{COMMA} {BLACK}Son servisteki bozulmalar: {LTBLUE}{COMMA}
STR_8861_STOPPED :{RED}Durdu
@@ -2944,20 +2945,7 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Aynı talimatlara sahip bütün araçları göster
### depot strings
-
-STR_SELL :{BLACK}Sat
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}Garajdaki tüm araçları satmak üzeresiniz.
-STR_ARE_YOU_SURE :{BLACK}Emin misiniz?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Gardaki tüm trenleri satmayı onaylayın
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Garajdaki tüm arabaları satmayı onaylayın
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Tersanedeki tüm gemileri satmayı onaylayın
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Hangardaki bütün uçakları satmayı onaylayın
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}Gardaki tüm trenları satma
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}Garajdaki tüm arabaları satma
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}Tersanedeki tüm gemileri satma
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Hangardaki bütün uçakları satma
+STR_DEPOT_SELL_CONFIRMATION_TEXT :{YELLOW}Garajdaki bütün araçları satmak üzeresiniz. Emin misiniz?
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Gardaki tüm trenleri sat
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Garajdaki tüm arabaları sat
@@ -2980,7 +2968,7 @@
STR_VEHICLE_LIST_AIRCRAFT_DEPOT :{BLACK}{STRING} - {COMMA} Uçak
STR_REPLACE_VEHICLES_WHITE :{WHITE}{STRING} Değiştir
-STR_REPLACE_VEHICLES_START :{BLACK}Araçları Değiştirmeye Basla
+STR_REPLACE_VEHICLES_START :{BLACK}Araçları Değiştirmeye Başla
STR_REPLACE_VEHICLES_STOP :{BLACK}Araçları değiştirmeyi durdur
STR_NOT_REPLACING :{BLACK}Değiştirilmiyor
STR_NOT_REPLACING_VEHICLE_SELECTED :{BLACK}Hiç Araç Seçilmedi
@@ -3043,6 +3031,7 @@
STR_PURCHASE_INFO_REFITTABLE_TO :{BLACK}Modifiye edilebilir: {GOLD}
STR_PURCHASE_INFO_ALL_TYPES :Tüm kargo türleri
STR_PURCHASE_INFO_ALL_BUT :{GOLD} hariç hepsi
+STR_PURCHASE_INFO_MAX_TE :{BLACK}Mak. Çekim Gücü: {GOLD}{FORCE}
########### String for New Landscape Generator
@@ -3066,7 +3055,7 @@
STR_SNOW_LINE_UP :{BLACK}Kar yüksekliğini bir arttır
STR_SNOW_LINE_DOWN :{BLACK}Kar yüksekliğini bir azalt
STR_SNOW_LINE_QUERY_CAPT :{WHITE}Kar yüksekliğini değiştir
-STR_START_DATE_QUERY_CAPT :{WHITE}Baslangic yılını değiştir
+STR_START_DATE_QUERY_CAPT :{WHITE}Başlangıç yılını değiştir
STR_HEIGHTMAP_SCALE_WARNING_CAPTION :{WHITE}Ölcek uyarısı
STR_HEIGHTMAP_SCALE_WARNING_MESSAGE :{YELLOW}Kaynak haritanin boyutunu değiştirmek önerilmez. Harita oluşturmaya devam edilsin mi?
STR_SNOW_LINE_HEIGHT_NUM :{NUM}
--- a/lang/ukrainian.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/lang/ukrainian.txt Mon Jan 01 16:31:13 2007 +0000
@@ -360,7 +360,7 @@
STR_015D_LOAD_GAME :Завантажити гру
STR_015E_QUIT_GAME :Покинути гру
STR_015F_QUIT :Вихід
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Покинути гру?
+STR_ABANDON_GAME_QUERY :{YELLOW}Покинути гру?
STR_0161_QUIT_GAME :{WHITE}Покинути гру
STR_SORT_ORDER_TIP :{BLACK}Виберіть порядок сортування (спадаючий/зростаючий)
STR_SORT_CRITERIA_TIP :{BLACK}Виберіть критерій сортування
@@ -739,7 +739,7 @@
STR_029A_PLAY_SCENARIO :{BLACK}Грати за сценарієм
STR_PLAY_HEIGHTMAP :{BLACK}Грати з карти висот
STR_PLAY_HEIGHTMAP_HINT :{BLACK}Почати нову гру, використавши карту висот за ландшафт
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO :{YELLOW}Ви дійсно бажаєти вийти з сценарію?
+STR_QUIT_SCENARIO_QUERY :{YELLOW}Ви дійсно бажаєти вийти з сценарію?
STR_029C_QUIT_EDITOR :{WHITE}Вихід з редактору
STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...можливо будувати лише у містах з населення не менш 1200
STR_029E_MOVE_THE_STARTING_DATE :{BLACK}Перенести початкову дату на 1 рік назад
@@ -2946,21 +2946,6 @@
STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Показати транспорт з таким самим маршрутом
### depot strings
-
-STR_SELL :{BLACK}Продати
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM :{BLACK}Ви збираєтеся продати всі авто з депо
-STR_ARE_YOU_SURE :{BLACK}Ви впевнені?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP :{BLACK}Підтвердіть, що ви хочете продати всі поїди з депо
-STR_DEPOT_SELL_ALL_ROADVEH_TIP :{BLACK}Підтвердіть, що Ви хочете продати всі авто з депо
-STR_DEPOT_SELL_ALL_SHIP_TIP :{BLACK}Підтвердіть, що Ви хочете продати всі кораблі з депо
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP :{BLACK}Підтвердіть, що хочете продати всі літаки з ангару
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP :{BLACK}Не продавати всі поїзди з депо
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP :{BLACK}Не продавати всі авто з депо
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP :{BLACK}Не продавати всі кораблі з депо
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP :{BLACK}Не продавати всі літаки з ангару
-
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Продати всі поїзди з депо
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Продати всі автомобілі з депо
STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP :{BLACK}Продати всі кораблі з депо
--- a/main_gui.c Mon Jan 01 16:10:01 2007 +0000
+++ b/main_gui.c Mon Jan 01 16:31:13 2007 +0000
@@ -43,8 +43,8 @@
#include "network_gui.h"
#include "industry.h"
-static int _rename_id;
-static int _rename_what;
+static int _rename_id = 1;
+static int _rename_what = -1;
static byte _terraform_size = 1;
RailType _last_built_railtype;
@@ -54,27 +54,23 @@
extern bool GenerateTowns(void);
-void HandleOnEditText(WindowEvent *e)
+void HandleOnEditText(const char *str)
{
- const char *b = e->we.edittext.str;
- int id;
-
- _cmd_text = b;
-
- id = _rename_id;
+ int id = _rename_id;
+ _cmd_text = str;
switch (_rename_what) {
case 0: /* Rename a s sign, if string is empty, delete sign */
DoCommandP(0, id, 0, NULL, CMD_RENAME_SIGN | CMD_MSG(STR_280C_CAN_T_CHANGE_SIGN_NAME));
break;
case 1: /* Rename a waypoint */
- if (*b == '\0') return;
+ if (*str == '\0') return;
DoCommandP(0, id, 0, NULL, CMD_RENAME_WAYPOINT | CMD_MSG(STR_CANT_CHANGE_WAYPOINT_NAME));
break;
#ifdef ENABLE_NETWORK
case 3: { /* Give money, you can only give money in excess of loan */
const Player *p = GetPlayer(_current_player);
- int32 money = min(p->money64 - p->current_loan, atoi(e->we.edittext.str) / _currency->rate);
+ int32 money = min(p->money64 - p->current_loan, atoi(str) / _currency->rate);
char msg[20];
money = clamp(money, 0, 20000000); // Clamp between 20 million and 0
@@ -90,10 +86,12 @@
} else {
NetworkServer_HandleChat(NETWORK_ACTION_GIVE_MONEY, DESTTYPE_TEAM, id, msg, NETWORK_SERVER_INDEX);
}
- break;
+ } break;
+#endif /* ENABLE_NETWORK */
+ default: NOT_REACHED();
}
-#endif /* ENABLE_NETWORK */
- }
+
+ _rename_id = _rename_what = -1;
}
/**
@@ -309,7 +307,7 @@
{
_rename_id = player;
_rename_what = 3;
- ShowQueryString(STR_EMPTY, STR_NETWORK_GIVE_MONEY_CAPTION, 30, 180, 1, 0, CS_NUMERAL);
+ ShowQueryString(STR_EMPTY, STR_NETWORK_GIVE_MONEY_CAPTION, 30, 180, NULL, CS_NUMERAL);
}
#endif /* ENABLE_NETWORK */
@@ -317,7 +315,7 @@
{
_rename_id = si->index;
_rename_what = 0;
- ShowQueryString(si->str, STR_280B_EDIT_SIGN_TEXT, 30, 180, 1, 0, CS_ALPHANUMERAL);
+ ShowQueryString(si->str, STR_280B_EDIT_SIGN_TEXT, 30, 180, NULL, CS_ALPHANUMERAL);
}
void ShowRenameWaypointWindow(const Waypoint *wp)
@@ -334,7 +332,7 @@
_rename_id = id;
_rename_what = 1;
SetDParam(0, id);
- ShowQueryString(STR_WAYPOINT_RAW, STR_EDIT_WAYPOINT_NAME, 30, 180, 1, 0, CS_ALPHANUMERAL);
+ ShowQueryString(STR_WAYPOINT_RAW, STR_EDIT_WAYPOINT_NAME, 30, 180, NULL, CS_ALPHANUMERAL);
}
static void SelectSignTool(void)
@@ -1835,17 +1833,15 @@
SetWindowDirty(w);
} break;
- case WE_ON_EDIT_TEXT: HandleOnEditText(e); break;
-
case WE_MOUSELOOP:
if (IsWindowWidgetLowered(w, 0) != !!_pause) {
ToggleWidgetLoweredState(w, 0);
- SetWindowDirty(w);
+ InvalidateWidget(w, 0);
}
if (IsWindowWidgetLowered(w, 1) != !!_fast_forward) {
ToggleWidgetLoweredState(w, 1);
- SetWindowDirty(w);
+ InvalidateWidget(w, 1);
}
break;
@@ -2036,8 +2032,6 @@
SetWindowDirty(w);
} break;
- case WE_ON_EDIT_TEXT: HandleOnEditText(e); break;
-
case WE_MOUSELOOP:
if (IsWindowWidgetLowered(w, 0) != !!_pause) {
ToggleWidgetLoweredState(w, 0);
@@ -2365,13 +2359,12 @@
void ShowSelectGameWindow(void);
-extern void ShowJoinStatusWindowAfterJoin(void);
void SetupColorsAndInitialWindow(void)
{
uint i;
Window *w;
- int width,height;
+ int width, height;
for (i = 0; i != 16; i++) {
const byte *b = GetNonSprite(PALETTE_RECOLOR_START + i);
@@ -2383,32 +2376,20 @@
width = _screen.width;
height = _screen.height;
+ w = AllocateWindow(0, 0, width, height, MainWindowWndProc, WC_MAIN_WINDOW, NULL);
+ AssignWindowViewport(w, 0, 0, width, height, TileXY(32, 32), 0);
+
// XXX: these are not done
switch (_game_mode) {
- case GM_MENU:
- w = AllocateWindow(0, 0, width, height, MainWindowWndProc, WC_MAIN_WINDOW, NULL);
- AssignWindowViewport(w, 0, 0, width, height, TileXY(32, 32), 0);
- ShowSelectGameWindow();
- break;
- case GM_NORMAL:
- w = AllocateWindow(0, 0, width, height, MainWindowWndProc, WC_MAIN_WINDOW, NULL);
- AssignWindowViewport(w, 0, 0, width, height, TileXY(32, 32), 0);
-
- ShowVitalWindows();
+ default: NOT_REACHED();
+ case GM_MENU:
+ ShowSelectGameWindow();
+ break;
- /* Bring joining GUI to front till the client is really joined */
- if (_networking && !_network_server)
- ShowJoinStatusWindowAfterJoin();
-
- break;
- case GM_EDITOR:
- w = AllocateWindow(0, 0, width, height, MainWindowWndProc, WC_MAIN_WINDOW, NULL);
- AssignWindowViewport(w, 0, 0, width, height, 0, 0);
-
- ShowVitalWindows();
- break;
- default:
- NOT_REACHED();
+ case GM_NORMAL:
+ case GM_EDITOR:
+ ShowVitalWindows();
+ break;
}
}
--- a/misc_gui.c Mon Jan 01 16:10:01 2007 +0000
+++ b/misc_gui.c Mon Jan 01 16:31:13 2007 +0000
@@ -942,12 +942,13 @@
WChar c = Utf8Consume(&buf);
tb->width = 0;
+ tb->length = 0;
for (; c != '\0' && tb->length < (tb->maxlength - 1); c = Utf8Consume(&buf)) {
tb->width += GetCharacterWidth(FS_NORMAL, c);
+ tb->length += Utf8CharLen(c);
}
- tb->length = buf - tb->buf - 1;
tb->caretpos = tb->length;
tb->caretxoffs = tb->width;
}
@@ -1038,93 +1039,87 @@
_cur_dpi = old_dpi;
}
+enum QueryStringWidgets {
+ QUERY_STR_WIDGET_TEXT = 3,
+ QUERY_STR_WIDGET_CANCEL,
+ QUERY_STR_WIDGET_OK
+};
+
+
static void QueryStringWndProc(Window *w, WindowEvent *e)
{
- static bool closed = false;
- switch (e->event) {
- case WE_CREATE:
- SETBIT(_no_scroll, SCROLL_EDIT);
- closed = false;
- break;
-
- case WE_PAINT:
- SetDParam(0, WP(w,querystr_d).caption);
- DrawWindowWidgets(w);
-
- DrawEditBox(w, &WP(w,querystr_d), 5);
- break;
+ querystr_d *qs = &WP(w, querystr_d);
- case WE_CLICK:
- switch (e->we.click.widget) {
- case 3: DeleteWindow(w); break;
- case 4:
-press_ok:;
- if (WP(w, querystr_d).orig != NULL &&
- strcmp(WP(w, querystr_d).text.buf, WP(w, querystr_d).orig) == 0) {
- DeleteWindow(w);
- } else {
- char *buf = WP(w,querystr_d).text.buf;
- WindowClass wnd_class = WP(w,querystr_d).wnd_class;
- WindowNumber wnd_num = WP(w,querystr_d).wnd_num;
- Window *parent;
+ switch (e->event) {
+ case WE_CREATE:
+ SETBIT(_no_scroll, SCROLL_EDIT);
+ break;
- // Mask the edit-box as closed, so we don't send out a CANCEL
- closed = true;
-
- DeleteWindow(w);
+ case WE_PAINT:
+ SetDParam(0, qs->caption);
+ DrawWindowWidgets(w);
- parent = FindWindowById(wnd_class, wnd_num);
- if (parent != NULL) {
- WindowEvent e;
- e.event = WE_ON_EDIT_TEXT;
- e.we.edittext.str = buf;
- parent->wndproc(parent, &e);
- }
+ DrawEditBox(w, qs, QUERY_STR_WIDGET_TEXT);
+ break;
+
+ case WE_CLICK:
+ switch (e->we.click.widget) {
+ case QUERY_STR_WIDGET_OK:
+ press_ok:;
+ if (qs->orig == NULL || strcmp(qs->text.buf, qs->orig) != 0) {
+ Window *parent = w->parent;
+ qs->handled = true;
+
+ /* If the parent is NULL, the editbox is handled by general function
+ * HandleOnEditText */
+ if (parent != NULL) {
+ WindowEvent e;
+ e.event = WE_ON_EDIT_TEXT;
+ e.we.edittext.str = qs->text.buf;
+ parent->wndproc(parent, &e);
+ } else {
+ HandleOnEditText(qs->text.buf);
+ }
+ }
+ /* Fallthrough */
+ case QUERY_STR_WIDGET_CANCEL:
+ DeleteWindow(w);
+ break;
}
break;
- }
- break;
-
- case WE_MOUSELOOP: {
- if (!FindWindowById(WP(w,querystr_d).wnd_class, WP(w,querystr_d).wnd_num)) {
- DeleteWindow(w);
- return;
- }
- HandleEditBox(w, &WP(w, querystr_d), 5);
- } break;
- case WE_KEYPRESS: {
- switch (HandleEditBoxKey(w, &WP(w, querystr_d), 5, e)) {
- case 1: // Return
- goto press_ok;
- case 2: // Escape
- DeleteWindow(w);
+ case WE_MOUSELOOP:
+ HandleEditBox(w, qs, QUERY_STR_WIDGET_TEXT);
break;
- }
- } break;
- case WE_DESTROY:
- // If the window is not closed yet, it means it still needs to send a CANCEL
- if (!closed) {
- Window *parent = FindWindowById(WP(w,querystr_d).wnd_class, WP(w,querystr_d).wnd_num);
- if (parent != NULL) {
+ case WE_KEYPRESS:
+ switch (HandleEditBoxKey(w, qs, QUERY_STR_WIDGET_TEXT, e)) {
+ case 1: goto press_ok; /* Enter pressed, confirms change */
+ case 2: DeleteWindow(w); break; /* ESC pressed, closes window, abandons changes */
+ }
+ break;
+
+ case WE_DESTROY: /* Call cancellation of query, if we have not handled it before */
+ if (!qs->handled && w->parent != NULL) {
WindowEvent e;
+ Window *parent = w->parent;
+
+ qs->handled = true;
e.event = WE_ON_EDIT_TEXT_CANCEL;
parent->wndproc(parent, &e);
}
+ CLRBIT(_no_scroll, SCROLL_EDIT);
+ break;
}
- CLRBIT(_no_scroll, SCROLL_EDIT);
- break;
- }
}
static const Widget _query_string_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 259, 0, 13, STR_012D, STR_NULL},
{ WWT_PANEL, RESIZE_NONE, 14, 0, 259, 14, 29, 0x0, STR_NULL},
+{ WWT_PANEL, RESIZE_NONE, 14, 2, 257, 16, 27, 0x0, STR_NULL},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 0, 129, 30, 41, STR_012E_CANCEL, STR_NULL},
{ WWT_TEXTBTN, RESIZE_NONE, 14, 130, 259, 30, 41, STR_012F_OK, STR_NULL},
-{ WWT_PANEL, RESIZE_NONE, 14, 2, 257, 16, 27, 0x0, STR_NULL},
{ WIDGETS_END},
};
@@ -1137,10 +1132,19 @@
};
static char _edit_str_buf[64];
-static char _orig_str_buf[lengthof(_edit_str_buf)];
-void ShowQueryString(StringID str, StringID caption, uint maxlen, uint maxwidth, WindowClass window_class, WindowNumber window_number, CharSetFilter afilter)
+/** Show a query popup window with a textbox in it.
+ * @param str StringID for the text shown in the textbox
+ * @param caption StringID of text shown in caption of querywindow
+ * @param maxlen maximum length in characters allowed. If bit 12 is set we
+ * will not check the resulting string against to original string to return success
+ * @param maxwidth maximum width in pixels allowed
+ * @param parent pointer to a Window that will handle the events (ok/cancel) of this
+ * window. If NULL, results are handled by global function HandleOnEditText
+ * @param afilter filters out unwanted character input */
+void ShowQueryString(StringID str, StringID caption, uint maxlen, uint maxwidth, Window *parent, CharSetFilter afilter)
{
+ static char orig_str_buf[lengthof(_edit_str_buf)];
Window *w;
uint realmaxlen = maxlen & ~0x1000;
@@ -1150,6 +1154,7 @@
DeleteWindowById(WC_SAVELOAD, 0);
w = AllocateWindowDesc(&_query_string_desc);
+ w->parent = parent;
GetString(_edit_str_buf, str, lastof(_edit_str_buf));
_edit_str_buf[realmaxlen - 1] = '\0';
@@ -1157,80 +1162,125 @@
if (maxlen & 0x1000) {
WP(w, querystr_d).orig = NULL;
} else {
- strecpy(_orig_str_buf, _edit_str_buf, lastof(_orig_str_buf));
- WP(w, querystr_d).orig = _orig_str_buf;
+ strecpy(orig_str_buf, _edit_str_buf, lastof(orig_str_buf));
+ WP(w, querystr_d).orig = orig_str_buf;
}
- LowerWindowWidget(w, 5);
+ LowerWindowWidget(w, QUERY_STR_WIDGET_TEXT);
WP(w, querystr_d).caption = caption;
- WP(w, querystr_d).wnd_class = window_class;
- WP(w, querystr_d).wnd_num = window_number;
WP(w, querystr_d).afilter = afilter;
InitializeTextBuffer(&WP(w, querystr_d).text, _edit_str_buf, realmaxlen, maxwidth);
}
+
+enum QueryWidgets {
+ QUERY_WIDGET_CAPTION = 1,
+ QUERY_WIDGET_NO = 3,
+ QUERY_WIDGET_YES
+};
+
+
+typedef struct query_d {
+ StringID message; ///< message shown for query window
+ uint32 params[20]; ///< local copy of _decode_parameters
+ void (*proc)(Window*, bool); ///< callback function executed on closing of popup. Window* points to parent, bool is true if 'yes' clicked, false otherwise
+ bool calledback; ///< has callback been executed already (internal usage for WE_DESTROY event)
+} query_d;
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(query_d));
+
+
static void QueryWndProc(Window *w, WindowEvent *e)
{
- switch (e->event) {
- case WE_PAINT:
- SetDParam(0, WP(w, query_d).caption);
- DrawWindowWidgets(w);
-
- DrawStringMultiCenter(90, 38, WP(w, query_d).message, 178);
- break;
+ query_d *q = &WP(w, query_d);
- case WE_CLICK:
- switch (e->we.click.widget) {
- case 3:
- case 4:
- WP(w, query_d).calledback = true;
- if (WP(w, query_d).ok_cancel_callback != NULL) WP(w, query_d).ok_cancel_callback(e->we.click.widget == 4);
- DeleteWindow(w);
+ switch (e->event) {
+ case WE_PAINT:
+ COPY_IN_DPARAM(0, q->params, lengthof(q->params));
+ DrawWindowWidgets(w);
+ COPY_IN_DPARAM(0, q->params, lengthof(q->params));
+
+ DrawStringMultiCenter(w->width / 2, (w->height / 2) - 10, q->message, w->width);
break;
- }
- break;
- case WE_MOUSELOOP:
- if (!FindWindowById(WP(w, query_d).wnd_class, WP(w, query_d).wnd_num)) DeleteWindow(w);
- break;
+ case WE_CLICK:
+ switch (e->we.click.widget) {
+ case QUERY_WIDGET_YES:
+ q->calledback = true;
+ if (q->proc != NULL) q->proc(w->parent, true);
+ /* Fallthrough */
+ case QUERY_WIDGET_NO:
+ DeleteWindow(w);
+ break;
+ }
+ break;
- case WE_DESTROY:
- if (!WP(w, query_d).calledback && WP(w, query_d).ok_cancel_callback != NULL) WP(w, query_d).ok_cancel_callback(false);
- break;
+ case WE_KEYPRESS: /* ESC closes the window, Enter confirms the action */
+ switch (e->we.keypress.keycode) {
+ case WKC_RETURN:
+ case WKC_NUM_ENTER:
+ q->calledback = true;
+ if (q->proc != NULL) q->proc(w->parent, true);
+ /* Fallthrough */
+ case WKC_ESC:
+ e->we.keypress.cont = false;
+ DeleteWindow(w);
+ break;
+ }
+ break;
+
+ case WE_DESTROY: /* Call callback function (if any) on window close if not yet called */
+ if (!q->calledback && q->proc != NULL) {
+ q->calledback = true;
+ q->proc(w->parent, false);
+ }
+ break;
}
}
+
static const Widget _query_widgets[] = {
-{ WWT_CLOSEBOX, RESIZE_NONE, 4, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
-{ WWT_CAPTION, RESIZE_NONE, 4, 11, 179, 0, 13, STR_012D, STR_NULL},
-{ WWT_PANEL, RESIZE_NONE, 4, 0, 179, 14, 91, 0x0, STR_NULL},
-{ WWT_TEXTBTN, RESIZE_NONE, 12, 25, 84, 72, 83, STR_012E_CANCEL, STR_NULL},
-{ WWT_TEXTBTN, RESIZE_NONE, 12, 95, 154, 72, 83, STR_012F_OK, STR_NULL},
-{ WIDGETS_END },
+{ WWT_CLOSEBOX, RESIZE_NONE, 4, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
+{ WWT_CAPTION, RESIZE_NONE, 4, 11, 209, 0, 13, STR_NULL, STR_NULL},
+{ WWT_PANEL, RESIZE_NONE, 4, 0, 209, 14, 81, 0x0, /*OVERRIDE*/STR_NULL},
+{WWT_PUSHTXTBTN, RESIZE_NONE, 3, 20, 90, 62, 73, STR_00C9_NO, STR_NULL},
+{WWT_PUSHTXTBTN, RESIZE_NONE, 3, 120, 190, 62, 73, STR_00C8_YES, STR_NULL},
+{ WIDGETS_END },
};
static const WindowDesc _query_desc = {
- WDP_CENTER, WDP_CENTER, 180, 92,
- WC_OK_CANCEL_QUERY, 0,
- WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
+ WDP_CENTER, WDP_CENTER, 210, 82,
+ WC_CONFIRM_POPUP_QUERY, 0,
+ WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_UNCLICK_BUTTONS | WDF_DEF_WIDGET | WDF_MODAL,
_query_widgets,
QueryWndProc
};
-void ShowQuery(StringID caption, StringID message, void (*ok_cancel_callback)(bool ok_clicked), WindowClass window_class, WindowNumber window_number)
+/** Show a modal confirmation window with standard 'yes' and 'no' buttons
+ * The window is aligned to the centre of its parent.
+ * NOTE: You cannot use BindCString as parameter for this window!
+ * @param caption string shown as window caption
+ * @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 */
+void ShowQuery(StringID caption, StringID message, Window *parent, void (*callback)(Window*, bool))
{
- Window *w;
-
- DeleteWindowById(WC_OK_CANCEL_QUERY, 0);
+ Window *w = AllocateWindowDesc(&_query_desc);
+ if (w == NULL) return;
- w = AllocateWindowDesc(&_query_desc);
+ if (parent == NULL) parent = FindWindowById(WC_MAIN_WINDOW, 0);
+ w->parent = parent;
+ w->left = parent->left + (parent->width / 2) - (w->width / 2);
+ w->top = parent->top + (parent->height / 2) - (w->height / 2);
- WP(w, query_d).caption = caption;
- WP(w, query_d).message = message;
- WP(w, query_d).wnd_class = window_class;
- WP(w, query_d).wnd_num = window_number;
- WP(w, query_d).ok_cancel_callback = ok_cancel_callback;
- WP(w, query_d).calledback = false;
+ /* Create a backup of the variadic arguments to strings because it will be
+ * overridden pretty often. We will copy these back for drawing */
+ COPY_OUT_DPARAM(WP(w, query_d).params, 0, lengthof(WP(w, query_d).params));
+ w->widget[QUERY_WIDGET_CAPTION].data = caption;
+ WP(w, query_d).message = message;
+ WP(w, query_d).proc = callback;
+ WP(w, query_d).calledback = false;
}
--- a/music/qtmidi.c Mon Jan 01 16:10:01 2007 +0000
+++ b/music/qtmidi.c Mon Jan 01 16:31:13 2007 +0000
@@ -83,16 +83,25 @@
*/
static void SetMIDITypeIfNeeded(const FSSpec *spec)
{
- FInfo info;
+ FSRef ref;
+ FSCatalogInfo catalogInfo;
+
assert(spec);
- if (noErr != FSpGetFInfo(spec, &info)) return;
-
- /* Set file type to 'Midi' if the file is _not_ an alias. */
- if (info.fdType != midiType && !(info.fdFlags & kIsAlias)) {
- info.fdType = midiType;
- FSpSetFInfo(spec, &info);
- DEBUG(driver, 3, "qtmidi: changed filetype to 'Midi'");
+ if (noErr != FSpMakeFSRef(spec, &ref)) return;
+ if (noErr != FSGetCatalogInfo(&ref, kFSCatInfoNodeFlags | kFSCatInfoFinderInfo, &catalogInfo, NULL, NULL, NULL)) return;
+ if (!(catalogInfo.nodeFlags & kFSNodeIsDirectoryMask)) {
+ FileInfo * const info = (FileInfo *) catalogInfo.finderInfo;
+ if (info->fileType != midiType && !(info->finderFlags & kIsAlias)) {
+ OSErr e;
+ info->fileType = midiType;
+ e = FSSetCatalogInfo(&ref, kFSCatInfoFinderInfo, &catalogInfo);
+ if (e == noErr) {
+ DEBUG(driver, 3, "qtmidi: changed filetype to 'Midi'");
+ } else {
+ DEBUG(driver, 0, "qtmidi: changing filetype to 'Midi' failed - error %d", e);
+ }
+ }
}
}
--- a/network.c Mon Jan 01 16:10:01 2007 +0000
+++ b/network.c Mon Jan 01 16:31:13 2007 +0000
@@ -29,6 +29,7 @@
#include "network_server.h"
#include "network_udp.h"
#include "network_gamelist.h"
+#include "network_gui.h"
#include "console.h" /* IConsoleCmdExec */
#include <stdarg.h> /* va_list */
#include "md5.h"
@@ -47,7 +48,6 @@
static uint16 _network_client_index = NETWORK_SERVER_INDEX + 1;
/* Some externs / forwards */
-extern void ShowJoinStatusWindow(void);
extern void StateGameLoop(void);
// Function that looks up the CI for a given client-index
@@ -689,6 +689,7 @@
// in client mode, only the first client field is used. it's pointing to the server.
NetworkAllocClient(s);
+ _network_join_status = NETWORK_JOIN_STATUS_CONNECTING;
ShowJoinStatusWindow();
return true;
--- a/network_client.c Mon Jan 01 16:10:01 2007 +0000
+++ b/network_client.c Mon Jan 01 16:31:13 2007 +0000
@@ -491,13 +491,14 @@
_network_join_status = NETWORK_JOIN_STATUS_PROCESSING;
InvalidateWindow(WC_NETWORK_STATUS_WINDOW, 0);
- // The map is done downloading, load it
- // Load the map
+ /* The map is done downloading, load it */
if (!SafeSaveOrLoad(filename, SL_LOAD, GM_NORMAL)) {
DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
_switch_mode_errorstr = STR_NETWORK_ERR_SAVEGAMEERROR;
return NETWORK_RECV_STATUS_SAVEGAME;
}
+ /* If the savegame has successfully loaded, ALL windows have been removed,
+ * only toolbar/statusbar and gamefield are visible */
_opt_ptr = &_opt; // during a network game you are always in-game
@@ -511,18 +512,16 @@
SetLocalPlayer(PLAYER_SPECTATOR);
- if (_network_playas == PLAYER_SPECTATOR) {
- // The client wants to be a spectator..
- DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
- } else {
+ if (_network_playas != PLAYER_SPECTATOR) {
/* We have arrived and ready to start playing; send a command to make a new player;
* the server will give us a client-id and let us in */
+ _network_join_status = NETWORK_JOIN_STATUS_REGISTERING;
+ ShowJoinStatusWindow();
NetworkSend_Command(0, 0, 0, CMD_PLAYER_CTRL, NULL);
}
} else {
// take control over an existing company
SetLocalPlayer(_network_playas);
- DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
}
}
--- a/network_gui.c Mon Jan 01 16:10:01 2007 +0000
+++ b/network_gui.c Mon Jan 01 16:31:13 2007 +0000
@@ -424,8 +424,7 @@
STR_NETWORK_ENTER_IP,
31 | 0x1000, // maximum number of characters OR
250, // characters up to this width pixels, whichever is satisfied first
- w->window_class,
- w->window_number, CS_ALPHANUMERAL);
+ w, CS_ALPHANUMERAL);
} break;
case 13: /* Start server */
ShowNetworkStartServerWindow();
@@ -648,8 +647,7 @@
break;
case 4: /* Set password button */
- ShowQueryString(BindCString(_network_server_password),
- STR_NETWORK_SET_PASSWORD, 20, 250, w->window_class, w->window_number, CS_ALPHANUMERAL);
+ ShowQueryString(BindCString(_network_server_password), STR_NETWORK_SET_PASSWORD, 20, 250, w, CS_ALPHANUMERAL);
break;
case 5: { /* Select map */
@@ -1381,7 +1379,7 @@
case NETWORK_GAME_PASSWORD: caption = STR_NETWORK_NEED_GAME_PASSWORD_CAPTION; break;
case NETWORK_COMPANY_PASSWORD: caption = STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION; break;
}
- ShowQueryString(STR_EMPTY, caption, 20, 180, WC_NETWORK_STATUS_WINDOW, 0, CS_ALPHANUMERAL);
+ ShowQueryString(STR_EMPTY, caption, 20, 180, FindWindowById(WC_NETWORK_STATUS_WINDOW, 0), CS_ALPHANUMERAL);
}
@@ -1418,16 +1416,16 @@
case WE_CLICK:
switch (e->we.click.widget) {
- case 0: /* Close 'X' */
- case 3: /* Disconnect button */
+ case 2: /* Disconnect button */
NetworkDisconnect();
- DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
+ DeleteWindow(w);
SwitchMode(SM_MENU);
ShowNetworkGameWindow();
break;
}
break;
+ /* If the server asks for a password, we need to fill it in */
case WE_ON_EDIT_TEXT_CANCEL:
NetworkDisconnect();
ShowNetworkGameWindow();
@@ -1440,8 +1438,7 @@
}
static const Widget _network_join_status_window_widget[] = {
-{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
-{ WWT_CAPTION, RESIZE_NONE, 14, 11, 249, 0, 13, STR_NETWORK_CONNECTING, STR_018C_WINDOW_TITLE_DRAG_THIS},
+{ WWT_CAPTION, RESIZE_NONE, 14, 0, 249, 0, 13, STR_NETWORK_CONNECTING, STR_018C_WINDOW_TITLE_DRAG_THIS},
{ WWT_PANEL, RESIZE_NONE, 14, 0, 249, 14, 84, 0x0, STR_NULL},
{ WWT_PUSHTXTBTN, RESIZE_NONE, BTC, 75, 175, 69, 80, STR_NETWORK_DISCONNECT, STR_NULL},
{ WIDGETS_END},
@@ -1450,26 +1447,18 @@
static const WindowDesc _network_join_status_window_desc = {
WDP_CENTER, WDP_CENTER, 250, 85,
WC_NETWORK_STATUS_WINDOW, 0,
- WDF_STD_TOOLTIPS | WDF_DEF_WIDGET,
+ WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_MODAL,
_network_join_status_window_widget,
NetworkJoinStatusWindowWndProc,
};
void ShowJoinStatusWindow(void)
{
+ Window *w;
DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
- _network_join_status = NETWORK_JOIN_STATUS_CONNECTING;
- AllocateWindowDesc(&_network_join_status_window_desc);
-}
-
-void ShowJoinStatusWindowAfterJoin(void)
-{
- /* This is a special instant of ShowJoinStatusWindow, because
- it is opened after the map is loaded, but the client maybe is not
- done registering itself to the server */
- DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
- _network_join_status = NETWORK_JOIN_STATUS_REGISTERING;
- AllocateWindowDesc(&_network_join_status_window_desc);
+ w = AllocateWindowDesc(&_network_join_status_window_desc);
+ /* Parent the status window to the lobby */
+ if (w != NULL) w->parent = FindWindowById(WC_NETWORK_WINDOW, 0);
}
static void SendChat(const char *buf, DestType type, byte dest)
@@ -1709,10 +1698,8 @@
w = AllocateWindowDesc(&_chat_window_desc);
LowerWindowWidget(w, 2);
- WP(w,querystr_d).caption = GB(type, 0, 8) | (dest << 8); // Misuse of caption
- WP(w,querystr_d).wnd_class = WC_MAIN_TOOLBAR;
- WP(w,querystr_d).wnd_num = 0;
- WP(w,querystr_d).afilter = CS_ALPHANUMERAL;
+ WP(w, querystr_d).caption = GB(type, 0, 8) | (dest << 8); // Misuse of caption
+ WP(w, querystr_d).afilter = CS_ALPHANUMERAL;
InitializeTextBuffer(&WP(w, querystr_d).text, _edit_str_buf, lengthof(_edit_str_buf), 0);
}
--- a/network_gui.h Mon Jan 01 16:10:01 2007 +0000
+++ b/network_gui.h Mon Jan 01 16:31:13 2007 +0000
@@ -10,7 +10,7 @@
void ShowNetworkNeedPassword(NetworkPasswordType npt);
void ShowNetworkGiveMoneyWindow(byte player); // PlayerID
void ShowNetworkChatQueryWindow(DestType type, byte dest);
-void ShowJoinStatusWindowAfterJoin(void);
+void ShowJoinStatusWindow(void);
void ShowNetworkGameWindow(void);
void ShowClientList(void);
@@ -19,7 +19,6 @@
static inline void ShowNetworkChatQueryWindow(byte desttype, byte dest) {}
static inline void ShowClientList(void) {}
-static inline void ShowJoinStatusWindowAfterJoin(void) {}
static inline void ShowNetworkGameWindow(void) {}
#endif /* ENABLE_NETWORK */
--- a/newgrf.c Mon Jan 01 16:10:01 2007 +0000
+++ b/newgrf.c Mon Jan 01 16:31:13 2007 +0000
@@ -2351,65 +2351,63 @@
return;
}
- if (param == 0x88 && GetFileByGRFID(cond_val) == NULL) {
- grfmsg(7, "GRFID 0x%08X unknown, skipping test", BSWAP32(cond_val));
- return;
- }
-
param_val = GetParamVal(param, &cond_val);
grfmsg(7, "Test condtype %d, param 0x%08X, condval 0x%08X", condtype, param_val, cond_val);
- switch (condtype) {
- case 0: result = !!(param_val & (1 << cond_val));
- break;
- case 1: result = !(param_val & (1 << cond_val));
- break;
- case 2: result = (param_val & mask) == cond_val;
- break;
- case 3: result = (param_val & mask) != cond_val;
- break;
- case 4: result = (param_val & mask) < cond_val;
- break;
- case 5: result = (param_val & mask) > cond_val;
- break;
-
- /* Tests 6 to 10 are only for param 0x88, GRFID checks */
- case 6: { /* Is GRFID active? */
- const GRFConfig *c = GetGRFConfig(cond_val);
- if (c == NULL) return;
- result = HASBIT(c->flags, GCF_ACTIVATED);
- break;
+
+ if (param == 0x88) {
+ /* GRF ID checks */
+
+ const GRFConfig *c = GetGRFConfig(cond_val);
+
+ if (condtype != 10 && c == NULL) {
+ grfmsg(7, "GRFID 0x%08X unknown, skipping test", BSWAP32(cond_val));
+ return;
}
- case 7: { /* Is GRFID non-active? */
- const GRFConfig *c = GetGRFConfig(cond_val);
- if (c == NULL) return;
- result = !HASBIT(c->flags, GCF_ACTIVATED);
- break;
- }
-
- case 8: { /* GRFID is not but will be active? */
- const GRFConfig *c = GetGRFConfig(cond_val);
- if (c == NULL) return;
- result = !HASBIT(c->flags, GCF_ACTIVATED) && !HASBIT(c->flags, GCF_DISABLED);
- break;
+ switch (condtype) {
+ /* Tests 6 to 10 are only for param 0x88, GRFID checks */
+ case 6: /* Is GRFID active? */
+ result = HASBIT(c->flags, GCF_ACTIVATED);
+ break;
+
+ case 7: /* Is GRFID non-active? */
+ result = !HASBIT(c->flags, GCF_ACTIVATED);
+ break;
+
+ case 8: /* GRFID is not but will be active? */
+ result = !HASBIT(c->flags, GCF_ACTIVATED) && !HASBIT(c->flags, GCF_DISABLED);
+ break;
+
+ case 9: /* GRFID is or will be active? */
+ result = !HASBIT(c->flags, GCF_NOT_FOUND) && !HASBIT(c->flags, GCF_DISABLED);
+ break;
+
+ case 10: /* GRFID is not nor will be active */
+ /* This is the only condtype that doesn't get ignored if the GRFID is not found */
+ result = c == NULL || HASBIT(c->flags, GCF_DISABLED) || HASBIT(c->flags, GCF_NOT_FOUND);
+ break;
+
+ default: grfmsg(1, "Unsupported GRF test %d. Ignoring", condtype); return;
}
-
- case 9: { /* GRFID is or will be active? */
- const GRFConfig *c = GetGRFConfig(cond_val);
- if (c == NULL) return;
- result = !HASBIT(c->flags, GCF_NOT_FOUND) && !HASBIT(c->flags, GCF_DISABLED);
- break;
+ } else {
+ /* Parameter or variable tests */
+ switch (condtype) {
+ case 0: result = !!(param_val & (1 << cond_val));
+ break;
+ case 1: result = !(param_val & (1 << cond_val));
+ break;
+ case 2: result = (param_val & mask) == cond_val;
+ break;
+ case 3: result = (param_val & mask) != cond_val;
+ break;
+ case 4: result = (param_val & mask) < cond_val;
+ break;
+ case 5: result = (param_val & mask) > cond_val;
+ break;
+
+ default: grfmsg(1, "Unsupported test %d. Ignoring", condtype); return;
}
-
- case 10: { /* GRFID is not nor will be active */
- const GRFConfig *c = GetGRFConfig(cond_val);
- /* This is the only condtype that doesn't get ignored if the GRFID is not found */
- result = c == NULL || HASBIT(c->flags, GCF_DISABLED) || HASBIT(c->flags, GCF_NOT_FOUND);
- break;
- }
-
- default: grfmsg(1, "Unsupported test %d. Ignoring", condtype); return;
}
if (!result) {
@@ -2483,9 +2481,7 @@
info = name + name_len + 1;
info_len = ttd_strnlen(info, len);
- if (info_len < len) {
- _cur_grfconfig->info = TranslateTTDPatchCodes(info);
- }
+ if (info_len < len) _cur_grfconfig->info = TranslateTTDPatchCodes(info);
}
}
@@ -3427,7 +3423,7 @@
/* Copy the initial parameter list */
assert(lengthof(newfile->param) == lengthof(config->param) && lengthof(config->param) == 0x80);
newfile->param_end = config->num_params;
- memcpy(newfile->param, config->param, 0x80 * sizeof(newfile->param[0]));
+ memcpy(newfile->param, config->param, sizeof(newfile->param));
if (_first_grffile == NULL) {
_cur_grffile = newfile;
--- a/newgrf_config.c Mon Jan 01 16:10:01 2007 +0000
+++ b/newgrf_config.c Mon Jan 01 16:31:13 2007 +0000
@@ -328,6 +328,8 @@
return NULL;
}
+#ifdef ENABLE_NETWORK
+
/** Structure for UnknownGRFs; this is a lightweight variant of GRFConfig */
typedef struct UnknownGRF UnknownGRF;
struct UnknownGRF {
@@ -377,6 +379,8 @@
return grf->name;
}
+#endif /* ENABLE_NETWORK */
+
/* Retrieve a NewGRF from the current config by its grfid */
GRFConfig *GetGRFConfig(uint32 grfid)
--- a/newgrf_config.h Mon Jan 01 16:10:01 2007 +0000
+++ b/newgrf_config.h Mon Jan 01 16:31:13 2007 +0000
@@ -55,8 +55,10 @@
/* In newgrf_gui.c */
void ShowNewGRFSettings(bool editable, bool show_params, bool exec_changes, GRFConfig **config);
+#ifdef ENABLE_NETWORK
/* For communication about GRFs over the network */
#define UNKNOWN_GRF_NAME_PLACEHOLDER "<Unknown>"
char *FindUnknownGRFName(uint32 grfid, uint8 *md5sum, bool create);
+#endif /* ENABLE_NETWORK */
#endif /* NEWGRF_CONFIG_H */
--- a/newgrf_gui.c Mon Jan 01 16:10:01 2007 +0000
+++ b/newgrf_gui.c Mon Jan 01 16:31:13 2007 +0000
@@ -278,10 +278,9 @@
/** Callback function for the newgrf 'apply changes' confirmation window
* @param yes_clicked boolean value, true when yes was clicked, false otherwise */
-static void NewGRFConfirmationCallback(bool yes_clicked)
+static void NewGRFConfirmationCallback(Window *w, bool confirmed)
{
- if (yes_clicked) {
- Window *w = FindWindowById(WC_GAME_OPTIONS, 0);
+ if (confirmed) {
newgrf_d *nd = &WP(w, newgrf_d);
CopyGRFConfigList(nd->orig_list, *nd->list);
@@ -424,9 +423,8 @@
ShowQuery(
STR_POPUP_CAUTION_CAPTION,
STR_NEWGRF_CONFIRMATION_TEXT,
- NewGRFConfirmationCallback,
- w->window_class,
- w->window_number
+ w,
+ NewGRFConfirmationCallback
);
} else {
CopyGRFConfigList(WP(w, newgrf_d).orig_list, *WP(w, newgrf_d).list);
@@ -438,7 +436,7 @@
if (WP(w, newgrf_d).sel == NULL) break;
GRFBuildParamList(buff, WP(w, newgrf_d).sel, lastof(buff));
- ShowQueryString(BindCString(buff), STR_NEWGRF_PARAMETER_QUERY, 63, 250, w->window_class, w->window_number, CS_ALPHANUMERAL);
+ ShowQueryString(BindCString(buff), STR_NEWGRF_PARAMETER_QUERY, 63, 250, w, CS_ALPHANUMERAL);
break;
}
}
--- a/openttd.c Mon Jan 01 16:10:01 2007 +0000
+++ b/openttd.c Mon Jan 01 16:31:13 2007 +0000
@@ -60,6 +60,7 @@
#include "rail_map.h"
#include "road_map.h"
#include "water_map.h"
+#include "industry_map.h"
#include <stdarg.h>
@@ -156,7 +157,7 @@
" -e = Start Editor\n"
" -g [savegame] = Start new/save game immediately\n"
" -G seed = Set random seed\n"
- " -n [ip#player:port] = Start networkgame\n"
+ " -n [ip:port#player] = Start networkgame\n"
" -D = Start dedicated server\n"
#if !defined(__MORPHOS__) && !defined(__AMIGA__) && !defined(WIN32)
" -f = Fork into the background (dedicated only)\n"
@@ -1659,6 +1660,33 @@
SettingsDisableElrail(_patches.disable_elrails);
}
+ if (CheckSavegameVersion(43)) {
+ BEGIN_TILE_LOOP(tile_cur, MapSizeX(), MapSizeY(), 0) {
+ if (IsTileType(tile_cur, MP_INDUSTRY)) {
+ switch (GetIndustryGfx(tile_cur)) {
+ case GFX_POWERPLANT_SPARKS:
+ SetIndustryAnimationState(tile_cur, GB(_m[tile_cur].m1, 2, 5));
+ break;
+
+ case GFX_OILWELL_ANIMATED_1:
+ case GFX_OILWELL_ANIMATED_2:
+ case GFX_OILWELL_ANIMATED_3:
+ SetIndustryAnimationState(tile_cur, GB(_m[tile_cur].m1, 0, 2));
+ break;
+
+ case GFX_COAL_MINE_TOWER_ANIMATED:
+ case GFX_COPPER_MINE_TOWER_ANIMATED:
+ case GFX_GOLD_MINE_TOWER_ANIMATED:
+ SetIndustryAnimationState(tile_cur, _m[tile_cur].m1);
+ break;
+
+ default: /* No animation states to change */
+ break;
+ }
+ }
+ } END_TILE_LOOP(tile_cur, MapSizeX(), MapSizeY(), 0)
+ }
+
return true;
}
--- a/openttd.h Mon Jan 01 16:10:01 2007 +0000
+++ b/openttd.h Mon Jan 01 16:31:13 2007 +0000
@@ -365,87 +365,83 @@
enum {
- WC_MAIN_WINDOW = 0x00,
- WC_MAIN_TOOLBAR = 0x01,
- WC_STATUS_BAR = 0x02,
- WC_BUILD_TOOLBAR = 0x03,
- WC_NEWS_WINDOW = 0x04,
- WC_TOWN_DIRECTORY = 0x05,
- WC_STATION_LIST = 0x06,
- WC_TOWN_VIEW = 0x07,
- WC_SMALLMAP = 0x08,
- WC_TRAINS_LIST = 0x09,
- WC_ROADVEH_LIST = 0x0A,
- WC_SHIPS_LIST = 0x0B,
- WC_AIRCRAFT_LIST = 0x0C,
- WC_VEHICLE_VIEW = 0x0D,
- WC_VEHICLE_DETAILS = 0x0E,
- WC_VEHICLE_REFIT = 0x0F,
- WC_VEHICLE_ORDERS = 0x10,
- WC_STATION_VIEW = 0x11,
- WC_VEHICLE_DEPOT = 0x12,
- WC_BUILD_VEHICLE = 0x13,
- WC_BUILD_BRIDGE = 0x14,
- WC_ERRMSG = 0x15,
- WC_ASK_ABANDON_GAME = 0x16,
- WC_QUIT_GAME = 0x17,
- WC_BUILD_STATION = 0x18,
- WC_BUS_STATION = 0x19,
- WC_TRUCK_STATION = 0x1A,
- WC_BUILD_DEPOT = 0x1B,
- WC_COMPANY = 0x1D,
- WC_FINANCES = 0x1E,
- WC_PLAYER_COLOR = 0x1F,
- WC_QUERY_STRING = 0x20,
- WC_SAVELOAD = 0x21,
- WC_SELECT_GAME = 0x22,
- WC_TOOLBAR_MENU = 0x24,
- WC_INCOME_GRAPH = 0x25,
- WC_OPERATING_PROFIT = 0x26,
- WC_TOOLTIPS = 0x27,
- WC_INDUSTRY_VIEW = 0x28,
- WC_PLAYER_FACE = 0x29,
- WC_LAND_INFO = 0x2A,
- WC_TOWN_AUTHORITY = 0x2B,
- WC_SUBSIDIES_LIST = 0x2C,
- WC_GRAPH_LEGEND = 0x2D,
- WC_DELIVERED_CARGO = 0x2E,
- WC_PERFORMANCE_HISTORY = 0x2F,
- WC_COMPANY_VALUE = 0x30,
- WC_COMPANY_LEAGUE = 0x31,
- WC_BUY_COMPANY = 0x32,
- WC_PAYMENT_RATES = 0x33,
- WC_ENGINE_PREVIEW = 0x35,
- WC_MUSIC_WINDOW = 0x36,
- WC_MUSIC_TRACK_SELECTION = 0x37,
- WC_SCEN_LAND_GEN = 0x38, // also used for landscaping toolbar
- WC_ASK_RESET_LANDSCAPE = 0x39,
- WC_SCEN_TOWN_GEN = 0x3A,
- WC_SCEN_INDUSTRY = 0x3B,
- WC_SCEN_BUILD_ROAD = 0x3C,
- WC_BUILD_TREES = 0x3D,
- WC_SEND_NETWORK_MSG = 0x3E,
- WC_DROPDOWN_MENU = 0x3F,
- WC_BUILD_INDUSTRY = 0x40,
- WC_GAME_OPTIONS = 0x41,
- WC_NETWORK_WINDOW = 0x42,
- WC_INDUSTRY_DIRECTORY = 0x43,
- WC_MESSAGE_HISTORY = 0x44,
- WC_CHEATS = 0x45,
- WC_PERFORMANCE_DETAIL = 0x46,
- WC_CONSOLE = 0x47,
- WC_EXTRA_VIEW_PORT = 0x48,
- WC_CLIENT_LIST = 0x49,
- WC_NETWORK_STATUS_WINDOW = 0x4A,
- WC_CUSTOM_CURRENCY = 0x4B,
- WC_REPLACE_VEHICLE = 0x4C,
- WC_HIGHSCORE = 0x4D,
- WC_ENDSCREEN = 0x4E,
- WC_SIGN_LIST = 0x4F,
- WC_GENERATE_LANDSCAPE = 0x50,
- WC_GENERATE_PROGRESS_WINDOW = 0x51,
- WC_OK_CANCEL_QUERY = 0x52,
- WC_DEPOT_SELL_ALL = 0x53,
+ WC_MAIN_WINDOW,
+ WC_MAIN_TOOLBAR,
+ WC_STATUS_BAR,
+ WC_BUILD_TOOLBAR,
+ WC_NEWS_WINDOW,
+ WC_TOWN_DIRECTORY,
+ WC_STATION_LIST,
+ WC_TOWN_VIEW,
+ WC_SMALLMAP,
+ WC_TRAINS_LIST,
+ WC_ROADVEH_LIST,
+ WC_SHIPS_LIST,
+ WC_AIRCRAFT_LIST,
+ WC_VEHICLE_VIEW,
+ WC_VEHICLE_DETAILS,
+ WC_VEHICLE_REFIT,
+ WC_VEHICLE_ORDERS,
+ WC_STATION_VIEW,
+ WC_VEHICLE_DEPOT,
+ WC_BUILD_VEHICLE,
+ WC_BUILD_BRIDGE,
+ WC_ERRMSG,
+ WC_BUILD_STATION,
+ WC_BUS_STATION,
+ WC_TRUCK_STATION,
+ WC_BUILD_DEPOT,
+ WC_COMPANY,
+ WC_FINANCES,
+ WC_PLAYER_COLOR,
+ WC_QUERY_STRING,
+ WC_SAVELOAD,
+ WC_SELECT_GAME,
+ WC_TOOLBAR_MENU,
+ WC_INCOME_GRAPH,
+ WC_OPERATING_PROFIT,
+ WC_TOOLTIPS,
+ WC_INDUSTRY_VIEW,
+ WC_PLAYER_FACE,
+ WC_LAND_INFO,
+ WC_TOWN_AUTHORITY,
+ WC_SUBSIDIES_LIST,
+ WC_GRAPH_LEGEND,
+ WC_DELIVERED_CARGO,
+ WC_PERFORMANCE_HISTORY,
+ WC_COMPANY_VALUE,
+ WC_COMPANY_LEAGUE,
+ WC_BUY_COMPANY,
+ WC_PAYMENT_RATES,
+ WC_ENGINE_PREVIEW,
+ WC_MUSIC_WINDOW,
+ WC_MUSIC_TRACK_SELECTION,
+ WC_SCEN_LAND_GEN,
+ WC_SCEN_TOWN_GEN,
+ WC_SCEN_INDUSTRY,
+ WC_SCEN_BUILD_ROAD,
+ WC_BUILD_TREES,
+ WC_SEND_NETWORK_MSG,
+ WC_DROPDOWN_MENU,
+ WC_BUILD_INDUSTRY,
+ WC_GAME_OPTIONS,
+ WC_NETWORK_WINDOW,
+ WC_INDUSTRY_DIRECTORY,
+ WC_MESSAGE_HISTORY,
+ WC_CHEATS,
+ WC_PERFORMANCE_DETAIL,
+ WC_CONSOLE,
+ WC_EXTRA_VIEW_PORT,
+ WC_CLIENT_LIST,
+ WC_NETWORK_STATUS_WINDOW,
+ WC_CUSTOM_CURRENCY,
+ WC_REPLACE_VEHICLE,
+ WC_HIGHSCORE,
+ WC_ENDSCREEN,
+ WC_SIGN_LIST,
+ WC_GENERATE_LANDSCAPE,
+ WC_GENERATE_PROGRESS_WINDOW,
+ WC_CONFIRM_POPUP_QUERY,
};
--- a/os/debian/changelog Mon Jan 01 16:10:01 2007 +0000
+++ b/os/debian/changelog Mon Jan 01 16:31:13 2007 +0000
@@ -1,4 +1,4 @@
-openttd (0.4.8svn) unstable; urgency=low
+openttd (0.6~svn) unstable; urgency=low
* Unreleased SVN version. Versioned to allow normal upgrades to released versions.
--- a/os/macosx/Makefile Mon Jan 01 16:10:01 2007 +0000
+++ b/os/macosx/Makefile Mon Jan 01 16:31:13 2007 +0000
@@ -134,10 +134,8 @@
$(Q)cp -R $(OSXAPP) "OpenTTD $(REV)/"
$(Q)cp docs/OSX_install_instructions.txt "OpenTTD $(REV)/How to install (please read).txt"
$(Q)cp readme.txt "OpenTTD $(REV)/docs/"
- $(Q)cp docs/console.txt "OpenTTD $(REV)/docs/"
$(Q)cp COPYING "OpenTTD $(REV)/docs/"
$(Q)cp changelog.txt "OpenTTD $(REV)/docs/"
- $(Q)cp os/macosx/*.webloc "OpenTTD $(REV)"
$(Q)cp known-bugs.txt "OpenTTD $(REV)/known-bugs.txt"
$(Q)cp -R scenario/* "OpenTTD $(REV)/scenario/"
$(Q)hdiutil create -ov -format UDZO -srcfolder "OpenTTD $(REV)" openttd-"$(REV)"-osx.dmg
--- a/os/win32/installer/install.nsi Mon Jan 01 16:10:01 2007 +0000
+++ b/os/win32/installer/install.nsi Mon Jan 01 16:31:13 2007 +0000
@@ -2,7 +2,7 @@
!define APPNAME "OpenTTD"
!define APPNAMEANDVERSION "OpenTTD 0.5.0.0"
!define APPVERSION "0.5.0.0"
-!define INSTALLERVERSION 23 ;NEED TO UPDATE THIS FOR EVERY RELEASE!!!
+!define INSTALLERVERSION 24 ;NEED TO UPDATE THIS FOR EVERY RELEASE!!!
!define MUI_ICON "..\..\..\openttd.ico"
!define MUI_UNICON "..\..\..\openttd.ico"
!define MUI_WELCOMEFINISHPAGE_BITMAP "welcome.bmp"
--- a/pathfind.c Mon Jan 01 16:10:01 2007 +0000
+++ b/pathfind.c Mon Jan 01 16:31:13 2007 +0000
@@ -301,6 +301,22 @@
if (IsTileDepotType(tile, TRANSPORT_ROAD) && ReverseDiagDir(GetRoadDepotDirection(tile)) != direction) return;
}
+ /* Check if the new tile is a tunnel or bridge head and that the direction
+ * and transport type match */
+ if (IsTunnelTile(tile)) {
+ if (GetTunnelDirection(tile) != direction ||
+ GetTunnelTransportType(tile) != tpf->tracktype) {
+ return;
+ }
+ }
+
+ if (IsBridgeTile(tile)) {
+ if (GetBridgeRampDirection(tile) != direction ||
+ GetBridgeTransportType(tile) != tpf->tracktype) {
+ return;
+ }
+ }
+
tpf->rd.cur_length++;
bits = GetTileTrackStatus(tile, tpf->tracktype);
@@ -341,8 +357,8 @@
if (tpf->hasbit_13)
return;
- tile = tile_org;
direction = ReverseDiagDir(direction);
+ tile += TileOffsByDiagDir(direction);
bits = GetTileTrackStatus(tile, tpf->tracktype);
bits |= (bits >> 8);
--- a/player_gui.c Mon Jan 01 16:10:01 2007 +0000
+++ b/player_gui.c Mon Jan 01 16:31:13 2007 +0000
@@ -765,7 +765,7 @@
const Player *p = GetPlayer(w->window_number);
WP(w, def_d).byte_1 = 0;
SetDParam(0, p->president_name_2);
- ShowQueryString(p->president_name_1, STR_700B_PRESIDENT_S_NAME, 31, 94, w->window_class, w->window_number, CS_ALPHANUMERAL);
+ ShowQueryString(p->president_name_1, STR_700B_PRESIDENT_S_NAME, 31, 94, w, CS_ALPHANUMERAL);
break;
}
@@ -773,7 +773,7 @@
Player *p = GetPlayer(w->window_number);
WP(w,def_d).byte_1 = 1;
SetDParam(0, p->name_2);
- ShowQueryString(p->name_1, STR_700A_COMPANY_NAME, 31, 150, w->window_class, w->window_number, CS_ALPHANUMERAL);
+ ShowQueryString(p->name_1, STR_700A_COMPANY_NAME, 31, 150, w, CS_ALPHANUMERAL);
break;
}
@@ -812,7 +812,7 @@
if (w->window_number == _local_player) {
WP(w,def_d).byte_1 = 2;
ShowQueryString(BindCString(_network_player_info[_local_player].password),
- STR_SET_COMPANY_PASSWORD, sizeof(_network_player_info[_local_player].password), 250, w->window_class, w->window_number, CS_ALPHANUMERAL);
+ STR_SET_COMPANY_PASSWORD, sizeof(_network_player_info[_local_player].password), 250, w, CS_ALPHANUMERAL);
}
break;
#endif /* ENABLE_NETWORK */
--- a/players.c Mon Jan 01 16:10:01 2007 +0000
+++ b/players.c Mon Jan 01 16:31:13 2007 +0000
@@ -844,7 +844,10 @@
if (!_networking) return CMD_ERROR;
/* Has the network client a correct ClientID? */
- if (!(flags & DC_EXEC) || cid >= MAX_CLIENT_INFO) return 0;
+ if (!(flags & DC_EXEC)) return 0;
+#ifdef ENABLE_NETWORK
+ if (cid >= MAX_CLIENT_INFO) return 0;
+#endif /* ENABLE_NETWORK */
/* Delete multiplayer progress bar */
DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
--- a/rail_cmd.c Mon Jan 01 16:10:01 2007 +0000
+++ b/rail_cmd.c Mon Jan 01 16:31:13 2007 +0000
@@ -279,7 +279,7 @@
if (flags & DC_EXEC) {
SetRailGroundType(tile, RAIL_GROUND_BARREN);
- _m[tile].m5 |= trackbit;
+ SetTrackBits(tile, GetTrackBits(tile) | trackbit);
}
break;
@@ -1002,9 +1002,6 @@
{
int32 cost;
int32 ret;
- byte m5;
-
- m5 = _m[tile].m5;
if (flags & DC_AUTO) {
if (!IsTileOwner(tile, _current_player))
@@ -1020,36 +1017,16 @@
cost = 0;
switch (GetRailTileType(tile)) {
- /* XXX: Why the fuck do we remove these thow signals first? */
case RAIL_TILE_SIGNALS:
- if (HasSignalOnTrack(tile, TRACK_X)) {
- ret = DoCommand(tile, TRACK_X, 0, flags, CMD_REMOVE_SIGNALS);
- if (CmdFailed(ret)) return CMD_ERROR;
- cost += ret;
- }
- if (HasSignalOnTrack(tile, TRACK_LOWER)) {
- ret = DoCommand(tile, TRACK_LOWER, 0, flags, CMD_REMOVE_SIGNALS);
+ case RAIL_TILE_NORMAL: {
+ TrackBits tracks = GetTrackBits(tile);
+ uint i;
+
+ for_each_bit (i, tracks) {
+ ret = DoCommand(tile, 0, i, flags, CMD_REMOVE_SINGLE_RAIL);
if (CmdFailed(ret)) return CMD_ERROR;
cost += ret;
}
-
- m5 &= TRACK_BIT_MASK;
- if (!(flags & DC_EXEC)) {
- for (; m5 != 0; m5 >>= 1) if (m5 & 1) cost += _price.remove_rail;
- return cost;
- }
- /* FALLTHROUGH */
-
- case RAIL_TILE_NORMAL: {
- uint i;
-
- for (i = 0; m5 != 0; i++, m5 >>= 1) {
- if (m5 & 1) {
- ret = DoCommand(tile, 0, i, flags, CMD_REMOVE_SINGLE_RAIL);
- if (CmdFailed(ret)) return CMD_ERROR;
- cost += ret;
- }
- }
return cost;
}
--- a/readme.txt Mon Jan 01 16:10:01 2007 +0000
+++ b/readme.txt Mon Jan 01 16:31:13 2007 +0000
@@ -1,6 +1,6 @@
OpenTTD README
-Last updated: 2006-12-21
-Release version: 0.5.0-RC1
+Last updated: 2006-12-31
+Release version: 0.5.0-RC2
------------------------------------------------------------------------
--- a/roadveh_gui.c Mon Jan 01 16:10:01 2007 +0000
+++ b/roadveh_gui.c Mon Jan 01 16:31:13 2007 +0000
@@ -162,7 +162,7 @@
case 2: /* rename */
v = GetVehicle(w->window_number);
SetDParam(0, v->unitnumber);
- ShowQueryString(v->string_id, STR_902C_NAME_ROAD_VEHICLE, 31, 150, w->window_class, w->window_number, CS_ALPHANUMERAL);
+ ShowQueryString(v->string_id, STR_902C_NAME_ROAD_VEHICLE, 31, 150, w, CS_ALPHANUMERAL);
break;
case 5: /* increase int */
@@ -479,8 +479,7 @@
EngineID sel_eng = WP(w,buildvehicle_d).sel_engine;
if (sel_eng != INVALID_ENGINE) {
WP(w,buildvehicle_d).rename_engine = sel_eng;
- ShowQueryString(GetCustomEngineName(sel_eng),
- STR_9036_RENAME_ROAD_VEHICLE_TYPE, 31, 160, w->window_class, w->window_number, CS_ALPHANUMERAL);
+ ShowQueryString(GetCustomEngineName(sel_eng), STR_9036_RENAME_ROAD_VEHICLE_TYPE, 31, 160, w, CS_ALPHANUMERAL);
}
} break;
}
--- a/settings_gui.c Mon Jan 01 16:10:01 2007 +0000
+++ b/settings_gui.c Mon Jan 01 16:31:13 2007 +0000
@@ -845,7 +845,7 @@
WP(w,def_d).data_3 = btn;
SetDParam(0, value);
- ShowQueryString(STR_CONFIG_PATCHES_INT32, STR_CONFIG_PATCHES_QUERY_CAPT, 10, 100, WC_GAME_OPTIONS, 0, CS_NUMERAL);
+ ShowQueryString(STR_CONFIG_PATCHES_INT32, STR_CONFIG_PATCHES_QUERY_CAPT, 10, 100, w, CS_NUMERAL);
}
}
@@ -1061,14 +1061,8 @@
}
if (len != 0) {
- WP(w,def_d).data_2 = line;
- ShowQueryString(
- str,
- STR_CURRENCY_CHANGE_PARAMETER,
- len + 1, // maximum number of characters OR
- 250, // characters up to this width pixels, whichever is satisfied first
- w->window_class,
- w->window_number, afilter);
+ WP(w, def_d).data_2 = line;
+ ShowQueryString(str, STR_CURRENCY_CHANGE_PARAMETER, len + 1, 250, w, afilter);
}
w->flags4 |= 5 << WF_TIMEOUT_SHL;
--- a/ship_gui.c Mon Jan 01 16:10:01 2007 +0000
+++ b/ship_gui.c Mon Jan 01 16:31:13 2007 +0000
@@ -161,7 +161,7 @@
case 2: /* rename */
v = GetVehicle(w->window_number);
SetDParam(0, v->unitnumber);
- ShowQueryString(v->string_id, STR_9831_NAME_SHIP, 31, 150, w->window_class, w->window_number, CS_ALPHANUMERAL);
+ ShowQueryString(v->string_id, STR_9831_NAME_SHIP, 31, 150, w, CS_ALPHANUMERAL);
break;
case 5: /* increase int */
mod = _ctrl_pressed? 5 : 10;
@@ -302,9 +302,8 @@
case 6: { /* rename */
EngineID sel_eng = WP(w,buildvehicle_d).sel_engine;
if (sel_eng != INVALID_ENGINE) {
- WP(w,buildvehicle_d).rename_engine = sel_eng;
- ShowQueryString(GetCustomEngineName(sel_eng),
- STR_9838_RENAME_SHIP_TYPE, 31, 160, w->window_class, w->window_number, CS_ALPHANUMERAL);
+ WP(w, buildvehicle_d).rename_engine = sel_eng;
+ ShowQueryString(GetCustomEngineName(sel_eng), STR_9838_RENAME_SHIP_TYPE, 31, 160, w, CS_ALPHANUMERAL);
}
} break;
}
--- a/station_gui.c Mon Jan 01 16:10:01 2007 +0000
+++ b/station_gui.c Mon Jan 01 16:31:13 2007 +0000
@@ -749,7 +749,7 @@
case 9: {
SetDParam(0, w->window_number);
- ShowQueryString(STR_STATION, STR_3030_RENAME_STATION_LOADING, 31, 180, w->window_class, w->window_number, CS_ALPHANUMERAL);
+ ShowQueryString(STR_STATION, STR_3030_RENAME_STATION_LOADING, 31, 180, w, CS_ALPHANUMERAL);
} break;
case 10: { /* Show a list of scheduled trains to this station */
--- a/strgen/strgen.c Mon Jan 01 16:10:01 2007 +0000
+++ b/strgen/strgen.c Mon Jan 01 16:31:13 2007 +0000
@@ -1389,7 +1389,7 @@
/* if showing warnings, print a summary of the language */
if (show_todo == 2) {
- fprintf(stdout, "%d warnings and %d errors for %s", _warnings, _errors, pathbuf);
+ fprintf(stdout, "%d warnings and %d errors for %s\n", _warnings, _errors, pathbuf);
}
} else {
fprintf(stderr, "Invalid arguments\n");
--- a/table/industry_land.h Mon Jan 01 16:10:01 2007 +0000
+++ b/table/industry_land.h Mon Jan 01 16:31:13 2007 +0000
@@ -15,7 +15,7 @@
#define M(s1, s2, sx, sy, w, h, dz, p) { s1, s2, sx, sy, w - 1, h - 1, dz, p }
-static const DrawBuildingsTileStruct _industry_draw_tile_data[700] = {
+static const DrawBuildingsTileStruct _industry_draw_tile_data[NUM_INDUSTRY_GFXES * 4] = {
M( 0xf54, 0x7db, 7, 0, 9, 9, 10, 0),
M( 0xf54, 0x7dc, 7, 0, 9, 9, 30, 0),
M( 0xf54, 0x7dd, 7, 0, 9, 9, 30, 0),
@@ -898,12 +898,16 @@
static const byte _coal_plant_sparks_x[] = {11, 11, 14, 13, 18, 15};
static const byte _coal_plant_sparks_y[] = {23, 11, 6, 3, 1, 0};
-/* next frame in an animation */
#define N 255
-static const byte _industry_section_animation_next[] = {
+/**
+ * Next frame in an animation
+ * The indices into this table are the ones as described by
+ * the enum with GFX_*s in industry_map.h.
+ */
+static const byte _industry_section_animation_next[NUM_INDUSTRY_GFXES] = {
N, N, N, N, N, N, N, N,
N, N, N, N, N, N, N, N,
-N, 16, N, N, N, N, N, N,
+N, 16, N, N, N, N, N, N, // <- growing forest
N, N, N, N, N, N, N, N,
N, N, N, N, N, N, N, N,
N, N, N, N, N, N, N, N,
@@ -917,19 +921,23 @@
N, N, N, N, N, N, N, N,
N, N, N, N, N, N, N, N,
N, N, N, N, N, N, N, N,
-N, N, 129, N, N, N, N, N,
-135, N, N, N, N, N, N, N,
+N, N, 129, N, N, N, N, N, // <- growing candyfloss
+135, N, N, N, N, N, N, N, // <- 'growing' batteries
N, N, N, N, N, N, N, N,
N, N, N, N, N, N, N, N,
N, N, N, N, N, N, N, N,
N, N, N, N, N, N, N,
};
-/* animation to start when goods is produced */
-static const byte _industry_produce_section[] = {
+/**
+ * Animation to start when goods is produced
+ * The indices into this table are the ones as described by
+ * the enum with GFX_*s in industry_map.h.
+ */
+static const byte _industry_produce_section[NUM_INDUSTRY_GFXES] = {
N, N, N, N, N, N, N, N,
N, N, N, N, N, N, N, N,
-17, N, N, N, N, N, N, N,
+17, N, N, N, N, N, N, N, // <- chopping forest
N, N, N, N, N, N, N, N,
N, N, N, N, N, N, N, N,
N, N, N, N, N, N, N, N,
@@ -943,7 +951,7 @@
N, N, N, N, N, N, N, N,
N, N, N, N, N, N, N, N,
N, N, N, N, N, N, N, N,
-N, 130, N, N, N, N, N, 136,
+N, 130, N, N, N, N, N, 136, // <- chopping candyfloss and reaping batteries
N, N, N, N, N, N, N, N,
N, N, N, N, N, N, N, N,
N, N, N, N, N, N, N, N,
@@ -952,3 +960,63 @@
};
#undef N
+
+/**
+ * The indices into this table are the ones as described by
+ * the enum with GFX_*s in industry_map.h.
+ */
+static const byte _industry_section_bits[NUM_INDUSTRY_GFXES] = {
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 4, 2, 16, 16, 16, 16, // <- temperate bank
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 4, 2, 16, 16, 16, 16, 16, // <- sub-arctic/sub-tropical bank
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16,
+};
+
+/**
+ * When true, the tile has to be drawn using the animation
+ * state instead of the construction state.
+ * The indices into this table are the ones as described by
+ * the enum with GFX_*s in industry_map.h.
+ */
+static const bool _industry_section_draw_animation_state[NUM_INDUSTRY_GFXES] = {
+ false, true, false, false, false, false, false, false, // <- animated wheel tower of coal mine
+ false, false, false, false, false, false, false, false,
+ false, false, false, false, false, false, false, false,
+ false, false, false, false, false, false, true, true, // <- animated oil well
+ true, false, false, false, false, false, false, false, // <- animated oil well
+ false, false, false, false, false, false, false, false,
+ true, false, false, false, false, false, false, false, // <- animated wheel tower of copper mine
+ false, false, false, false, false, false, false, false,
+ false, false, false, false, false, false, false, false,
+ false, false, false, false, false, false, false, false,
+ false, false, false, false, false, false, false, false,
+ true, false, false, false, false, false, false, false, // <- animated wheel tower of gold mine
+ false, false, false, false, false, false, false, false,
+ false, false, false, false, false, false, false, false,
+ false, false, false, false, false, false, false, false,
+ false, false, false, false, false, false, false, false,
+ false, false, false, false, false, false, false, false,
+ false, false, false, false, false, false, false, false,
+ false, false, false, false, false, false, false, false,
+ false, false, false, false, false, false, false, false,
+ false, false, false, false, false, false, false, false,
+ false, false, false, false, false, false, false,
+};
--- a/texteff.c Mon Jan 01 16:10:01 2007 +0000
+++ b/texteff.c Mon Jan 01 16:31:13 2007 +0000
@@ -16,6 +16,13 @@
#include <stdarg.h> /* va_list */
#include "date.h"
+enum {
+ MAX_TEXTMESSAGE_LENGTH = 150,
+ MAX_TEXT_MESSAGES = 30,
+ MAX_CHAT_MESSAGES = 10,
+ MAX_ANIMATED_TILES = 256,
+};
+
typedef struct TextEffect {
StringID string_id;
int32 x;
@@ -27,7 +34,6 @@
uint32 params_2;
} TextEffect;
-#define MAX_TEXTMESSAGE_LENGTH 150
typedef struct TextMessage {
char message[MAX_TEXTMESSAGE_LENGTH];
@@ -35,10 +41,9 @@
Date end_date;
} TextMessage;
-#define MAX_CHAT_MESSAGES 10
-static TextEffect _text_effect_list[30];
+static TextEffect _text_effect_list[MAX_TEXT_MESSAGES];
static TextMessage _textmsg_list[MAX_CHAT_MESSAGES];
-TileIndex _animated_tile_list[256];
+TileIndex _animated_tile_list[MAX_ANIMATED_TILES];
static bool _textmessage_dirty = false;
static bool _textmessage_visible = false;
@@ -113,19 +118,20 @@
}
}
-// Hide the textbox
+/* Hide the textbox */
void UndrawTextMessage(void)
{
if (_textmessage_visible) {
- // Sometimes we also need to hide the cursor
- // This is because both textmessage and the cursor take a shot of the
- // screen before drawing.
- // Now the textmessage takes his shot and paints his data before the cursor
- // does, so in the shot of the cursor is the screen-data of the textmessage
- // included when the cursor hangs somewhere over the textmessage. To
- // avoid wrong repaints, we undraw the cursor in that case, and everything
- // looks nicely ;)
- // (and now hope this story above makes sense to you ;))
+ /* Sometimes we also need to hide the cursor
+ * This is because both textmessage and the cursor take a shot of the
+ * screen before drawing.
+ * Now the textmessage takes his shot and paints his data before the cursor
+ * does, so in the shot of the cursor is the screen-data of the textmessage
+ * included when the cursor hangs somewhere over the textmessage. To
+ * avoid wrong repaints, we undraw the cursor in that case, and everything
+ * looks nicely ;)
+ * (and now hope this story above makes sense to you ;))
+ */
if (_cursor.visible) {
if (_cursor.draw_pos.x + _cursor.draw_size.x >= _textmsg_box.x &&
@@ -137,20 +143,20 @@
}
_textmessage_visible = false;
- // Put our 'shot' back to the screen
+ /* Put our 'shot' back to the screen */
memcpy_pitch(
_screen.dst_ptr + _textmsg_box.x + (_screen.height - _textmsg_box.y - _textmsg_box.height) * _screen.pitch,
_textmessage_backup,
_textmsg_box.width, _textmsg_box.height, _textmsg_box.width, _screen.pitch);
- // And make sure it is updated next time
+ /* And make sure it is updated next time */
_video_driver->make_dirty(_textmsg_box.x, _screen.height - _textmsg_box.y - _textmsg_box.height, _textmsg_box.width, _textmsg_box.height);
_textmessage_dirty = true;
}
}
-// Check if a message is expired every day
+/* Check if a message is expired every day */
void TextMessageDailyLoop(void)
{
uint i;
@@ -174,14 +180,14 @@
}
}
-// Draw the textmessage-box
+/* Draw the textmessage-box */
void DrawTextMessage(void)
{
uint y, count;
if (!_textmessage_dirty) return;
- // First undraw if needed
+ /* First undraw if needed */
UndrawTextMessage();
if (_iconsole_mode == ICONSOLE_FULL) return;
@@ -190,7 +196,7 @@
count = GetTextMessageCount();
if (count == 0) return;
- // Make a copy of the screen as it is before painting (for undraw)
+ /* Make a copy of the screen as it is before painting (for undraw) */
memcpy_pitch(
_textmessage_backup,
_screen.dst_ptr + _textmsg_box.x + (_screen.height - _textmsg_box.y - _textmsg_box.height) * _screen.pitch,
@@ -212,7 +218,7 @@
DoDrawString(_textmsg_list[count].message, _textmsg_box.x + 3, _screen.height - _textmsg_box.y - y + 1, _textmsg_list[count].color);
}
- // Make sure the data is updated next flush
+ /* Make sure the data is updated next flush */
_video_driver->make_dirty(_textmsg_box.x, _screen.height - _textmsg_box.y - _textmsg_box.height, _textmsg_box.width, _textmsg_box.height);
_textmessage_visible = true;
@@ -319,14 +325,14 @@
void DeleteAnimatedTile(TileIndex tile)
{
- TileIndex* ti;
+ TileIndex *ti;
for (ti = _animated_tile_list; ti != endof(_animated_tile_list); ti++) {
if (tile == *ti) {
/* remove the hole */
- memmove(ti, ti + 1, endof(_animated_tile_list) - 1 - ti);
+ memmove(ti, ti + 1, (lastof(_animated_tile_list) - ti) * sizeof(*ti));
/* and clear last item */
- endof(_animated_tile_list)[-1] = 0;
+ *lastof(_animated_tile_list) = 0;
MarkTileDirtyByTile(tile);
return;
}
@@ -335,7 +341,7 @@
bool AddAnimatedTile(TileIndex tile)
{
- TileIndex* ti;
+ TileIndex *ti;
for (ti = _animated_tile_list; ti != endof(_animated_tile_list); ti++) {
if (tile == *ti || *ti == 0) {
@@ -364,7 +370,7 @@
static void SaveLoad_ANIT(void)
{
- // In pre version 6, we has 16bit per tile, now we have 32bit per tile, convert it ;)
+ /* In pre version 6, we has 16bit per tile, now we have 32bit per tile, convert it ;) */
if (CheckSavegameVersion(6)) {
SlArray(_animated_tile_list, lengthof(_animated_tile_list), SLE_FILE_U16 | SLE_VAR_U32);
} else {
--- a/town_cmd.c Mon Jan 01 16:10:01 2007 +0000
+++ b/town_cmd.c Mon Jan 01 16:31:13 2007 +0000
@@ -613,15 +613,13 @@
} else {
int i;
- // Reached a tunnel? Then continue at the other side of it.
- if (IsTunnelTile(tile) && GetTunnelTransportType(tile) == TRANSPORT_ROAD) {
- *tile_ptr = GetOtherTunnelEnd(tile);
+ // Reached a tunnel/bridge? Then continue at the other side of it.
+ if (IsTunnelTile(tile)) {
+ if (GetTunnelTransportType(tile) == TRANSPORT_ROAD) *tile_ptr = GetOtherTunnelEnd(tile);
return;
}
-
- // For any other kind of tunnel/bridge, bail out.
- if (IsTileType(tile, MP_TUNNEL)) return;
- if (IsTileType(tile, MP_RAILWAY_BRIDGE)) return;
+ if (IsTileType(tile, MP_STREET_BRIDGE)) *tile_ptr = GetOtherBridgeEnd(tile);
+ if (IsTileType(tile, MP_RAILWAY_BRIDGE)) return; /* XXX - Do we need this? */
// Possibly extend the road in a direction.
// Randomize a direction and if it has a road, bail out.
--- a/town_gui.c Mon Jan 01 16:10:01 2007 +0000
+++ b/town_gui.c Mon Jan 01 16:31:13 2007 +0000
@@ -266,7 +266,7 @@
case 8: /* rename */
SetDParam(0, w->window_number);
- ShowQueryString(STR_TOWN, STR_2007_RENAME_TOWN, 31, 130, w->window_class, w->window_number, CS_ALPHANUMERAL);
+ ShowQueryString(STR_TOWN, STR_2007_RENAME_TOWN, 31, 130, w, CS_ALPHANUMERAL);
break;
case 9: /* expand town */
--- a/train_gui.c Mon Jan 01 16:10:01 2007 +0000
+++ b/train_gui.c Mon Jan 01 16:31:13 2007 +0000
@@ -515,7 +515,7 @@
EngineID sel_eng = bv->sel_engine;
if (sel_eng != INVALID_ENGINE) {
bv->rename_engine = sel_eng;
- ShowQueryString(GetCustomEngineName(sel_eng), STR_886A_RENAME_TRAIN_VEHICLE_TYPE, 31, 160, w->window_class, w->window_number, CS_ALPHANUMERAL);
+ ShowQueryString(GetCustomEngineName(sel_eng), STR_886A_RENAME_TRAIN_VEHICLE_TYPE, 31, 160, w, CS_ALPHANUMERAL);
}
break;
}
@@ -1037,7 +1037,7 @@
case 2: /* name train */
v = GetVehicle(w->window_number);
SetDParam(0, v->unitnumber);
- ShowQueryString(v->string_id, STR_8865_NAME_TRAIN, 31, 150, w->window_class, w->window_number, CS_ALPHANUMERAL);
+ ShowQueryString(v->string_id, STR_8865_NAME_TRAIN, 31, 150, w, CS_ALPHANUMERAL);
break;
case 6: /* inc serv interval */
mod = _ctrl_pressed? 5 : 10;
--- a/window.c Mon Jan 01 16:10:01 2007 +0000
+++ b/window.c Mon Jan 01 16:31:13 2007 +0000
@@ -287,23 +287,46 @@
SetDirtyBlocks(w->left, w->top, w->left + w->width, w->top + w->height);
}
+/** Find the Window whose parent pointer points to this window
+ * @parent w Window to find child of
+ * @return return a Window pointer that is the child of w, or NULL otherwise */
+static Window *FindChildWindow(const Window *w)
+{
+ Window* const *wz;
+
+ FOR_ALL_WINDOWS(wz) {
+ Window *v = *wz;
+ if (v->parent == w) return v;
+ }
+
+ return NULL;
+}
+
/** Find the z-value of a window. A window must already be open
* or the behaviour is undefined but function should never fail */
Window **FindWindowZPosition(const Window *w)
{
Window **wz;
- for (wz = _z_windows;; wz++) {
- assert(wz < _last_z_window);
+ for (wz = _z_windows; wz != _last_z_window; wz++) {
if (*wz == w) return wz;
}
+
+ DEBUG(misc, 3, "Window (class %d, number %d) is not open, probably removed by recursive calls",
+ w->window_class, w->window_number);
+ return NULL;
}
void DeleteWindow(Window *w)
{
+ Window *v;
Window **wz;
if (w == NULL) return;
+ /* Delete any children a window might have in a head-recursive manner */
+ v = FindChildWindow(w);
+ if (v != NULL) DeleteWindow(v);
+
if (_thd.place_mode != VHM_NONE &&
_thd.window_class == w->window_class &&
_thd.window_number == w->window_number) {
@@ -317,10 +340,12 @@
free(w->widget);
w->widget = NULL;
w->widget_count = 0;
+ w->parent = NULL;
/* Find the window in the z-array, and effectively remove it
* by moving all windows after it one to the left */
wz = FindWindowZPosition(w);
+ if (wz == NULL) return;
memmove(wz, wz + 1, (byte*)_last_z_window - (byte*)wz);
_last_z_window--;
}
@@ -875,13 +900,15 @@
void UnInitWindowSystem(void)
{
- Window* const *wz;
- // delete all malloced widgets
+ Window **wz;
+ /* Delete all malloced widgets, and reset z-array */
FOR_ALL_WINDOWS(wz) {
free((*wz)->widget);
(*wz)->widget = NULL;
(*wz)->widget_count = 0;
+ *wz = NULL;
}
+ _last_z_window = _z_windows;
}
void ResetWindowSystem(void)
@@ -1382,8 +1409,17 @@
return false;
}
-static void MaybeBringWindowToFront(const Window *w)
+/** Check if a window can be made top-most window, and if so do
+ * it. If a window does not obscure any other windows, it will not
+ * be brought to the foreground. Also if the only obscuring windows
+ * are so-called system-windows, the window will not be moved.
+ * The function will return false when a child window of this window is a
+ * modal-popup; function returns a false and child window gets a white border
+ * @param w Window to bring on-top
+ * @return false if the window has an active modal child, true otherwise */
+static bool MaybeBringWindowToFront(const Window *w)
{
+ bool bring_to_front = false;
Window* const *wz;
Window* const *uz;
@@ -1391,12 +1427,19 @@
IsVitalWindow(w) ||
w->window_class == WC_TOOLTIPS ||
w->window_class == WC_DROPDOWN_MENU) {
- return;
+ return true;
}
wz = FindWindowZPosition(w);
for (uz = wz; ++uz != _last_z_window;) {
- const Window *u = *uz;
+ Window *u = *uz;
+
+ /* A modal child will prevent the activation of the parent window */
+ if (u->parent == w && (u->desc_flags & WDF_MODAL)) {
+ u->flags4 |= WF_WHITE_BORDER_MASK;
+ SetWindowDirty(u);
+ return false;
+ }
if (u->window_class == WC_MAIN_WINDOW ||
IsVitalWindow(u) ||
@@ -1405,6 +1448,7 @@
continue;
}
+ /* Window sizes don't interfere, leave z-order alone */
if (w->left + w->width <= u->left ||
u->left + u->width <= w->left ||
w->top + w->height <= u->top ||
@@ -1412,9 +1456,11 @@
continue;
}
- BringWindowToFront(w);
- return;
+ bring_to_front = true;
}
+
+ if (bring_to_front) BringWindowToFront(w);
+ return true;
}
/** Send a message from one window to another. The receiving window is found by
@@ -1593,7 +1639,7 @@
w = FindWindowFromPt(x, y);
if (w == NULL) return;
- MaybeBringWindowToFront(w);
+ if (!MaybeBringWindowToFront(w)) return;
vp = IsPtInWindowViewport(w, x, y);
/* Don't allow any action in a viewport if either in menu of in generating world */
--- a/window.h Mon Jan 01 16:10:01 2007 +0000
+++ b/window.h Mon Jan 01 16:31:13 2007 +0000
@@ -86,33 +86,33 @@
void DrawFrameRect(int left, int top, int right, int bottom, int color, FrameFlags flags);
enum WindowEventCodes {
- WE_CLICK = 0,
- WE_PAINT = 1,
- WE_MOUSELOOP = 2,
- WE_TICK = 3,
- WE_4 = 4,
- WE_TIMEOUT = 5,
- WE_PLACE_OBJ = 6,
- WE_ABORT_PLACE_OBJ = 7,
- WE_DESTROY = 8,
- WE_ON_EDIT_TEXT = 9,
- WE_POPUPMENU_SELECT = 10,
- WE_POPUPMENU_OVER = 11,
- WE_DRAGDROP = 12,
- WE_PLACE_DRAG = 13,
- WE_PLACE_MOUSEUP = 14,
- WE_PLACE_PRESIZE = 15,
- WE_DROPDOWN_SELECT = 16,
- WE_RCLICK = 17,
- WE_KEYPRESS = 18,
- WE_CREATE = 19,
- WE_MOUSEOVER = 20,
- WE_ON_EDIT_TEXT_CANCEL = 21,
- WE_RESIZE = 22,
- WE_MESSAGE = 23,
- WE_SCROLL = 24,
- WE_MOUSEWHEEL = 25,
- WE_INVALIDATE_DATA = 26,
+ WE_CREATE,
+ WE_DESTROY,
+ WE_PAINT,
+ WE_KEYPRESS,
+ WE_CLICK,
+ WE_RCLICK,
+ WE_MOUSEOVER,
+ WE_MOUSELOOP,
+ WE_MOUSEWHEEL,
+ WE_TICK,
+ WE_4,
+ WE_TIMEOUT,
+ WE_PLACE_OBJ,
+ WE_ABORT_PLACE_OBJ,
+ WE_ON_EDIT_TEXT,
+ WE_ON_EDIT_TEXT_CANCEL,
+ WE_POPUPMENU_SELECT,
+ WE_POPUPMENU_OVER,
+ WE_DRAGDROP,
+ WE_PLACE_DRAG,
+ WE_PLACE_MOUSEUP,
+ WE_PLACE_PRESIZE,
+ WE_DROPDOWN_SELECT,
+ WE_RESIZE,
+ WE_MESSAGE,
+ WE_SCROLL,
+ WE_INVALIDATE_DATA,
};
struct WindowEvent {
@@ -263,18 +263,19 @@
WindowProc *proc;
} WindowDesc;
-enum {
- WDF_STD_TOOLTIPS = 1, /* use standard routine when displaying tooltips */
- WDF_DEF_WIDGET = 2, /* default widget control for some widgets in the on click event */
- WDF_STD_BTN = 4, /* default handling for close and drag widgets (widget no 0 and 1) */
+enum WindowDefaultFlag {
+ WDF_STD_TOOLTIPS = 1, /* use standard routine when displaying tooltips */
+ WDF_DEF_WIDGET = 2, /* default widget control for some widgets in the on click event */
+ WDF_STD_BTN = 4, /* default handling for close and drag widgets (widget no 0 and 1) */
- WDF_UNCLICK_BUTTONS = 16, /* Unclick buttons when the window event times out */
- WDF_STICKY_BUTTON = 32, /* Set window to sticky mode; they are not closed unless closed with 'X' (widget 2) */
- WDF_RESIZABLE = 64, /* A window can be resized */
+ WDF_UNCLICK_BUTTONS = 16, /* Unclick buttons when the window event times out */
+ WDF_STICKY_BUTTON = 32, /* Set window to sticky mode; they are not closed unless closed with 'X' (widget 2) */
+ WDF_RESIZABLE = 64, /* A window can be resized */
+ WDF_MODAL = 128, /* The window is a modal child of some other window, meaning the parent is 'inactive' */
};
/* can be used as x or y coordinates to cause a specific placement */
-enum {
+enum WindowDefaultPosition {
WDP_AUTO = -1, ///< Find a place automatically
WDP_CENTER = -2, ///< Center the window (left/right or top/bottom)
WDP_ALIGN_TBR = -3, ///< Align the right side of the window with the right side of the main toolbar
@@ -283,10 +284,10 @@
typedef struct Textbuf {
char *buf; /* buffer in which text is saved */
- uint16 maxlength, maxwidth; /* the maximum size of the buffer. Maxwidth specifies screensize in pixels */
- uint16 length, width; /* the current size of the string. Width specifies screensize in pixels */
+ uint16 maxlength, maxwidth; /* the maximum size of the buffer. Maxwidth specifies screensize in pixels, maxlength is in bytes */
+ uint16 length, width; /* the current size of the string. Width specifies screensize in pixels, length is in bytes */
bool caret; /* is the caret ("_") visible or not */
- uint16 caretpos; /* the current position of the caret in the buffer */
+ uint16 caretpos; /* the current position of the caret in the buffer, in bytes */
uint16 caretxoffs; /* the current position of the caret in pixels */
} Textbuf;
@@ -335,29 +336,19 @@
uint32 desc_flags;
WindowMessage message;
+ Window *parent;
byte custom[WINDOW_CUSTOM_SIZE];
};
typedef struct querystr_d {
StringID caption;
- WindowClass wnd_class;
- WindowNumber wnd_num;
Textbuf text;
const char *orig;
CharSetFilter afilter;
+ bool handled;
} querystr_d;
assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(querystr_d));
-typedef struct query_d {
- StringID caption;
- StringID message;
- WindowClass wnd_class;
- WindowNumber wnd_num;
- void (*ok_cancel_callback)(bool ok_clicked);
- bool calledback;
-} query_d;
-assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(query_d));
-
typedef struct {
byte item_count; /* follow_vehicle */
byte sel_index; /* scrollpos_x */
@@ -597,7 +588,7 @@
WF_DISABLE_VP_SCROLL = 1 << 10,
WF_WHITE_BORDER_ONE = 1 << 11,
- WF_WHITE_BORDER_MASK = 3 << 11,
+ WF_WHITE_BORDER_MASK = 1 << 12 | WF_WHITE_BORDER_ONE,
WF_SCROLL2 = 1 << 13,
};
--- a/yapf/follow_track.hpp Mon Jan 01 16:10:01 2007 +0000
+++ b/yapf/follow_track.hpp Mon Jan 01 16:31:13 2007 +0000
@@ -178,11 +178,19 @@
}
}
- // tunnel tiles can be entered only from proper direction
- if (!IsWaterTT() && !m_is_tunnel && IsTunnelTile(m_new_tile)) {
- DiagDirection tunnel_enterdir = GetTunnelDirection(m_new_tile);
- if (tunnel_enterdir != m_exitdir)
- return false;
+ // tunnel holes and bridge ramps can be entered only from proper direction
+ if (!IsWaterTT()) {
+ if (IsTunnelTile(m_new_tile)) {
+ if (!m_is_tunnel) {
+ DiagDirection tunnel_enterdir = GetTunnelDirection(m_new_tile);
+ if (tunnel_enterdir != m_exitdir) return false;
+ }
+ } else if (IsBridgeTile(m_new_tile)) {
+ if (!m_is_bridge) {
+ DiagDirection ramp_enderdir = GetBridgeRampDirection(m_new_tile);
+ if (ramp_enderdir != m_exitdir) return false;
+ }
+ }
}
// special handling for rail stations - get to the end of platform
--- a/yapf/yapf_costrail.hpp Mon Jan 01 16:10:01 2007 +0000
+++ b/yapf/yapf_costrail.hpp Mon Jan 01 16:31:13 2007 +0000
@@ -19,10 +19,15 @@
protected:
int m_max_cost;
CBlobT<int> m_sig_look_ahead_costs;
+public:
+ bool m_stopped_on_first_two_way_signal;
+protected:
static const int s_max_segment_cost = 10000;
- CYapfCostRailT() : m_max_cost(0)
+ CYapfCostRailT()
+ : m_max_cost(0)
+ , m_stopped_on_first_two_way_signal(false)
{
// pre-compute look-ahead penalties into array
int p0 = Yapf().PfGetSettings().rail_look_ahead_signal_p0;
@@ -116,6 +121,7 @@
if (Yapf().TreatFirstRedTwoWaySignalAsEOL() && n.flags_u.flags_s.m_choice_seen && has_signal_against && n.m_num_signals_passed == 0) {
// yes, the first signal is two-way red signal => DEAD END
n.m_segment->flags_u.flags_s.m_end_of_line = true;
+ Yapf().m_stopped_on_first_two_way_signal = true;
return -1;
}
SignalType sig_type = GetSignalType(tile);
--- a/yapf/yapf_rail.cpp Mon Jan 01 16:10:01 2007 +0000
+++ b/yapf/yapf_rail.cpp Mon Jan 01 16:31:13 2007 +0000
@@ -118,9 +118,10 @@
// find the best path
bool path_found = Yapf().FindPath(v);
- if (!path_found && path_not_found != NULL) {
+ if (path_not_found != NULL) {
// tell controller that the path was only 'guessed'
- *path_not_found = !path_found;
+ // treat the path as found if stopped on the first two way signal(s)
+ *path_not_found = !(path_found || Yapf().m_stopped_on_first_two_way_signal);
}
// if path not found - return INVALID_TRACKDIR