# HG changeset patch # User richk # Date 1208288878 0 # Node ID 195d7f6dcf71c1bfd3a695fb066e9b4ecb389cff # Parent fcf5fb2548eb863a34024a4d5fcc51ee947c70f0 (svn r12723) [NewGRF_ports] -Sync: with trunk r12645:12656. diff -r fcf5fb2548eb -r 195d7f6dcf71 src/airport_gui.cpp --- a/src/airport_gui.cpp Tue Apr 15 00:47:19 2008 +0000 +++ b/src/airport_gui.cpp Tue Apr 15 19:47:58 2008 +0000 @@ -25,9 +25,6 @@ #include "widgets/dropdown_func.h" #include "order_func.h" -//TODO: remove station.h once converted to newgrf airports. stations just used as temporary loader -//#include "station.h" - #include "table/sprites.h" #include "table/strings.h" @@ -95,48 +92,49 @@ static void BuildAirToolbWndProc(Window *w, WindowEvent *e) { switch (e->event) { - case WE_PAINT: - DrawWindowWidgets(w); - break; - - case WE_CLICK: - if (e->we.click.widget - 3 >= 0) - _build_air_button_proc[e->we.click.widget - 3](w); - break; - - case WE_KEYPRESS: { - switch (e->we.keypress.keycode) { - case '1': BuildAirClick_Airport(w); break; - case '2': BuildAirClick_Demolish(w); break; - default: return; - } - } break; - - case WE_PLACE_OBJ: - _place_proc(e->we.place.tile); - break; + case WE_PAINT: + DrawWindowWidgets(w); + break; - case WE_PLACE_DRAG: - VpSelectTilesWithMethod(e->we.place.pt.x, e->we.place.pt.y, e->we.place.select_method); - break; - - case WE_PLACE_MOUSEUP: - if (e->we.place.pt.x != -1 && e->we.place.select_proc == DDSP_DEMOLISH_AREA) { - DoCommandP(e->we.place.tile, e->we.place.starttile, 0, CcPlaySound10, CMD_CLEAR_AREA | CMD_MSG(STR_00B5_CAN_T_CLEAR_THIS_AREA)); - } - break; + case WE_CLICK: + if (e->we.click.widget - 3 >= 0) + _build_air_button_proc[e->we.click.widget - 3](w); + break; - case WE_ABORT_PLACE_OBJ: - w->RaiseButtons(); + case WE_KEYPRESS: { + switch (e->we.keypress.keycode) { + case '1': BuildAirClick_Airport(w); break; + case '2': BuildAirClick_Demolish(w); break; + default: return; + } + break; + } - w = FindWindowById(WC_BUILD_STATION, 0); - if (w != 0) - WP(w, def_d).close = true; - break; + case WE_PLACE_OBJ: + _place_proc(e->we.place.tile); + break; - case WE_DESTROY: - if (_patches.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0); - break; + case WE_PLACE_DRAG: + VpSelectTilesWithMethod(e->we.place.pt.x, e->we.place.pt.y, e->we.place.select_method); + break; + + case WE_PLACE_MOUSEUP: + if (e->we.place.pt.x != -1 && e->we.place.select_proc == DDSP_DEMOLISH_AREA) { + DoCommandP(e->we.place.tile, e->we.place.starttile, 0, CcPlaySound10, CMD_CLEAR_AREA | CMD_MSG(STR_00B5_CAN_T_CLEAR_THIS_AREA)); + } + break; + + case WE_ABORT_PLACE_OBJ: + w->RaiseButtons(); + + w = FindWindowById(WC_BUILD_STATION, 0); + if (w != 0) + WP(w, def_d).close = true; + break; + + case WE_DESTROY: + if (_patches.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0); + break; } } @@ -191,208 +189,212 @@ static void BuildAirportPickerWndProc(Window *w, WindowEvent *e) { switch (e->event) { - case WE_CREATE: - w->SetWidgetLoweredState(BAPW_HIGHLIGHT_OFF, !_station_show_coverage); - w->SetWidgetLoweredState(BAPW_HIGHLIGHT_ON, _station_show_coverage); - break; - - case WE_PAINT: { - byte preview_sprite = 0xFF; + case WE_CREATE: + w->SetWidgetLoweredState(BAPW_HIGHLIGHT_OFF, !_station_show_coverage); + w->SetWidgetLoweredState(BAPW_HIGHLIGHT_ON, _station_show_coverage); + break; - FSMportsSpec *fsmportspec = GetCustomFSMportsSpec(_airport.fsmports_class, _airport.station_type); - /* if the port is no longer available, find one that is */ - if ((fsmportspec == NULL) || (HasBit(fsmportspec->callbackmask, CBM_STATION_AVAIL) && GetFSMportsCallback(CBID_STATION_AVAILABILITY, 0, 0, fsmportspec, NULL, INVALID_TILE) == 0)) { - /* port not available, find new one*/ - _airport.station_type = 0xFF; //set to the invalid condition to prevent any selection if nothing is available - for (uint i = 0; i < _airport.station_count; i++) { - fsmportspec = GetCustomFSMportsSpec(_airport.fsmports_class, i); - if (!HasBit(fsmportspec->callbackmask, CBM_STATION_AVAIL) || GetFSMportsCallback(CBID_STATION_AVAILABILITY, 0, 0, fsmportspec, NULL, INVALID_TILE) != 0) { - _airport.station_type = i; - break; + case WE_PAINT: { + byte preview_sprite = 0xFF; + + FSMportsSpec *fsmportspec = GetCustomFSMportsSpec(_airport.fsmports_class, _airport.station_type); + /* if the port is no longer available, find one that is */ + if ((fsmportspec == NULL) || (HasBit(fsmportspec->callbackmask, CBM_STATION_AVAIL) && GetFSMportsCallback(CBID_STATION_AVAILABILITY, 0, 0, fsmportspec, NULL, INVALID_TILE) == 0)) { + /* port not available, find new one*/ + _airport.station_type = 0xFF; //set to the invalid condition to prevent any selection if nothing is available + for (uint i = 0; i < _airport.station_count; i++) { + fsmportspec = GetCustomFSMportsSpec(_airport.fsmports_class, i); + if (!HasBit(fsmportspec->callbackmask, CBM_STATION_AVAIL) || GetFSMportsCallback(CBID_STATION_AVAILABILITY, 0, 0, fsmportspec, NULL, INVALID_TILE) != 0) { + _airport.station_type = i; + break; + } } } - } - - if (WP(w, def_d).close) return; - - for (byte j = 0; j < 4; j++) { - w->SetWidgetDisabledState(BAPW_ORIENT_NE + j, true); - w->RaiseWidget(BAPW_ORIENT_NE + j); - w->widget[BAPW_ORIENT_NE + j].data = SPR_IMG_ARROW_NE_WHITE + j; //reset arrows to white - } - if (_airport.station_type != 0xFF) { - int x = fsmportspec->size_x[_airport.layout_set]; - int y = fsmportspec->size_y[_airport.layout_set]; - SetTileSelectSize(x, y); + if (WP(w, def_d).close) return; - /* an airport is available, so read it and update screen accordingly */ - for (byte j = 0; j < fsmportspec->numlayouts; j++) { - if (fsmportspec->layouts[j] == NULL) break; - /* enable the permitted orientations */ - byte *layout_ptr = (byte*)alloca(x*y + 2); - memcpy(layout_ptr, fsmportspec->layouts[j], (x * y) + 2); - w->SetWidgetDisabledState(BAPW_ORIENT_NE + GB((byte)*layout_ptr, 1, 2), false); - if (j == _airport.layout_set) { - layout_ptr++; - preview_sprite = *layout_ptr; + for (byte j = 0; j < 4; j++) { + w->SetWidgetDisabledState(BAPW_ORIENT_NE + j, true); + w->RaiseWidget(BAPW_ORIENT_NE + j); + w->widget[BAPW_ORIENT_NE + j].data = SPR_IMG_ARROW_NE_WHITE + j; //reset arrows to white + } + + if (_airport.station_type != 0xFF) { + int x = fsmportspec->size_x[_airport.layout_set]; + int y = fsmportspec->size_y[_airport.layout_set]; + SetTileSelectSize(x, y); + + /* an airport is available, so read it and update screen accordingly */ + for (byte j = 0; j < fsmportspec->numlayouts; j++) { + if (fsmportspec->layouts[j] == NULL) break; + /* enable the permitted orientations */ + byte *layout_ptr = (byte*)alloca(x*y + 2); + memcpy(layout_ptr, fsmportspec->layouts[j], (x * y) + 2); + w->SetWidgetDisabledState(BAPW_ORIENT_NE + GB((byte)*layout_ptr, 1, 2), false); + if (j == _airport.layout_set) { + layout_ptr++; + preview_sprite = *layout_ptr; + } + } + w->LowerWidget(BAPW_ORIENT_NE + DirToDiagDir(_airport.direction)); + w->widget[BAPW_ORIENT_NE + DirToDiagDir(_airport.direction)].data = SPR_IMG_ARROW_NE_YELLOW + DirToDiagDir(_airport.direction); //show in yellow + } + + SetDParam(0, GetFSMportsClassName(_airport.fsmports_class)); + DrawWindowWidgets(w); + + /* strings such as 'Size' and 'Coverage Area' */ + + if (_airport.station_type != 0xFF) { + /* draw the preview image if the station is available */ + if (!HasBit(fsmportspec->callbackmask, CBM_STATION_AVAIL) || GetFSMportsCallback(CBID_STATION_AVAILABILITY, 0, 0, fsmportspec, NULL, INVALID_TILE) != 0) { + DrawFSMportsTile(9, 106, preview_sprite, _airport.fsmports_class, _airport.station_type); + } + _thd.FSMportLayout = &fsmportspec->layouts[_airport.layout_set]; // irregular airport support + _thd.FSMportMask = NULL; + if (fsmportspec->layout_mask != NULL) _thd.FSMportMask = &fsmportspec->layout_mask[_airport.layout_set]; // irregular airport support + int rad = _patches.modified_catchment ? fsmportspec->portFSM->catchment : 4; + if (_station_show_coverage) SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad); + int text_end = DrawStationCoverageAreaText(2, 206, SCT_ALL, rad, false); + text_end = DrawStationCoverageAreaText(2, text_end + 4, SCT_ALL, rad, true) + 4; + if (text_end > w->widget[BAPW_BACKGROUND].bottom) { + SetWindowDirty(w); + ResizeWindowForWidget(w, BAPW_BACKGROUND, 0, text_end - w->widget[BAPW_BACKGROUND].bottom); + SetWindowDirty(w); + } + } else { + /* if nothing is selectable, draw the image of the first in the non-selectable list, but grey out the preview */ + fsmportspec = GetCustomFSMportsSpec(_airport.fsmports_class, 0); + byte *layout_ptr = (byte*)alloca(fsmportspec->size_x[0] * fsmportspec->size_y[0] + 2); + memcpy(layout_ptr, fsmportspec->layouts[0], (fsmportspec->size_x[0] * fsmportspec->size_y[0]) + 2); + layout_ptr++; + preview_sprite = *layout_ptr; + DrawFSMportsTile(9, 106, preview_sprite, _airport.fsmports_class, 0); + GfxFillRect(8, 106, 105, 172, (1 << PALETTE_MODIFIER_GREYOUT)); + _thd.FSMportLayout = NULL; // ensure irregular airport support disabled + _thd.FSMportMask = NULL; + SetTileSelectSize(1,1); + } + + for (uint16 i = w->vscroll.pos, y = 35; i < _airport.station_count && i < (uint)(w->vscroll.pos + w->vscroll.cap); i++, y += 14) { + const FSMportsSpec *fsmportspec = GetCustomFSMportsSpec(_airport.fsmports_class, i); + + if (fsmportspec != NULL && fsmportspec->name != 0) { + if (HasBit(fsmportspec->callbackmask, CBM_STATION_AVAIL) && GetFSMportsCallback(CBID_STATION_AVAILABILITY, 0, 0, fsmportspec, NULL, INVALID_TILE) == 0) { + GfxFillRect(8, y - 2, 127, y + 10, (1 << PALETTE_MODIFIER_GREYOUT)); + } + DrawStringTruncated(9, y, fsmportspec->name, i == _airport.station_type ? 12 : 16, 118); + } else { + DrawStringTruncated(9, y, STR_STAT_CLASS_DFLT, i == _airport.station_type ? 12 : 16, 118); } } - w->LowerWidget(BAPW_ORIENT_NE + DirToDiagDir(_airport.direction)); - w->widget[BAPW_ORIENT_NE + DirToDiagDir(_airport.direction)].data = SPR_IMG_ARROW_NE_YELLOW + DirToDiagDir(_airport.direction); //show in yellow + break; } - SetDParam(0, GetFSMportsClassName(_airport.fsmports_class)); - DrawWindowWidgets(w); + case WE_CLICK: { + switch (e->we.click.widget) { + case BAPW_HIGHLIGHT_OFF: case BAPW_HIGHLIGHT_ON: + _station_show_coverage = (e->we.click.widget != BAPW_HIGHLIGHT_OFF); + w->SetWidgetLoweredState(BAPW_HIGHLIGHT_OFF, !_station_show_coverage); + w->SetWidgetLoweredState(BAPW_HIGHLIGHT_ON, _station_show_coverage); + SndPlayFx(SND_15_BEEP); + SetWindowDirty(w); + break; + case BAPW_NEWAP_DROPDOWN: + ShowDropDownList(w, BuildFSMportsClassDropdown(), _airport.fsmports_class, BAPW_NEWAP_DROPDOWN); + break; - // strings such as 'Size' and 'Coverage Area' - // 'Coverage Area' - if (_airport.station_type != 0xFF) { - /* draw the preview image if the station is available */ - if (!HasBit(fsmportspec->callbackmask, CBM_STATION_AVAIL) || GetFSMportsCallback(CBID_STATION_AVAILABILITY, 0, 0, fsmportspec, NULL, INVALID_TILE) != 0) { - DrawFSMportsTile(9, 106, preview_sprite, _airport.fsmports_class, _airport.station_type); + case BAPW_NEWAP_LIST: { + const FSMportsSpec *fsmportspec; + int y = (e->we.click.pt.y - 32) / 14; + + if (y >= w->vscroll.cap) return; + y += w->vscroll.pos; + if (y >= _airport.station_count) return; + + /* Check station availability callback */ + fsmportspec = GetCustomFSMportsSpec(_airport.fsmports_class, y); + if (fsmportspec != NULL && + HasBit(fsmportspec->callbackmask, CBM_STATION_AVAIL) && + GetFSMportsCallback(CBID_STATION_AVAILABILITY, 0, 0, fsmportspec, NULL, INVALID_TILE) == 0) return; + + _airport.station_type = y; + _airport.layout_set = 0; + _airport.platlength= fsmportspec->size_y[_airport.layout_set]; + _airport.numtracks = fsmportspec->size_x[_airport.layout_set]; + + SndPlayFx(SND_15_BEEP); + SetWindowDirty(w); + break; + } + + case BAPW_ORIENT_NE: + case BAPW_ORIENT_SE: + case BAPW_ORIENT_SW: + case BAPW_ORIENT_NW: + w->widget[BAPW_ORIENT_NE + DirToDiagDir(_airport.direction)].data = SPR_IMG_ARROW_NE_WHITE + DirToDiagDir(_airport.direction); //reset arrow to white + + /* find the layout_set that corresponds to the selected orientation */ + FSMportsSpec *fsmportspec = GetCustomFSMportsSpec(_airport.fsmports_class, _airport.station_type); + _airport.layout_set = 0; + _airport.direction = DiagDirToDir((DiagDirection)(e->we.click.widget - BAPW_ORIENT_NE)); + for (byte j = 0; j < fsmportspec->numlayouts; j++) { + int x = fsmportspec->size_x[j]; + int y = fsmportspec->size_y[j]; + if (fsmportspec->layouts[j] == NULL) break; + /* enable the permitted orientations */ + byte *layout_ptr = (byte*)alloca(x * y + 2); + memcpy(layout_ptr, fsmportspec->layouts[j], (x * y) + 2); + if (*layout_ptr == _airport.direction) { + _airport.layout_set = j; + break; + } + } + + w->SetWidgetLoweredState( BAPW_ORIENT_NE, (_airport.direction == DIR_NE)); + w->SetWidgetLoweredState( BAPW_ORIENT_SE, (_airport.direction == DIR_SE)); + w->SetWidgetLoweredState( BAPW_ORIENT_SW, (_airport.direction == DIR_SW)); + w->SetWidgetLoweredState( BAPW_ORIENT_NW, (_airport.direction == DIR_NW)); + SndPlayFx(SND_15_BEEP); + SetWindowDirty(w); + break; } - _thd.FSMportLayout = &fsmportspec->layouts[_airport.layout_set]; // irregular airport support - _thd.FSMportMask = NULL; - if (fsmportspec->layout_mask != NULL) _thd.FSMportMask = &fsmportspec->layout_mask[_airport.layout_set]; // irregular airport support - int rad = _patches.modified_catchment ? fsmportspec->portFSM->catchment : 4; - if (_station_show_coverage) SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad); - int text_end = DrawStationCoverageAreaText(2, 206, SCT_ALL, rad, false); - text_end = DrawStationCoverageAreaText(2, text_end + 4, SCT_ALL, rad, true) + 4; - if (text_end > w->widget[BAPW_BACKGROUND].bottom) { - SetWindowDirty(w); - ResizeWindowForWidget(w, BAPW_BACKGROUND, 0, text_end - w->widget[BAPW_BACKGROUND].bottom); - SetWindowDirty(w); - } - } else { - /* if nothing is selectable, draw the image of the first in the non-selectable list, but grey out the preview */ - fsmportspec = GetCustomFSMportsSpec(_airport.fsmports_class, 0); - byte *layout_ptr = (byte*)alloca(fsmportspec->size_x[0] * fsmportspec->size_y[0] + 2); - memcpy(layout_ptr, fsmportspec->layouts[0], (fsmportspec->size_x[0] * fsmportspec->size_y[0]) + 2); - layout_ptr++; - preview_sprite = *layout_ptr; - DrawFSMportsTile(9, 106, preview_sprite, _airport.fsmports_class, 0); - GfxFillRect(8, 106, 105, 172, (1 << PALETTE_MODIFIER_GREYOUT)); - _thd.FSMportLayout = NULL; // ensure irregular airport support disabled - _thd.FSMportMask = NULL; - SetTileSelectSize(1,1); + break; } - for (uint16 i = w->vscroll.pos, y = 35; i < _airport.station_count && i < (uint)(w->vscroll.pos + w->vscroll.cap); i++, y += 14) { - const FSMportsSpec *fsmportspec = GetCustomFSMportsSpec(_airport.fsmports_class, i); - - if (fsmportspec != NULL && fsmportspec->name != 0) { - if (HasBit(fsmportspec->callbackmask, CBM_STATION_AVAIL) && GetFSMportsCallback(CBID_STATION_AVAILABILITY, 0, 0, fsmportspec, NULL, INVALID_TILE) == 0) { - GfxFillRect(8, y - 2, 127, y + 10, (1 << PALETTE_MODIFIER_GREYOUT)); - } - DrawStringTruncated(9, y, fsmportspec->name, i == _airport.station_type ? 12 : 16, 118); - } else { - DrawStringTruncated(9, y, STR_STAT_CLASS_DFLT, i == _airport.station_type ? 12 : 16, 118); - } - } - break; - } + case WE_DROPDOWN_SELECT: { + if (_airport.fsmports_class != e->we.dropdown.index) { + _airport.fsmports_class = (FSMportsClassID)e->we.dropdown.index; + _airport.station_type = 0; + _airport.layout_set = 0; + _airport.direction = DIR_NE; + _airport.station_count = GetNumCustomFSMports(_airport.fsmports_class); - case WE_CLICK: { - switch (e->we.click.widget) { - case BAPW_HIGHLIGHT_OFF: case BAPW_HIGHLIGHT_ON: - _station_show_coverage = (e->we.click.widget != BAPW_HIGHLIGHT_OFF); - w->SetWidgetLoweredState(BAPW_HIGHLIGHT_OFF, !_station_show_coverage); - w->SetWidgetLoweredState(BAPW_HIGHLIGHT_ON, _station_show_coverage); - SndPlayFx(SND_15_BEEP); - SetWindowDirty(w); - break; - case BAPW_NEWAP_DROPDOWN: - ShowDropDownList(w, BuildFSMportsClassDropdown(), _airport.fsmports_class, BAPW_NEWAP_DROPDOWN); - break; - - case BAPW_NEWAP_LIST: { - const FSMportsSpec *fsmportspec; - int y = (e->we.click.pt.y - 32) / 14; - - if (y >= w->vscroll.cap) return; - y += w->vscroll.pos; - if (y >= _airport.station_count) return; - - /* Check station availability callback */ - fsmportspec = GetCustomFSMportsSpec(_airport.fsmports_class, y); - if (fsmportspec != NULL && - HasBit(fsmportspec->callbackmask, CBM_STATION_AVAIL) && - GetFSMportsCallback(CBID_STATION_AVAILABILITY, 0, 0, fsmportspec, NULL, INVALID_TILE) == 0) return; - - _airport.station_type = y; - _airport.layout_set = 0; - _airport.platlength= fsmportspec->size_y[_airport.layout_set]; - _airport.numtracks = fsmportspec->size_x[_airport.layout_set]; + w->vscroll.count = _airport.station_count; + w->vscroll.pos = _airport.station_type; + } SndPlayFx(SND_15_BEEP); SetWindowDirty(w); break; - } - case BAPW_ORIENT_NE: - case BAPW_ORIENT_SE: - case BAPW_ORIENT_SW: - case BAPW_ORIENT_NW: - w->widget[BAPW_ORIENT_NE + DirToDiagDir(_airport.direction)].data = SPR_IMG_ARROW_NE_WHITE + DirToDiagDir(_airport.direction); //reset arrow to white + } - /* find the layout_set that corresponds to the selected orientation */ - FSMportsSpec *fsmportspec = GetCustomFSMportsSpec(_airport.fsmports_class, _airport.station_type); - _airport.layout_set = 0; - _airport.direction = DiagDirToDir((DiagDirection)(e->we.click.widget - BAPW_ORIENT_NE)); - for (byte j = 0; j < fsmportspec->numlayouts; j++) { - int x = fsmportspec->size_x[j]; - int y = fsmportspec->size_y[j]; - if (fsmportspec->layouts[j] == NULL) break; - /* enable the permitted orientations */ - byte *layout_ptr = (byte*)alloca(x * y + 2); - memcpy(layout_ptr, fsmportspec->layouts[j], (x * y) + 2); - if (*layout_ptr == _airport.direction) { - _airport.layout_set = j; - break; - } + + case WE_MOUSELOOP: { + if (WP(w, def_d).close) { + DeleteWindow(w); + return; } - w->SetWidgetLoweredState( BAPW_ORIENT_NE, (_airport.direction == DIR_NE)); - w->SetWidgetLoweredState( BAPW_ORIENT_SE, (_airport.direction == DIR_SE)); - w->SetWidgetLoweredState( BAPW_ORIENT_SW, (_airport.direction == DIR_SW)); - w->SetWidgetLoweredState( BAPW_ORIENT_NW, (_airport.direction == DIR_NW)); - SndPlayFx(SND_15_BEEP); - SetWindowDirty(w); + CheckRedrawStationCoverage(w); break; } - } break; - - case WE_DROPDOWN_SELECT: { - if (_airport.fsmports_class != e->we.dropdown.index) { - _airport.fsmports_class = (FSMportsClassID)e->we.dropdown.index; - _airport.station_type = 0; - _airport.layout_set = 0; - _airport.direction = DIR_NE; - _airport.station_count = GetNumCustomFSMports(_airport.fsmports_class); - - w->vscroll.count = _airport.station_count; - w->vscroll.pos = _airport.station_type; - } - SndPlayFx(SND_15_BEEP); - SetWindowDirty(w); - } break; - - - case WE_MOUSELOOP: { - if (WP(w, def_d).close) { - DeleteWindow(w); - return; - } - - CheckRedrawStationCoverage(w); - } break; - - case WE_DESTROY: - if (!WP(w, def_d).close) ResetObjectToPlace(); - _thd.FSMportLayout = NULL; // ensure irregular airport support disabled - _thd.FSMportMask = NULL; - break; + case WE_DESTROY: + if (!WP(w, def_d).close) ResetObjectToPlace(); + _thd.FSMportLayout = NULL; // ensure irregular airport support disabled + _thd.FSMportMask = NULL; + break; } } diff -r fcf5fb2548eb -r 195d7f6dcf71 src/economy.cpp --- a/src/economy.cpp Tue Apr 15 00:47:19 2008 +0000 +++ b/src/economy.cpp Tue Apr 15 19:47:58 2008 +0000 @@ -1473,7 +1473,7 @@ for (Vehicle *v = front_v; v != NULL; v = v->Next()) { /* No cargo to unload */ - if (v->cargo_cap == 0 || v->cargo.Empty()) continue; + if (v->cargo_cap == 0 || v->cargo.Empty() || front_v->current_order.GetUnloadType() & OUFB_NO_UNLOAD) continue; /* All cargo has already been paid for, no need to pay again */ if (!v->cargo.UnpaidCargo()) { @@ -1599,7 +1599,7 @@ GoodsEntry *ge = &st->goods[v->cargo_type]; - if (HasBit(v->vehicle_flags, VF_CARGO_UNLOADING)) { + if (HasBit(v->vehicle_flags, VF_CARGO_UNLOADING) && (u->current_order.GetUnloadType() & OUFB_NO_UNLOAD) == 0) { uint cargo_count = v->cargo.Count(); uint amount_unloaded = _patches.gradual_loading ? min(cargo_count, load_amount) : cargo_count; bool remaining; // Are there cargo entities in this vehicle that can still be unloaded here? @@ -1637,8 +1637,8 @@ continue; } - /* Do not pick up goods that we unloaded */ - if (u->current_order.GetUnloadType() & OUFB_UNLOAD) continue; + /* Do not pick up goods when we have no-load set. */ + if (u->current_order.GetLoadType() & OLFB_NO_LOAD) continue; /* update stats */ int t; diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/afrikaans.txt --- a/src/lang/afrikaans.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/afrikaans.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1020,7 +1020,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Ontsper realistiese versnelling vir treine: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Verbied triene en skepe om 90 graad draaie te maak: {ORANGE}{STRING} {LTBLUE} (benodig NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}sluit aan trein stasies gebou naby mekaar: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Verlaat stasie as enige vrag vol is, as 'volle gelaai': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Gebruik verebeterde laai algoritme: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Laai voertuie geleidelik: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflasie: {ORANGE}{STRING} @@ -2653,10 +2652,7 @@ STR_8820_RENAME :{BLACK}Hernoem STR_8823_SKIP :{BLACK}Sprong STR_8824_DELETE :{BLACK}Uit vee -STR_8825_NON_STOP :{BLACK}Deurgaande STR_8826_GO_TO :{BLACK}Gaan Na -STR_8827_FULL_LOAD :{BLACK}Volle Lading -STR_8828_UNLOAD :{BLACK}Aflaai STR_REFIT :{BLACK}Herpas STR_REFIT_TIP :{BLACK}Kies watter vrag tipe te herpas na in die opdraag. CTRL-kliek om herpas instruksie te verwyder STR_REFIT_ORDER :(Herpas na {STRING}) @@ -2713,10 +2709,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Opdraglys - kliek op 'n opdrag om dit te verlig. CTRL + kliek senter op stasie STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Sprong die huidige opdraag, en begin die volgende. CTRL + kliek sprong na verkieste opdrag STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Vee uit die verlig opdrag -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Maak die verlig opdrag deurgaande STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Invoeg 'n nuwe opdrag voor die verlig opdrag, of byvoeg na einde van lys -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Maak die verlig opdrag forseer die voertuig om vir 'n volle laai te wag -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Maak die verlig opdrag forseer die voertuig te aflaai STR_TIMETABLE_TOOLTIP :{BLACK}Rooster - kliek op 'n opdrag om dit te verlig STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Verander die bedrag van tyd die verlig opdrag moes vat STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Skoon die totaal van tyd vir die verlig opdrag @@ -2740,8 +2733,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Kan nie rigting van trein omkeer nie... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Hernoem trein voertuig tipe STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Trein voertuig tipe kan nie hernoem word nie... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Maak die verlig opdrag forseer die voertuig om sy vrag te stort -STR_TRANSFER :{BLACK}Oordra STR_CLEAR_TIME :{BLACK}Reinig Tyd STR_RESET_LATENESS :{BLACK}Herstel Laat Teller diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/brazilian_portuguese.txt --- a/src/lang/brazilian_portuguese.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/brazilian_portuguese.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1027,7 +1027,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Ativar aceleração realista para trens: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Proibir trens e embarcações girar em angulos de 90 graus: {ORANGE}{STRING} {LTBLUE} (requer NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Unir estações ferroviárias construídas juntas: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Deixar a estação quando uma das cargas estiver completa: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Usar algoritmo de carregamento melhorado: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Carregar veículos gradualmente: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflação: {ORANGE}{STRING} @@ -2698,10 +2697,7 @@ STR_8820_RENAME :{BLACK}Renomear STR_8823_SKIP :{BLACK}Saltar STR_8824_DELETE :{BLACK}Remover -STR_8825_NON_STOP :{BLACK}Sem parar STR_8826_GO_TO :{BLACK}Ir Para -STR_8827_FULL_LOAD :{BLACK}Carga -STR_8828_UNLOAD :{BLACK}Descarga STR_REFIT :{BLACK}Adaptar STR_REFIT_TIP :{BLACK}Selecionar a adaptação na ordem atual. CTRL + Clique para remover a instrução STR_REFIT_ORDER :(Adaptar para {STRING}) @@ -2760,10 +2756,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Lista de ordens - clique numa ordem para a selecionar STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Pula a ordem atual e executa a próxima. CTRL + clique pula a ordem selecionada STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Remover a ordem selecionada -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}A ordem selecionada fará com que o veículo não pare nas estações STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Inserir nova ordem antes da ordem selecionada, ou adicionar no fim da lista -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}A ordem selecionada fará com que o veículo espere carregar completamente -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}A ordem selecionada forçará o veículo a descarregar STR_TIMETABLE_TOOLTIP :{BLACK}Plano de horário - selecione uma ordem clicando nela STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Mude a quantidade de tempo que a ordem deverá levar STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Reseta a quantidade de tempo para a ordem selecionada @@ -2787,8 +2780,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Impossível inverter a direção do trem... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Renomear tipo de veículo ferroviário STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Impossível renomear tipo de veículo ferroviário... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Força o veículo a deixar a carga na ordem selecionada -STR_TRANSFER :{BLACK}Transferir STR_CLEAR_TIME :{BLACK}Resetar horário STR_RESET_LATENESS :{BLACK}Resetar contador de atraso diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/bulgarian.txt --- a/src/lang/bulgarian.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/bulgarian.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1028,7 +1028,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Реалистично ускоряване на влаковете: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Забрана на влакове и кораби да правят 90 градусови завои: {ORANGE}{STRING} {LTBLUE} (трябва NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Обединяване на гари построени една до друга: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Напускане на станцията когато някой товар е пълен, при 'пълно зареждане': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Подобрен алгоритъм за зареждане: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Постепенно зареждане на автомобилите: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Инфлация: {ORANGE}{STRING} @@ -2698,10 +2697,7 @@ STR_8820_RENAME :{BLACK}Преименувай STR_8823_SKIP :{BLACK}Остави STR_8824_DELETE :{BLACK}Изтрий -STR_8825_NON_STOP :{BLACK}Без да спира STR_8826_GO_TO :{BLACK}Отиди на -STR_8827_FULL_LOAD :{BLACK}Пълен товар -STR_8828_UNLOAD :{BLACK}Разтовари STR_REFIT :{BLACK}Преустройство STR_REFIT_TIP :{BLACK}Избор какво преустройсто да се направи. Щракване със задържан контрол премахва инструкцията STR_REFIT_ORDER :(Преустройство към {STRING}) @@ -2760,10 +2756,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Пътен лист - натиснете върху назначение за маркиране. CTRL + натискане - центрира върху станцията STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Прескачане на настоящата заповед и започване на цледващата. CTRL + клик прескача до избраната заповед STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Изтриване на избраното назначение -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Преминавай през избраното назначение без спиране STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Добавяне на назначение преди избраната или в края на списъка -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Изчакай на избраното назначение до пълно зареждане с товар -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Разтоварва на избраното назначение целия товар STR_TIMETABLE_TOOLTIP :{BLACK}Времетаблица - кликни върху заповед за да я маркираш. STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Промени времетраенето на маркираната заповед STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Изчисти времетраенето на маркираната заповед @@ -2787,8 +2780,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Не може да обърне посоката на влак... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Преименуване на влак STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Не може да се преименува влак... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Изхвърляне на товара при достигане на избраното назначение -STR_TRANSFER :{BLACK}Транфер STR_CLEAR_TIME :{BLACK}Изчисти времето STR_RESET_LATENESS :{BLACK}Преправи закъснялата бройка diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/catalan.txt --- a/src/lang/catalan.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/catalan.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1026,7 +1026,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Activa l'acceleració realista per als trens: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Prohibeix fer girs de 90 graus als trens i vaixells: {ORANGE}{STRING} {LTBLUE} (necessita NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Ajunta estacions de tren fetes al costat d'una altra: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Marxa de l'estació quan un tipus de càrrega estigui ple, si 'càrrega completa': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Utilitza algorisme millorat de càrrega: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Carrega els vehicles gradualment: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflació: {ORANGE}{STRING} @@ -2697,10 +2696,7 @@ STR_8820_RENAME :{BLACK}Reanomena STR_8823_SKIP :{BLACK}Salta STR_8824_DELETE :{BLACK}Esborra -STR_8825_NON_STOP :{BLACK}No paris STR_8826_GO_TO :{BLACK}Ves a -STR_8827_FULL_LOAD :{BLACK}Carrega -STR_8828_UNLOAD :{BLACK}Descarreg STR_REFIT :{BLACK}Remodela STR_REFIT_TIP :{BLACK}Selecciona quin tipus de càrrega vols remodelar en aquesta ordre. Control + Clic per eliminar l'ordre de remodelar STR_REFIT_ORDER :(Remodela a {STRING}) @@ -2759,10 +2755,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Llista d'ordres - clica en una per seleccionar-la STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Salta l'ordre actual, i comença la següent. CTRL + clic salta l'ordre seleccionada STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Esborra l'ordre seleccionada -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Fer sense parades l'ordre seleccionada STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Afegeix una nova ordre abans de la seleccionada, o afegeix-la al final de la llista -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Fer que en l'ordre seleccionada s'esperi a que l'element tingui càrrega total -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Obliga en l'ordre seleccionada a descarregar l'element STR_TIMETABLE_TOOLTIP :{BLACK}Horari - clica sobre l'ordre per marcar-la. STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Canvia la quantitat de temps que l'ordre marcada hauria de prendre STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Esborra la quantitat de temps de l'ordre marcada @@ -2786,8 +2779,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}No es pot invertir la direcció del tren... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Reanomena el tipus d'element del tren STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}No es pot reanomenar el tipus d'element del tren... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Fer que l'ordre marcada forci al vehicle a volcar la càrrega -STR_TRANSFER :{BLACK}Transf. STR_CLEAR_TIME :{BLACK}Esborra Temps STR_RESET_LATENESS :{BLACK}Reset. control de retràs diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/croatian.txt --- a/src/lang/croatian.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/croatian.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1026,7 +1026,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Omogući realistično ubrzanje za vlakove: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Zabrani vlakovima i brodovima skretanja pod 90 stupnjeva: {ORANGE}{STRING} {LTBLUE} (requires NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Spoji željezničke stanice koje se izgrade jedna pokraj druge: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Napusti stanicu ako je bilo koji teret u potpunosti natovaren pri 'punom utovaru': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Koristi unaprijeđen utovarni algoritam: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Postupno utovaruj u vozila: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflacija: {ORANGE}{STRING} @@ -2667,10 +2666,7 @@ STR_8820_RENAME :{BLACK}Preimenuj STR_8823_SKIP :{BLACK}Preskoči STR_8824_DELETE :{BLACK}Obriši -STR_8825_NON_STOP :{BLACK}Neprekidno STR_8826_GO_TO :{BLACK}Idi do -STR_8827_FULL_LOAD :{BLACK}Puni utovar -STR_8828_UNLOAD :{BLACK}Istovar STR_REFIT :{BLACK}Prenamijeni STR_REFIT_TIP :{BLACK}Odaberi vrstu tereta za prenamijenu u ovoj naredbi. CTRL+klik kako bi uklonio naputak za prenamjenu STR_REFIT_ORDER :(Prenamijeni u {STRING}) @@ -2727,10 +2723,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Popis naredbi - klikni na naredbu kako bi ju označio. CTRL + klik klizi na stanicu STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Preskoči trenutnu naredbu i pokreni slijedeću. CTRL + klik preskače na odabranu naredbu STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Obriši označenu naredbu -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Napravi označenu naredbu da bude non-stop STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Umetni novu naredbu prije odabrane naredbe, ili dodaj na kraj liste -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Napravi da odabrana naredba natjera vozilo da čeka na potpuni utovar -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Napravi da označena naredba natjera vozilo na istovar STR_TIMETABLE_TOOLTIP :{BLACK}Raspored - klikni na naredbu da ju označiš. STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Promijeni količinu vremena koju bi označena naredba trebala uzeti STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Obriši potrebno vrijeme za označenu naredbu @@ -2754,8 +2747,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Nije moguće promijeniti smjer vlaka... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Preimenuj vrstu vagona STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Nije moguće preimenovati vrstu vagona... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Napravi da označena naredba prisili vozilo da izbaci teret -STR_TRANSFER :{BLACK}Transfer STR_CLEAR_TIME :{BLACK}Obriši vrijeme STR_RESET_LATENESS :{BLACK}Poništi Brojač Kašnjenja diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/czech.txt --- a/src/lang/czech.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/czech.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1084,7 +1084,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Zapnout realistické zrychlování vlaků: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Zakázat vlakům a lodím otáčení o 90 stupňů: {ORANGE}{STRING} {LTBLUE} (vyžaduje NPF) 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} @@ -2749,10 +2748,7 @@ STR_8820_RENAME :{BLACK}Přejmenovat STR_8823_SKIP :{BLACK}Přeskočit STR_8824_DELETE :{BLACK}Smazat -STR_8825_NON_STOP :{BLACK}Nonstop STR_8826_GO_TO :{BLACK}Jet do -STR_8827_FULL_LOAD :{BLACK}Naložit -STR_8828_UNLOAD :{BLACK}Vyložit STR_REFIT :{BLACK}Přestavět STR_REFIT_TIP :{BLACK}Vyber, na který druh nákladu přestavět. CTRL-klik odstraní přestavbu z příkazu. STR_REFIT_ORDER :(Přestavět na {STRING}) @@ -2809,10 +2805,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Seznam příkazů - stiskni příkaz pro označení. Kliknutím na příkaz se stisknutým CTRL se nastaví pohled na stanici STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Přeskočit příkaz a jít na další. Pomocí CTRL + kliknutí se přeskočí na vybraný příkaz STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Smazat označený příkaz -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Provést označený příkaz bez zastavení STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Vložit nový příkaz před označený příkaz nebo na konec seznamu -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Označený příkaz provádět do plného naložení -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Označený příkaz vyloží vozidlo STR_TIMETABLE_TOOLTIP :{BLACK}Jízdní řád - příkaz vybereš kliknutím. STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Změnit čas pro splnění jízdního příkazu STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Zrušit čas pro splnění jízdního příkazu @@ -2836,8 +2829,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Nelze obrátit vlak... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Přejmenovat typ železničního vozidla STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Nemohu přejmenovat typ železničního vozidla... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}U označeného příkazu vozidlo musí vyložit náklad -STR_TRANSFER :{BLACK}Překládka STR_CLEAR_TIME :{BLACK}Smazat čas STR_RESET_LATENESS :{BLACK}Smazat ukazatel zpoždění diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/danish.txt --- a/src/lang/danish.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/danish.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1026,7 +1026,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Aktiver realistisk acceleration af tog: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Forbyd skibe og tog at dreje 90 grader: {ORANGE}{STRING} {LTBLUE} (skal bruge NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Foren togstationer der bygges ved siden af hinanden: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Forlad stationen hvis en slags last bliver fyldt, hvis 'fuld last': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Brug forbedret indlæsnings algoritme: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Last køretøjer gradvist: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflation: {ORANGE}{STRING} @@ -2684,10 +2683,7 @@ STR_8820_RENAME :{BLACK}Omdøb STR_8823_SKIP :{BLACK}Spring over STR_8824_DELETE :{BLACK}Slet -STR_8825_NON_STOP :{BLACK}Uden stop STR_8826_GO_TO :{BLACK}Gå til -STR_8827_FULL_LOAD :{BLACK}Fuld last -STR_8828_UNLOAD :{BLACK}Aflæs STR_REFIT :{BLACK}Ombyg STR_REFIT_TIP :{BLACK}Vælg hvilken lasttype der skal ombygges til i denne ordre. CTRL-klik for at fjerne ombygningsinstruktion STR_REFIT_ORDER :(Ombyg til {STRING}) @@ -2744,10 +2740,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Ordreliste - klik på en ordre for at markere den. CTRL-klik for at centrere skærmen over stationen STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Spring over nuværende ordre og start næste. CTRL + klik springer til den valgte ordre STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Slet den markerede ordre -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Lav den markerede ordre til en "uden stop" ordre STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Indsæt en ny ordre før den markerede eller ved slutningen af ordrelisten -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Få den markerede ordre til at tvinge toget til at vente på en fuld last -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Få den markerede ordre til at tvinge toget til at aflæsse STR_TIMETABLE_TOOLTIP :{BLACK}Køreplan - klik på en ordre for at markere den. STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Ændre hvor lang tid den markerede ordre skal tage STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Nulstil tiden for den markerede ordre @@ -2771,8 +2764,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Kan ikke vende retningen af toget... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Omdøb tog-/togvognstypen STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Kan ikke omdøbe tog-/togvognstypen... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Få den valgte ordre til at tvinge køretøjet til at smide lasten -STR_TRANSFER :{BLACK}Overfør STR_CLEAR_TIME :{BLACK}Nulstil tid STR_RESET_LATENESS :{BLACK}Nulstil forsinkelse diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/dutch.txt --- a/src/lang/dutch.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/dutch.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1026,7 +1026,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Realistische acceleratie van treinen: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Verbied schepen en treinen om 90 graden te draaien: {ORANGE}{STRING} {LTBLUE} (Vereist NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Stations samenvoegen als ze naast elkaar worden gebouwd: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Verlaat station wanneer één lading geladen is, met 'vol laden': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Gebruik verbeterde laad algorithme: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Voertuigen geleidelijk laden: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflatie: {ORANGE}{STRING} @@ -2697,10 +2696,7 @@ STR_8820_RENAME :{BLACK}Hernoemen STR_8823_SKIP :{BLACK}Sla over STR_8824_DELETE :{BLACK}Verwijder -STR_8825_NON_STOP :{BLACK}Non-stop STR_8826_GO_TO :{BLACK}Ga naar -STR_8827_FULL_LOAD :{BLACK}Vol laden -STR_8828_UNLOAD :{BLACK}Uitladen STR_REFIT :{BLACK}Ombouwen STR_REFIT_TIP :{BLACK}Kies naar welk type vracht ombouwen in deze order. Ctrl-klik om ombouw instructie te verwijderen STR_REFIT_ORDER :(Ombouwen naar {STRING}) @@ -2759,10 +2755,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Orderlijst - klik op een order om deze te selecteren. CTRL + klikken gaat naar het station STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Sla huidige order over, en begin met de volgende. CTRL + klik, begin direct met geselecteerde order STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Verwijder de geselecteerde order -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Maak de geselecteerde order non-stop STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Voeg een nieuwe order in voor de geselecteerde order, of voeg het toe aan de eind van de lijst -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Zorg dat de geselecteerde order het voertuig forceert te wachten voor een volledige belading -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Zorg dat de geselecteerde order het voertuig forceert uit te laden STR_TIMETABLE_TOOLTIP :{BLACK}Dienstregeling - klik op een opdracht om het te selecteren STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Verander de hoeveelheid tijd die de geselecteerde opdracht mag innemen STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Verwijder de hoeveelheid tijd die de geselecteerde opdracht mag innemen @@ -2786,8 +2779,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Kan de richting van de trein niet omdraaien... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Hernoem trein voertuig type STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Kan het trein voertuig type niet hernoemen... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Forceer het voertuig goederen te dumpen bij geselecteerde order -STR_TRANSFER :{BLACK}Overladen STR_CLEAR_TIME :{BLACK}Reset de tijd STR_RESET_LATENESS :{BLACK}Reset teller diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/english.txt --- a/src/lang/english.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/english.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1027,7 +1027,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Enable realistic acceleration for trains: {ORANGE}{STRING1} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Forbid trains and ships to make 90 deg turns: {ORANGE}{STRING1} {LTBLUE} (requires NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Join train stations built next to each other: {ORANGE}{STRING1} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Leave station when any cargo is full, if 'full load': {ORANGE}{STRING1} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Use improved loading algorithm: {ORANGE}{STRING1} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Load vehicles gradually: {ORANGE}{STRING1} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflation: {ORANGE}{STRING1} @@ -2653,8 +2652,8 @@ STR_8801_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Citizens celebrate . . .{}First train arrives at {STATION}! STR_8802_DETAILS :{WHITE}{VEHICLE} (Details) STR_8803_TRAIN_IN_THE_WAY :{WHITE}Train in the way -STR_8804 :{SETX 10}{COMMA}: {STRING3} -STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING3} +STR_8804 :{SETX 10}{COMMA}: {STRING3} {STRING2} +STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING3} {STRING2} STR_ORDER_GO_TO :Go to STR_ORDER_GO_NON_STOP_TO :Go non-stop to STR_ORDER_GO_VIA :Go via @@ -2662,17 +2661,28 @@ STR_ORDER_DROP_LOAD_IF_POSSIBLE :Load if available STR_ORDER_DROP_FULL_LOAD_ALL :Full load all cargo STR_ORDER_DROP_FULL_LOAD_ANY :Full load any cargo -STR_ORDER_UNLOAD :(Unload) +STR_ORDER_DROP_NO_LOADING :No loading +STR_ORDER_DROP_UNLOAD_IF_ACCEPTED :Unload if accepted +STR_ORDER_DROP_UNLOAD :Unload all +STR_ORDER_DROP_TRANSFER :Transfer +STR_ORDER_DROP_NO_UNLOADING :No unloading STR_ORDER_FULL_LOAD :(Full load) STR_ORDER_FULL_LOAD_ANY :(Full load any cargo) STR_ORDER_NO_LOAD :(No loading) +STR_ORDER_UNLOAD :(Unload and take cargo) +STR_ORDER_UNLOAD_FULL_LOAD :(Unload and wait for full load) +STR_ORDER_UNLOAD_FULL_LOAD_ANY :(Unload and wait for any full load) +STR_ORDER_UNLOAD_NO_LOAD :(Unload and leave empty) STR_ORDER_TRANSFER :(Transfer and take cargo) -STR_ORDER_TRANSFER_UNLOAD :(Transfer and leave empty) STR_ORDER_TRANSFER_FULL_LOAD :(Transfer and wait for full load) STR_ORDER_TRANSFER_FULL_LOAD_ANY :(Transfer and wait for any full load) +STR_ORDER_TRANSFER_NO_LOAD :(Transfer and leave empty) STR_ORDER_NO_UNLOAD :(No unload and take cargo) STR_ORDER_NO_UNLOAD_FULL_LOAD :(No unload and wait for full load) STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY :(No unload and wait for any full load) +STR_ORDER_TOOLTIP_NON_STOP :{BLACK}Change the stopping behaviour of the highlighted order +STR_ORDER_TOOLTIP_FULL_LOAD :{BLACK}Change the loading behaviour of the highlighted order +STR_ORDER_TOOLTIP_UNLOAD :{BLACK}Change the unloading behaviour of the highlighted order STR_GO_TO_STATION :{STRING} {STATION} {STRING} STR_GO_TO_TRAIN_DEPOT :Go to {TOWN} Train Depot STR_SERVICE_AT_TRAIN_DEPOT :Service at {TOWN} Train Depot @@ -2720,10 +2730,7 @@ STR_8820_RENAME :{BLACK}Rename STR_8823_SKIP :{BLACK}Skip STR_8824_DELETE :{BLACK}Delete -STR_8825_NON_STOP :{BLACK}Non-Stop STR_8826_GO_TO :{BLACK}Go To -STR_8827_FULL_LOAD :{BLACK}Full Load -STR_8828_UNLOAD :{BLACK}Unload STR_REFIT :{BLACK}Refit STR_REFIT_TIP :{BLACK}Select what cargo type to refit to in this order. Control click to remove refit instruction STR_REFIT_ORDER :(Refit to {STRING}) @@ -2782,10 +2789,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Orders list - click on an order to highlight it. CTRL + click scrolls to the station STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Skip the current order, and start the next. CTRL + click skips to the selected order STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Delete the highlighted order -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Make the highlighted order non-stop STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Insert a new order before the highlighted order, or add to end of list -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Make the highlighted order force the vehicle to wait for a full load -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Make the highlighted order force the vehicle to unload STR_TIMETABLE_TOOLTIP :{BLACK}Timetable - click on an order to highlight it. STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Change the amount of time that the highlighted order should take STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Clear the amount of time for the highlighted order @@ -2809,8 +2813,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Can't reverse direction of train... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Rename train vehicle type STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Can't rename train vehicle type... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Make the highlighted order force the vehicle to dump cargo -STR_TRANSFER :{BLACK}Transfer STR_CLEAR_TIME :{BLACK}Clear Time STR_RESET_LATENESS :{BLACK}Reset Late Counter diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/english_US.txt --- a/src/lang/english_US.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/english_US.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1023,7 +1023,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Enable realistic acceleration for trains: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Forbid trains and ships to make 90 deg turns: {ORANGE}{STRING} {LTBLUE} (requires NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Join train stations built next to each other: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Leave station when any cargo is full, if 'full load': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Use improved loading algorithm: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Load vehicles gradually: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflation: {ORANGE}{STRING} @@ -2664,10 +2663,7 @@ STR_8820_RENAME :{BLACK}Rename STR_8823_SKIP :{BLACK}Skip STR_8824_DELETE :{BLACK}Delete -STR_8825_NON_STOP :{BLACK}Non-Stop STR_8826_GO_TO :{BLACK}Go To -STR_8827_FULL_LOAD :{BLACK}Full Load -STR_8828_UNLOAD :{BLACK}Unload STR_REFIT :{BLACK}Refit STR_REFIT_TIP :{BLACK}Select what cargo type to refit to in this order. Control click to remove refit instruction STR_REFIT_ORDER :(Refit to {STRING}) @@ -2724,10 +2720,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Orders list - click on order to highlight it STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Skip the current order, and start the next. CTRL + click skips to the selected order) STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Delete the highlighted order -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Make the highlighted order non-stop STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Insert a new order before the highlighted order, or add to end of list -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Make the highlighted order force the vehicle to wait for a full load -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Make the highlighted order force the vehicle to unload STR_TIMETABLE_TOOLTIP :{BLACK}Timetable - click on an order to highlight it. STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Change the amount of time that the highlighted order should take STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Clear the amount of time for the highlighted order @@ -2751,8 +2744,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Can't reverse direction of train... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Rename train vehicle type STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Can't rename train vehicle type... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Make the highlighted order force the vehicle to dump cargo -STR_TRANSFER :{BLACK}Transfer STR_CLEAR_TIME :{BLACK}Clear Time STR_RESET_LATENESS :{BLACK}Reset Late Counter diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/esperanto.txt --- a/src/lang/esperanto.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/esperanto.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1019,7 +1019,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Permesu realecan rapidigon por trajnoj: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Trajnoj kaj ŝipoj ne ort-turniĝu: {ORANGE}{STRING} {LTBLUE} (bezonas NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Ligu stacidomojn konstruatajn unu apud la alia: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Ĉe 'plene ŝarĝu' ekiru se ajna ŝarĝo estas plena: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Uzu plibonigitan ŝarĝalgoritmon: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Laŭgrade ŝarĝu veturilojn: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflacio: {ORANGE}{STRING} @@ -2530,10 +2529,7 @@ STR_8820_RENAME :{BLACK}Renomu STR_8823_SKIP :{BLACK}Plusaltu STR_8824_DELETE :{BLACK}Forviŝu -STR_8825_NON_STOP :{BLACK}Senhalte STR_8826_GO_TO :{BLACK}Iru al -STR_8827_FULL_LOAD :{BLACK}Plenigu -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}) @@ -2584,10 +2580,7 @@ STR_SHOW_TOTAL_CARGO :{BLACK}Montru tutan kapablon de trajno, dividite laŭ ŝarĝtipo STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Ordena listo - alklaku ordenon por elekti. CTRL + klako skrolas al la stacio STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Forviŝu la elektitan ordenon -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Senhaltigu elektitan ordenon 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_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 @@ -2607,8 +2600,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Ne povas inversigi direkton de trajno... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Renomu trajnan veturiltipon STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Ne povas renomi trajnan veturiltipon... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}La elektita ordeno igu la veturilon demeti la ŝarĝon -STR_TRANSFER :{BLACK}Transigu STR_TRAIN_STOPPING :{RED}Haltiĝas STR_TRAIN_STOPPING_VEL :{RED}Haltiĝas, {VELOCITY} diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/estonian.txt --- a/src/lang/estonian.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/estonian.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1126,7 +1126,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Aktiveeri realistlik rongide kiirendamine: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Keela rongidel ja laevadel 90 kraadised pöörded: {ORANGE}{STRING} {LTBLUE} (vajab NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Ühenda üksteise vastu ehitatud jaamad kokku: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Lahku jaamast, kui üks kaupadest on täis laetud: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Kasuta parandatud laadimisalgoritmi: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Laadi veovahendeid järkjärguliselt: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflatsioon: {ORANGE}{STRING} @@ -2784,10 +2783,7 @@ STR_8820_RENAME :{BLACK}Nime muutmine STR_8823_SKIP :{BLACK}Jäta vahele STR_8824_DELETE :{BLACK}Kustuta -STR_8825_NON_STOP :{BLACK}Peatusteta STR_8826_GO_TO :{BLACK}Mine -STR_8827_FULL_LOAD :{BLACK}Laadi täis -STR_8828_UNLOAD :{BLACK}Laadi maha STR_REFIT :{BLACK}Taasseadista STR_REFIT_TIP :{BLACK}Vali, millist laadungit ümber seadistada selles järjestuses. Ümberseadistuse käsu eemaldamiseks hoia klõpsamise ajal all Control nuppu STR_REFIT_ORDER :(Taasseadista {STRING}) @@ -2844,10 +2840,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Sihtpunktide nimekiri - vajuta käsul et see valida. CTRL + klik kerib jaama juurde STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Jäta praegune järjestus vahele ja alusta järgmisega. CTRL + klõps jätab vahele kuni valitud järjestuseni STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Kustuta valitud käsk -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Muuda valitud käsk peatuseta sihtpunktiks STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Lisa uus käsk nimekirja lõppu, või enne valitud käsku -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Käsi valitud sihtpunktis sõiduk täis laadida -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Käsi valitud sihtpunktis sõiduk tühjaks laadida STR_TIMETABLE_TOOLTIP :{BLACK}Sõiduplaan - esiletõstmiseks klõpsa sihtpunktil STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Muuda, kaua esile tõstetud sihtpunkti peale aega peaks kuluma STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Tühista esile tõstetud sihtpunkti ajaperiood @@ -2871,8 +2864,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Ei saa rongi ümber pöörata. STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Muuda rongivaguni tüübinime STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Raudteesõiduki tüübinime ei saa muuta... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Käsi valitud sihtpunktis sõiduki laadung kõrvaldada -STR_TRANSFER :{BLACK}Laadi ümber STR_CLEAR_TIME :{BLACK}Tühista aeg STR_RESET_LATENESS :{BLACK}Tühista hilinemisloendur diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/finnish.txt --- a/src/lang/finnish.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/finnish.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1018,7 +1018,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Junat kiihdyttävät realistisesti: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Junat ja laivat: ei 90-asteen käännöksiä: {ORANGE}{STRING} {LTBLUE} (vaatii: NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Yhdistä vierekkäiset rautatieasemat: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Jätä asema, kun mikä tahansa rahti on täysi, jos 'täysi lastaus': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Käytä kehittyneempää lastausalgoritmia: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Lataa kulkuneuvot vähitellen: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflaatio: {ORANGE}{STRING} @@ -2644,10 +2643,7 @@ STR_8820_RENAME :{BLACK}Nimeä STR_8823_SKIP :{BLACK}Ohita STR_8824_DELETE :{BLACK}Poista -STR_8825_NON_STOP :{BLACK}Tauotta STR_8826_GO_TO :{BLACK}Mene -STR_8827_FULL_LOAD :{BLACK}Täysi lasti -STR_8828_UNLOAD :{BLACK}Pura lasti STR_REFIT :{BLACK}Sovita STR_REFIT_TIP :{BLACK}Valitse rahdin tyyppi jolla tämä käsky uudistetaan. CTRL+klikkaus poistaa uudistuksen STR_REFIT_ORDER :(Sovita {STRING}) @@ -2704,10 +2700,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Aikataulu - napsauta määräystä korostaaksesi. STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Ohita nykyinen pysähdys ja aloita seuraava. STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Poista korostettu määräys. -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Tee korostetusta pysäkistä pysähtymätön. STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Lisää uusi pysähdys ennen valittua, tai lisää listan viimeiseksi. -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Aseta korostettu pysähdys pakottamaan ajoneuvon odottamaan täyttä lastausta. -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Aseta korostettu pysähdys pakottamaan ajoneuvo odottamaan purkua. STR_TIMETABLE_TOOLTIP :{BLACK}Aikataulu - valitse rivi STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Aseta kuinka kauan käskyn tulisi kestää STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Nollaa tämän rivin aika @@ -2731,8 +2724,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Junan suuntaa ei voi kääntää... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Nimeä juna(vaunu)n tyyppi uudelleen. STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Juna(vaunu)n tyyppiä ei voi uudelleennimetä... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Pakottaa tyhjentämään rahdin valitulla pysäkillä -STR_TRANSFER :{BLACK}Siirrä STR_CLEAR_TIME :{BLACK}Nollaa aika STR_RESET_LATENESS :{BLACK}Nollaa myöhästymislaskuri diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/french.txt --- a/src/lang/french.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/french.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1027,7 +1027,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Permettre les accélérations réalistes pour les trains: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Interdire aux trains et navires les virages à 90° : {ORANGE}{STRING} {LTBLUE} (Nécessite le NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Joindre les gares juxtaposées: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Pleine cargaison par un seul type, si 'chargement complet': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Utiliser l'algorithme amélioré de chargement : {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Charger les véhicules graduellement: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflation: {ORANGE}{STRING} @@ -2698,10 +2697,7 @@ STR_8820_RENAME :{BLACK}Renommer STR_8823_SKIP :{BLACK}Suivant STR_8824_DELETE :{BLACK}Supprimer -STR_8825_NON_STOP :{BLACK}Sans-arrêt STR_8826_GO_TO :{BLACK}Aller à -STR_8827_FULL_LOAD :{BLACK}Charger -STR_8828_UNLOAD :{BLACK}Décharger STR_REFIT :{BLACK}Réaménager STR_REFIT_TIP :{BLACK}Choisir pour quelle cargaison réaménager pour cet ordre. Ctrl-clic pour retirer l'instruction de réaménagement STR_REFIT_ORDER :(Réaménager pour {STRING}) @@ -2760,10 +2756,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Liste des ordres - Cliquer sur un ordre pour le sélectionner. Ctrl-clic pour déplacer la vue sur la station STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Sauter l'ordre courant, et enchaîner sur le suivant. Ctrl-clic pour sauter l'ordre sélectionné STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Supprime l'ordre sélectionné -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Transformer l'ordre sélectionné en Sans-Arrêt STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Insérer un nouvel ordre -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Forcer le véhicule à attendre un chargement complet pour l'ordre sélectionné -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Forcer le véhicule à attendre un déchargement complet pour l'ordre sélectionné STR_TIMETABLE_TOOLTIP :{BLACK}Horaire - cliquer sur un ordre pour le séléctionner. STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Modifier la durée de l'ordre séléctionné STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Annuler la durée de l'ordre séléctionné @@ -2787,8 +2780,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Impossible de faire faire demi-tour... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Renommer le type de train STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Impossible de renommer le type de train... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Forcer le véhicule à vider sa cargaison pour l'ordre sélectionné -STR_TRANSFER :{BLACK}Transfert STR_CLEAR_TIME :{BLACK}Annuler durée STR_RESET_LATENESS :{BLACK}RAZ compteur de retard diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/galician.txt --- a/src/lang/galician.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/galician.txt Tue Apr 15 19:47:58 2008 +0000 @@ -994,7 +994,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Habilita-la aceleración realista nos trens: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Prohibir os trens e os barcos facer xiros de 90 graos: {ORANGE}{STRING} {LTBLUE} (require NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Xunta-las estacións construídas xuntas: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Saír se calquera carga está chea,cando 'Carga chea': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Usa-lo algoritmo de carga mellorado: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflación: {ORANGE}{STRING} STR_CONFIG_PATCHES_SELECTGOODS :{LTBLUE}Descarga-la carga só cando haxa demanda: {ORANGE}{STRING} @@ -2465,10 +2464,7 @@ STR_8820_RENAME :{BLACK}Renomear STR_8823_SKIP :{BLACK}Saltar STR_8824_DELETE :{BLACK}Borrar -STR_8825_NON_STOP :{BLACK}Non Parar STR_8826_GO_TO :{BLACK}Ir a -STR_8827_FULL_LOAD :{BLACK}Cargar -STR_8828_UNLOAD :{BLACK}Descarga STR_TIMETABLE_VIEW :{BLACK}Táboa de tempo STR_8829_ORDERS :{WHITE}{VEHICLE} (Ordes) STR_882A_END_OF_ORDERS :{SETX 10}- - Fin das Ordes - - @@ -2516,10 +2512,7 @@ STR_SHOW_TOTAL_CARGO :{BLACK}Mostra-la capacidade total do tren, dividida por tipos de carga STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Lista de Ordes - Pincha nunha orde para seleccionala STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Borra-la orde seleccionada -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Facer que a orde seleccionada sexa de Non Parar STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Insertar unha nova orde despois da seleccionada, o insertar unha nova orde ó final da lista -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}A orde seleccionada forzará o vehículo a esperar ata que a carga estea completa -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}A orde seleccionada forzará o vehículo a descargar STR_SERVICE_HINT :{BLACK}saltar esta orde a non ser que sexa necesario o servicio STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER :{BLACK}Coste: {CURRENCY} Peso: {WEIGHT_S}{}Velocidade: {VELOCITY} Potencia: {POWER}{}Coste de Mantemento: {CURRENCY}/ano{}Capacidade: {CARGO} STR_885C_BROKEN_DOWN :{RED}Roto @@ -2539,7 +2532,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}No se pode cambia-lo sentido do tren... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Renomea-lo tipo de vehículo de ferrocarril STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Non se pode renome-lo tipo de vehículo de ferrocarril... -STR_TRANSFER :{BLACK}Transferir STR_TRAIN_STOPPING :{RED}Parando STR_TRAIN_STOPPING_VEL :{RED}Parando, {VELOCITY} diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/german.txt --- a/src/lang/german.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/german.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1027,7 +1027,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Realistische Zugbeschleunigung aktivieren: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Verbiete Zügen und Schiffen 90 Grad Kurven: {ORANGE}{STRING} {LTBLUE} (erfordert NWF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Bahnhöfe vereinigen, die nebeneinander gebaut werden: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Verlasse die Station, wenn eine Fracht vollgeladen ist: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Verbessertes Beladeverfahren nutzen: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Fahrzeuge schrittweise beladen: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflation: {ORANGE}{STRING} @@ -2685,10 +2684,7 @@ STR_8820_RENAME :{BLACK}Umbenennen STR_8823_SKIP :{BLACK}Überspringen STR_8824_DELETE :{BLACK}Löschen -STR_8825_NON_STOP :{BLACK}ohne Halt STR_8826_GO_TO :{BLACK}Nach -STR_8827_FULL_LOAD :{BLACK}Beladen -STR_8828_UNLOAD :{BLACK}Entladen STR_REFIT :{BLACK}Umrüsten STR_REFIT_TIP :{BLACK}Frachtart auswählen, auf die umgerüstet werden soll. Strg+Klick, um einen Umrüstungsauftrag wieder zu entfernen STR_REFIT_ORDER :(umrüsten auf {STRING}) @@ -2745,10 +2741,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Auftragsliste - zum Markieren hier anklicken STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Übergehe den laufenden Auftrag, und starte den nächsten STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Lösche den markierten Auftrag -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Führe den markierten Auftrag ohne Halt durch STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Füge einen neuen Auftrag vor dem markierten Auftrag ein, oder setze ihn ans Ende der Liste -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Der markierte Auftrag wird nur nach voller Beladung ausgeführt -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Beim markierten Auftrag wird die volle Entladung veranlasst STR_TIMETABLE_TOOLTIP :{BLACK}Fahrplan - Einträge anklicken um sie zu markieren. STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Zeitrahmen für den markierten Auftrag ändern STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Zeitrahmen für den markierten Auftrag löschen @@ -2772,8 +2765,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Die Zugbewegung kann nicht umgekehrt werden... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Zugtyp umbenennen STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Zugtyp kann nicht umbenannt werden... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Beim markierten Eintrag wird die Ladung in den Bahnhof entladen (für späteren Weitertransport) -STR_TRANSFER :{BLACK}Umladen STR_CLEAR_TIME :{BLACK}Zeit löschen STR_RESET_LATENESS :{BLACK}Verspätungszähler zurücksetzen diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/hungarian.txt --- a/src/lang/hungarian.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/hungarian.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1091,7 +1091,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Vonatok valósághű gyorsulása: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}A vonatok és a hajók nem tesznek 90 fokos kanyart: {ORANGE}{STRING} {LTBLUE} (csak NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Egymás mellé építhető vonatállomások: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Bármelyik rakomány telipakolása esetén induljon a jármű: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}A továbbfejlesztett betöltés használata: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Járművek fokozatos rakodása: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Infláció: {ORANGE}{STRING} @@ -2799,10 +2798,7 @@ STR_8820_RENAME :{BLACK}Átnevez STR_8823_SKIP :{BLACK}Kihagy STR_8824_DELETE :{BLACK}Töröl -STR_8825_NON_STOP :{BLACK}Non-stop STR_8826_GO_TO :{BLACK}Új cél -STR_8827_FULL_LOAD :{BLACK}Telepakol -STR_8828_UNLOAD :{BLACK}Lepakol STR_REFIT :{BLACK}Átalakít STR_REFIT_TIP :{BLACK}Válaszd ki minek a szállítására álljunk át. Ctrl+kattintással eltávolítod az átalakítási utasítást. STR_REFIT_ORDER :(Átalakít erre: {STRING}) @@ -2859,10 +2855,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Menetrend - kattints egy célpontra a kijelöléséhez STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Jelenlegi úticél átugrása, és a következő aktiválása. CTRL + kattintásra a kiválasztott úticélra ugrik STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}A kijelölt célpont törlése -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}A kijelölt célpont felé megállás nélkül kell haladni STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Új célpont beillesztése a kijelölt elé vagy a lista végére -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}A kijelölt célponton meg kell várni, amíg telerakják a járművet -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}A kijelölt célponton le kell pakolni a rakományt STR_TIMETABLE_TOOLTIP :{BLACK}Menetrend - kijelöléshez kattints egy elemére STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}A kijelölt menetrend-sor végrehajtási idejét változtatja meg STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}A kijelölt menetrendi sorhoz tartozó végrehajtási idő törlése @@ -2886,8 +2879,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Nem fordíthatod meg a vonatot... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Márkanév megváltoztatása STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Nem változtathatod meg a márkanevet... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}A kiválasztott állomásnál a jármű a rakományt leteszi -STR_TRANSFER :{BLACK}Elszállít STR_CLEAR_TIME :{BLACK}Idő törlése STR_RESET_LATENESS :{BLACK}Késés nullázása diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/icelandic.txt --- a/src/lang/icelandic.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/icelandic.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1027,7 +1027,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Raunveruleg hröðun lesta: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Banna lestum og skipum að taka 90° beygjur: {ORANGE}{STRING} {LTBLUE} (þarfnast NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Sameina lestarstöðvar sem byggðar eru samsíða: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}'Fullferma' á við um frysta farm sem fullfermist: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Nota endurbættan algóriþma við hleðslu: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Ferma farartæki smám saman: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Verðbólga: {ORANGE}{STRING} @@ -2697,10 +2696,7 @@ STR_8820_RENAME :{BLACK}Endurnefna STR_8823_SKIP :{BLACK}Sleppa STR_8824_DELETE :{BLACK}Eyða -STR_8825_NON_STOP :{BLACK}Viðstöðulaust STR_8826_GO_TO :{BLACK}Fara að -STR_8827_FULL_LOAD :{BLACK}Fullferma -STR_8828_UNLOAD :{BLACK} Afferma STR_REFIT :{BLACK}Breyta STR_REFIT_TIP :{BLACK}Veldu farm til að breyta í. CTRL smelltu til að fjarlægja breytiskipun STR_REFIT_ORDER :(Breyta í {STRING}) @@ -2759,10 +2755,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Áætlun - smelltu til að velja stöð. CTRL + músartakki færir sjónarhorn að stöðinni STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Sleppa núverandi skipun og fara í þá næstu. CTRL + smella sleppir valdri skipun STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Eyða valdri skipun -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Gera valda skipun viðstöðulausa STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Skeyta inn nýrri skipun á undan valdri skipun, eða bæta við á enda listans -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Neyða lest til að bíða eftir fullum farmi í valdri skipun -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Neyða lest til að afferma sig í valdri skipun STR_TIMETABLE_TOOLTIP :{BLACK}Áætlun - smelltu á skipun til að velja hana. STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Breyta tímanum sem valin skipun ætti að taka STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Hreinsa tímann fyrir valda skipun @@ -2786,8 +2779,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Get ekki snúið lest við... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Endurskíra lestargerð STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Get ekki endurskírt lestargerð... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Lætur lestina losa farminn á valinni skipun -STR_TRANSFER :{BLACK}Yfirfæra STR_CLEAR_TIME :{BLACK}Hreinsa tíma STR_RESET_LATENESS :{BLACK}Endurstilla seinkunnarteljara diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/italian.txt --- a/src/lang/italian.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/italian.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1028,7 +1028,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Abilita accelerazione realistica per i treni: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Impedisci a treni e navi di curvare a 90°: {ORANGE}{STRING} {LTBLUE} (richiede NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Unisci le stazioni ferroviarie costruite una accanto all'altra: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Lascia stazione quando una qualsiasi merce è a pieno carico: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Usa l'algoritmo di caricamento migliorato: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Carica i veicoli gradualmente: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflazione: {ORANGE}{STRING} @@ -2699,10 +2698,7 @@ STR_8820_RENAME :{BLACK}Rinomina STR_8823_SKIP :{BLACK}Salta STR_8824_DELETE :{BLACK}Elimina -STR_8825_NON_STOP :{BLACK}Non-stop STR_8826_GO_TO :{BLACK}Vai a -STR_8827_FULL_LOAD :{BLACK}Carica -STR_8828_UNLOAD :{BLACK}Scarica STR_REFIT :{BLACK}Riadatta STR_REFIT_TIP :{BLACK}Selezionare il tipo di carico per il quale riadattare in questo ordine. Premere CTRL+clic per rimuovere l'istruzione di riadattamento STR_REFIT_ORDER :(Riadatta per {STRING}) @@ -2761,10 +2757,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Lista degli ordini - fare clic su un ordine per selezionarlo e CTRL+clic per portarsi sulla stazione corrispondente STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Salta l'ordine corrente e inizia il successivo. Tenere premuto CTRL per saltare all'ordine selezionato STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Elimina l'ordine selezionato -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Fa diventare l'ordine selezionato 'non-stop' STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Inserisce un nuovo ordine prima di quello selezionato, o lo aggiunge alla fine della lista -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Fa in modo che l'ordine selezionato forzi il veicolo ad aspettare il carico completo -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Fa in modo che l'ordine selezionato forzi il veicolo a scaricare STR_TIMETABLE_TOOLTIP :{BLACK}Tabella oraria - fare clic su un ordine per selezionarlo STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Cambia la quantità di tempo che dovrebbe essere impiegata per l'ordine selezionato STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Elimina l'impostazione della quantità di tempo per l'ordine selezionato @@ -2788,8 +2781,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Impossibile invertire la direzione del treno... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Rinomina tipo di veicolo ferroviario STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Impossibile rinominare il tipo di veicolo ferroviario... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Fa in modo che l'ordine selezionato forzi il veicolo a trasferire il carico -STR_TRANSFER :{BLACK}Trasferisci STR_CLEAR_TIME :{BLACK}Elimina tempo STR_RESET_LATENESS :{BLACK}Azzera ritardo diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/japanese.txt --- a/src/lang/japanese.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/japanese.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1026,7 +1026,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}列車の現実的な加速を使用：{ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}列車／船舶が直角で曲げれないようにする：{ORANGE}{STRING}{LTBLUE}（NPF が必要） STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}隣接した駅を一つの駅に統合：{ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}全負荷が入の場合、何でもの貨物が「全負荷」となるときに出発：{ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}改良した読み込むアルゴリズムを使用：{ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}車両を次第に読み込む：{ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}インフレ：{ORANGE}{STRING} @@ -2682,10 +2681,7 @@ STR_8820_RENAME :{BLACK}名称を変更 STR_8823_SKIP :{BLACK}スキップ STR_8824_DELETE :{BLACK}削除 -STR_8825_NON_STOP :{BLACK}直行便 STR_8826_GO_TO :{BLACK}駅を選択 -STR_8827_FULL_LOAD :{BLACK}全負荷 -STR_8828_UNLOAD :{BLACK}降ろす STR_REFIT :{BLACK}再装備 STR_REFIT_TIP :{BLACK}貨物の種類を選択してください。Control+クリックすると、再装備をキャンセルします。 STR_REFIT_ORDER :（{STRING}に再装備） @@ -2742,10 +2738,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}指令リスト - 指令を選択するにはクリックします STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}実行中の指令をスキップして、次へ移動します。Control クリックすると、選択した指令へ移動します。 STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}選択した指令を削除します -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}選択した指令を「直行便」にします STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}選択した指令の前／リストの終わりに新規指令を挿入します -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}選択した指令に全負荷まで待つことを強制します -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}選択した指令に降ろすことを強制します STR_TIMETABLE_TOOLTIP :{BLACK}時刻表 - 指令を選択するにはクリックします。 STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}選択した指令の実行時間を変更します STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}選択した指令の実行時間を消去します @@ -2769,8 +2762,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}列車が逆転されられません... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}鉄道車両の名称を変更 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}鉄道車両の名称が変更できません... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}選択した指令に貨物の降ろすことを含みます -STR_TRANSFER :{BLACK}運搬 STR_CLEAR_TIME :{BLACK}時間を消去 STR_RESET_LATENESS :{BLACK}遅刻回数をリセット diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/korean.txt --- a/src/lang/korean.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/korean.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1027,7 +1027,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}사실감있는 열차 가속 사용 : {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}열차/선박의 90도 회전을 금지함: {ORANGE}{STRING} {LTBLUE} (requires NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}바로 옆에 역이 있으면 그 역의 이름으로 건설 (새로운 이름X) : {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}'전체 싣기'인 경우, 단 하나의 화물이라도 차면 역을 떠남 : {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}향상된 수송 알고리즘 사용 : {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}점차적으로 차량 싣기 : {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}인플레이션 (화폐가치하락) : {ORANGE}{STRING} @@ -2697,10 +2696,7 @@ STR_8820_RENAME :{BLACK}이름 STR_8823_SKIP :{BLACK}건너뛰기 STR_8824_DELETE :{BLACK}삭제 -STR_8825_NON_STOP :{BLACK}급행 STR_8826_GO_TO :{BLACK}행선지 -STR_8827_FULL_LOAD :{BLACK}모두 싣기 -STR_8828_UNLOAD :{BLACK}모두 내리기 STR_REFIT :{BLACK}개조 STR_REFIT_TIP :{BLACK}이 경로에서 어떤 화물을 받을 것인지 선택하십시오. CTRL+클릭은 제거입니다. STR_REFIT_ORDER :({STRING}(으)로 개조) @@ -2759,10 +2755,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}이 열차의 경로 - 선택하려면 클릭하세요. CTRL+클릭하시면 그 역이 있는 장소로 이동합니다. STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}현재 경로를 건너 뜁니다, 그리고 다음 경로를 시작합니다. Ctrl + 클릭은 선택된 경로로 건너 뜁니다. STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}선택된 경로를 삭제합니다. -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}선택된 경로를 급행으로 변경합니다. STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}선택된 경로 바로 전이나 목록 맨 끝에 새로운 경로를 삽입합니다. -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}선택된 경로에서 모든 화물을 가득 싣도록 변경합니다. -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}선택된 경로에서 모든 화물을 전부 내리도록 변경합니다. STR_TIMETABLE_TOOLTIP :{BLACK}시간표 - 경로를 클릭하면 선택합니다. STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}선택한 경로가 대기하고 있을 시간 변경 STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}선택한 경로의 시간 초기화 @@ -2786,8 +2779,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}열차를 회차시킬 수 없습니다... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}열차 차량 타입 이름 재지정 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}차량 타입의 이름을 다시 지정할 수 없습니다... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}선택된 경로에서 모든 화물을 내려서 쌓아놓도록 변경합니다. -STR_TRANSFER :{BLACK}환승 STR_CLEAR_TIME :{BLACK}시간 초기화 STR_RESET_LATENESS :{BLACK}지연 카운터 초기화 diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/lithuanian.txt --- a/src/lang/lithuanian.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/lithuanian.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1050,7 +1050,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Realistiska traukiniu akseleracija: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Drausti traukiniams/laivams suktis 90 laips.kampu: {ORANGE}{STRING} {LTBLUE} (reik. NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Leisti sujungti greta pastatytas stoteles: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Palikti stotele, jei nors 1 krovinys pilnai pakrautas: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Naudoti patobulinta krovimo algoritma: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Pakrauti tr. priemones paeiliui: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Infliacija: {ORANGE}{STRING} @@ -2539,10 +2538,7 @@ STR_8820_RENAME :{BLACK}Pervardinti STR_8823_SKIP :{BLACK}Praleisti STR_8824_DELETE :{BLACK}Istrinti -STR_8825_NON_STOP :{BLACK}Nestoti STR_8826_GO_TO :{BLACK}Vaziuoti -STR_8827_FULL_LOAD :{BLACK}Pakrauti -STR_8828_UNLOAD :{BLACK}Iskrauti STR_REFIT :{BLACK}Naujinti STR_REFIT_TIP :{BLACK}Pasirinkite kurį vagonų tipą kuriuo tipu pakeisti (eilės tvarka). Spragtelėjus laikant VALD (CTRL) nurodymas pašalinamas STR_REFIT_ORDER :(Keisti į {STRING}) @@ -2593,10 +2589,7 @@ STR_SHOW_TOTAL_CARGO :{BLACK}Rodyti bendra traukinio talpos informacija pagal kroviniu tipa STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Nurodymų sąrašas - nurodymas pažymimas ant jo spragtelėjus. Spregtelėjimas laikant VALD (CTRL) nukelia į stotį STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Istrinti pazymeta uzduoti -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Nestoti pazymetoje stoteleje STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Iterpti nauja uzduoti pries pazymeta, arba iterpti saraso pabaigoje -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Pazymetoje stoteleje laukti, kol transporto priemone pilnai pasikraus -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Iskrauti krovini pazymetoje stoteleje STR_SERVICE_HINT :{BLACK}Nevykdyti sios uzduoties iki tol, kol nereikes remonto STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER :{BLACK}Kaina: {CURRENCY} Svoris: {WEIGHT_S}{}Greitis: {VELOCITY} Galia: {POWER}{}Eksplotacijos išlaidos: {CURRENCY}/metus{}Talpa: {CARGO} STR_885C_BROKEN_DOWN :{RED}Sugedo @@ -2616,8 +2609,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Traukinio vaziavimo krypties pakeisti negalima... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Pervardinti traukinio tipa STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Neimanoma pervardinti traukinio tipo... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Priversti iškrauti krovinius pažymėta tvarka -STR_TRANSFER :{BLACK}Perkelti STR_TRAIN_STOPPING :{RED}Stabdoma STR_TRAIN_STOPPING_VEL :{RED}Stabdomas, {VELOCITY} diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/norwegian_bokmal.txt --- a/src/lang/norwegian_bokmal.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/norwegian_bokmal.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1025,7 +1025,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Realistisk akslerasjon for tog: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Forby tog og skip å gjøre 90-graders svinger: {ORANGE}{STRING} {LTBLUE} (trenger NGR) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Slå sammen stasjoner som bygges ved siden av hverandre: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Forlat stasjonen når én type varevogn er full, hvis 'full last' er på: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Bruk forbedret lastingsalgoritme: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Last kjøretøy gradvis: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflasjon: {ORANGE}{STRING} @@ -2666,10 +2665,7 @@ STR_8820_RENAME :{BLACK}Endre navn STR_8823_SKIP :{BLACK}Hopp over STR_8824_DELETE :{BLACK}Slett -STR_8825_NON_STOP :{BLACK}Uten stopp STR_8826_GO_TO :{BLACK}Kjør til -STR_8827_FULL_LOAD :{BLACK}Last fullt -STR_8828_UNLOAD :{BLACK}Last av STR_REFIT :{BLACK}Bygg om STR_REFIT_TIP :{BLACK}Velg varetypen det skal endres til. CTRL-klikk for å omgjøre. STR_REFIT_ORDER :(Bygg om til {STRING}) @@ -2726,10 +2722,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Ordreliste - trykk på en ordre for å velge den STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Hopp over den nåværende ordren og begynn på neste. CTRL + klikk hopper fram til valgte ordre STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Slett den valgte ordren -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Gjør den valgte ordren om til en STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Sett inn en ordre før den valgte ordren, eller i slutten av listen. -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Fyll alltid kjøretøyet ved valgte stasjon -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Tøm alltid kjøretøyet ved valgte stasjon STR_TIMETABLE_TOOLTIP :{BLACK}Tidstabell - klikk en ordre for å merke den. STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Endre varigheten for valgte ordre STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Fjern varigheten for valgte ordre @@ -2753,8 +2746,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Kan ikke snu toget... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Gi tog/vogn nytt navn STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Kan ikke gi tog/vogn nytt navn... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Få den merkede ordren til å tvinge kjøretøyet til å dumpe lasten -STR_TRANSFER :{BLACK}Overfør STR_CLEAR_TIME :{BLACK}Nullstill tid STR_RESET_LATENESS :{BLACK}Nullstill senhetsteller diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/norwegian_nynorsk.txt --- a/src/lang/norwegian_nynorsk.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/norwegian_nynorsk.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1024,7 +1024,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Realistisk akslerasjon for tog: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Forby tog og skip mot å gjere 90-graderssvingar: {ORANGE}{STRING} {LTBLUE} (treng NGR) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Slå saman stasjoner som vert bygde på sida av einannan: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Forlat stasjonen når éin type varevogn er full, dersom 'full last' er på: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Bruk forbetra lastingsalgoritme: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Last køyretøy gradvis: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflasjon: {ORANGE}{STRING} @@ -2665,10 +2664,7 @@ STR_8820_RENAME :{BLACK}Gje nytt namn STR_8823_SKIP :{BLACK}Hopp over STR_8824_DELETE :{BLACK}Slett -STR_8825_NON_STOP :{BLACK}Utan stopp STR_8826_GO_TO :{BLACK}Køyr til -STR_8827_FULL_LOAD :{BLACK}Last fullt -STR_8828_UNLOAD :{BLACK}Last av STR_REFIT :{BLACK}Bygg om STR_REFIT_TIP :{BLACK}Vel varetypen det skal skiftast til. CTRL-klikk for å fjerne ombyggingsinstruksjonar STR_REFIT_ORDER :(Bygg om til {STRING}) @@ -2725,10 +2721,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Ordreliste - trykk på ein ordre for å velje han STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Hopp over gjedande ordre, og start neste. CTRL + klikk hopper til valde ordre STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Slett den valde ordren -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Gjer den valde ordren om til ein STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Sett inn ein ordre før den valde ordren, eller i slutten av lista -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Alltid fyll køyretøyet ved den valde stasjonen -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Alltid tøm køyretøyet ved den valde stasjonen STR_TIMETABLE_TOOLTIP :{BLACK}Rutetabell - klikk på ei ordre for å merka den STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Bytt tida den merka ordra skal bruke STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Fjern tida den merka ordra skal bruke @@ -2752,8 +2745,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Kan ikkje snu toget... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Gje tog/vogn nytt namn STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Kan ikkje gje tog/vogn nytt namn... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Få den merka ordren til å tvinge køyretøyet til å dumpe lasta -STR_TRANSFER :{BLACK}Overfør STR_CLEAR_TIME :{BLACK}Fjern Tid STR_RESET_LATENESS :{BLACK}Still attende teljaren for forseining diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/piglatin.txt --- a/src/lang/piglatin.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/piglatin.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1018,7 +1018,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Enableway ealisticray accelerationway orfay ainstray: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Orbidfay ainstray andway ipsshay otay akemay 90 egday urnstay: {ORANGE}{STRING} {LTBLUE} (equiresray NPFay) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Oinjay aintray ationsstay uiltbay extnay otay eachway otherway: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Eavelay ationstay enwhay anyway argocay isway ullfay, ifway 'ullfay oad'lay: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Useway improvedway oadinglay algorithmway: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Oadlay ehiclesvay aduallygray: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflationway: {ORANGE}{STRING} @@ -2655,10 +2654,7 @@ STR_8820_RENAME :{BLACK}Enameray STR_8823_SKIP :{BLACK}Ipskay STR_8824_DELETE :{BLACK}Eleteday -STR_8825_NON_STOP :{BLACK}Onnay-Opstay STR_8826_GO_TO :{BLACK}Ogay Otay -STR_8827_FULL_LOAD :{BLACK}Ullfay Oadlay -STR_8828_UNLOAD :{BLACK}Unloadway STR_REFIT :{BLACK}Efitray STR_REFIT_TIP :{BLACK}Electsay atwhay argocay ypetay otay efitray otay inway isthay orderway. Ontrolcay ickclay otay emoveray efitray instructionway STR_REFIT_ORDER :(Efitray otay {STRING}) @@ -2715,10 +2711,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Ordersway istlay - ickclay onway anway orderway otay ighlighthay itway. CTRLay + ickclay ollsscray otay ethay ationstay STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Ipskay ethay urrentcay orderway, andway artstay ethay extnay. CTRLay + ickclay ipsskay otay ethay electedsay orderway STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Eleteday ethay ighlightedhay orderway -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Akemay ethay ighlightedhay orderway onnay-opstay STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Insertway away ewnay orderway eforebay ethay ighlightedhay orderway, orway addway otay endway ofway istlay -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Akemay ethay ighlightedhay orderway orcefay ethay ehiclevay otay aitway orfay away ullfay oadlay -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Akemay ethay ighlightedhay orderway orcefay ethay ehiclevay otay unloadway STR_TIMETABLE_TOOLTIP :{BLACK}Imetabletay - ickclay onway anway orderway otay ighlighthay itway. STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Angechay ethay amountway ofway imetay atthay ethay ighlightedhay orderway ouldshay aketay STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Earclay ethay amountway ofway imetay orfay ethay ighlightedhay orderway @@ -2742,8 +2735,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}An'tcay everseray irectionday ofway aintray... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Enameray aintray ehiclevay ypetay STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}An'tcay enameray aintray ehiclevay ypetay... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Akemay ethay ighlightedhay orderway orcefay ethay ehiclevay otay umpday argocay -STR_TRANSFER :{BLACK}Ansfertray STR_CLEAR_TIME :{BLACK}Angechay Imetay STR_RESET_LATENESS :{BLACK}Esetray Atelay Ountercay diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/polish.txt --- a/src/lang/polish.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/polish.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1110,7 +1110,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Realistyczne przyspieszenie pociągów: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Zabroń pociągom i statkom skręcać o 90st: {ORANGE}{STRING} {LTBLUE} (wymaga NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Połącz stacje budowane jedna obok drugiej: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Opuść stację gdy dowolny ładunek jest pełny, przy 'Załadunku': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Użyj ulepszonego algorytmu załadunku: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Stopniowy załadunek pojazdów: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflacja: {ORANGE}{STRING} @@ -2793,10 +2792,7 @@ STR_8820_RENAME :{BLACK}Zmień nazwę STR_8823_SKIP :{BLACK}Pomiń STR_8824_DELETE :{BLACK}Usuń -STR_8825_NON_STOP :{BLACK}Non-Stop STR_8826_GO_TO :{BLACK}Idź do -STR_8827_FULL_LOAD :{BLACK}Załadunek -STR_8828_UNLOAD :{BLACK}Wyładunek STR_REFIT :{BLACK}Przebuduj STR_REFIT_TIP :{BLACK}Wybierz do przewozu jakiego ładunku przebudować pojazd w tym zadaniu. CTRL+klik usuwa polecenie przebudowy STR_REFIT_ORDER :(Przebuduj na {STRING}) @@ -2853,10 +2849,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Lista poleceń - klik na poleceniu aby zaznaczyć. CTRL + klik przenosi do stacji STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Pomiń obecne zadanie, i rozpocznij kolejne. CTRL + klik pomija aż do zaznaczonego zadania STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Usuń podświetlone polecenie -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Zrób z tego polecenia 'non-stop' STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Wstaw nowe polecenie na końcu listy lub przed zaznaczonym poleceniem -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Spraw aby zaznaczone polecenie zmusiło pojazd do czekania na pełny załadunek -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Spraw aby zaznaczone polecenie zmusiło pojazd do wyładunku STR_TIMETABLE_TOOLTIP :{BLACK}Rozkład jazdy - kliknij na zadaniu aby je zaznaczyć. STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Zmień ilość czasu którą zaznaczone zadanie powinno zająć STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Usuń ilość czas przeznaczoną na zaznaczone zadanie @@ -2880,8 +2873,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Nie można odwrócić kierunku jazdy pociągu... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Zmiana nazwy typu pociągu STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Nie można zmienić nazwy typu pojazdu... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Spraw by w zaznaczonym poleceniu pojazd był zmuszony do pozostawienia ładunku dla kolejnego pojazdu -STR_TRANSFER :{BLACK}Przewieź STR_CLEAR_TIME :{BLACK}Usuń czas STR_RESET_LATENESS :{BLACK}Wyzeruj spóźnienia diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/portuguese.txt --- a/src/lang/portuguese.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/portuguese.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1026,7 +1026,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Activar aceleração realista para comboios: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Proibir comboios e barcos de virar a 90 graus: {ORANGE}{STRING} {LTBLUE} (req. NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Juntar estações ferroviárias construídas pegadas: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Deixar estação quando uma das cargas esteja completa: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Usar algoritmo de carregamento melhorado: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Carregar veículos gradualmente: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflação: {ORANGE}{STRING} @@ -2684,10 +2683,7 @@ STR_8820_RENAME :{BLACK}Renomear STR_8823_SKIP :{BLACK}Saltar STR_8824_DELETE :{BLACK}Eliminar -STR_8825_NON_STOP :{BLACK}Sem parar STR_8826_GO_TO :{BLACK}Ir Para -STR_8827_FULL_LOAD :{BLACK}Carga -STR_8828_UNLOAD :{BLACK}Descarga STR_REFIT :{BLACK}Converter STR_REFIT_TIP :{BLACK}Seleccionar o tipo de carga a converter nesta ordem. Pressionar Ctrl e botão-esquerdo do rato para remover instrução de conversão STR_REFIT_ORDER :(Converter para {STRING}) @@ -2744,10 +2740,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Lista de ordens - clique numa ordem para a seleccionar STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Salta a ordem actual, e inicia a próxima. CTRL + clique salta para a ordem seleccionada STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Eliminar a ordem seleccionada -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}A ordem seleccionada fará com que o veículo não para noutras estações pelo caminho STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Inserir nova ordem antes da ordem seleccionada, ou adicionar ao fim da lista -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}A ordem seleccionada fará com que o veículo espere carregar completamente -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}A ordem seleccionada forçará o veículo a descarregar STR_TIMETABLE_TOOLTIP :{BLACK}Horário - clique numa ordem para a seleccionar. STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Muda o espaço de tempo que a ordem seleccionada deve durar STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Apagar o tempo que dura a ordem seleccionada @@ -2771,8 +2764,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Não é possível inverter a direcção do comboio... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Renomear tipo de veículo ferroviário STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Não é possível renomear tipo de veículo ferroviário... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}A ordem seleccionada forçará o veículo a largar a carga -STR_TRANSFER :{BLACK}Transferir STR_CLEAR_TIME :{BLACK}Apagar Tempo STR_RESET_LATENESS :{BLACK}Apagar Contad. Atraso diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/romanian.txt --- a/src/lang/romanian.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/romanian.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1024,7 +1024,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Permite acceleratie realisticã pentru trenuri: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Interzice trenurilor si navelor sa faca intoarceri de 90 de grade: {ORANGE}{STRING} {LTBLUE} (necesita NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Uneste gãrile alãturate: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Pãrãseste statia când orice tip de marfã este 'full load': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Foloseste algoritm incarcare imbunatatit: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Incarca vehiculele gradual: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflatia: {ORANGE}{STRING} @@ -2665,10 +2664,7 @@ STR_8820_RENAME :{BLACK}Redenumeşte STR_8823_SKIP :{BLACK}Sãri peste STR_8824_DELETE :{BLACK}Şterge -STR_8825_NON_STOP :{BLACK}Fără oprire STR_8826_GO_TO :{BLACK}Mergi la -STR_8827_FULL_LOAD :{BLACK}Încarcă 100% -STR_8828_UNLOAD :{BLACK}Descarcă STR_REFIT :{BLACK}Rearanjeaza STR_REFIT_TIP :{BLACK}Alege tipul de marfa pentru rearanjare. Control+click pt a anula rearanjarea STR_REFIT_ORDER :(Rearanjeaza in {STRING}) @@ -2725,10 +2721,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Lista de comenzi - clic pe comandã pentru a o selecta STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Renunta la comanta acruala si preia-o pe urmatoarea. CTRL + click face salt la comanda selectata STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Sterge comanda selectatã -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Circulă fără oprire până la destinaţia selectată STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Introdu o comandã înaintea celei selectate sau adaugã o comandã la sfârsitul listei -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Forteazã trenul sã astepte la destinatia selectatã pânã la umplerea la capacitate maximã -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Forteazã trenul sã descarce marfa la destinatia selectatã STR_TIMETABLE_TOOLTIP :{BLACK}Orar - click on an order to highlight it. STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Modifica durata de timp alocata pentru comanda selectata STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Elimina durata de timp pentru comanda selectata @@ -2752,8 +2745,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Nu pot schimba sensul de mers al trenului... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Redenumeste modelul vehiculului feroviar STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Nu pot redenumi modelul acestui vehicul... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Comanda selectatã forteazã vehiculul sã arunce încãrcãtura -STR_TRANSFER :{BLACK}Transferă STR_CLEAR_TIME :{BLACK}Curata timp STR_RESET_LATENESS :{BLACK}Reinitializeaza contorul de intarziere diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/russian.txt --- a/src/lang/russian.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/russian.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1028,7 +1028,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Включить реалистичное ускорение для поездов: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Запретить 90-градусные повороты на ж/д и море: {ORANGE}{STRING} {LTBLUE} (NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Объединять рядом построенные ж/д станции: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Покидать станцию, когда любой груз полностью загружен: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Использовать улучшенный алгоритм загрузки: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Постепенная загрузка транспорта: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Включить инфляцию: {ORANGE}{STRING} @@ -2705,10 +2704,7 @@ STR_8820_RENAME :{BLACK}Переимен. STR_8823_SKIP :{BLACK}Пропуск STR_8824_DELETE :{BLACK}Удалить -STR_8825_NON_STOP :{BLACK}Без ост. STR_8826_GO_TO :{BLACK}Ехать -STR_8827_FULL_LOAD :{BLACK}Полный -STR_8828_UNLOAD :{BLACK}Без груза STR_REFIT :{BLACK}Переоб. STR_REFIT_TIP :{BLACK}Выберите тип грузов для переоборудования. CTRL+клик - для удаления. STR_REFIT_ORDER :(Переоборуд. для {STRING}) @@ -2765,10 +2761,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Показ списка заданий - щелкните для выделения. Если зажать CTRL - обзор станции. STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Пропустить данное задание и начать следующее. CTRL + клик пропускает выделенное задание. STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Удалить выделенное задание -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Ехать по выбранному заданию без остановок STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Вставить новое задание перед выделенным, или в конец списка -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Задать ожидание полной загрузки -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Задать ожидание полной разгрузки STR_TIMETABLE_TOOLTIP :{BLACK}Расписание - выберите задание. STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Изменить время для выделенного задания STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Очистить время в выделенном задании @@ -2792,8 +2785,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Невозможно развернуть поезд... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Переименовать тип вагона STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Невозможно переименовать тип вагона ... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}По выделенному приказу произойдет принудительная разгрузка транспортного средства -STR_TRANSFER :{BLACK}Трансфер STR_CLEAR_TIME :{BLACK}Сбросить Время STR_RESET_LATENESS :{BLACK}Сброс счетчика diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/simplified_chinese.txt --- a/src/lang/simplified_chinese.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/simplified_chinese.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1018,7 +1018,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}打开仿真的列车加速模式：{ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}禁止列车和轮船 90 度转弯：{ORANGE}{STRING} {LTBLUE} (需要 NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}将相邻的火车站进行整合：{ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}在“装货”模式时，只要装满任意一种即可：{ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}使用进阶的装货算法：{ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}装货时循序渐进：{ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}通货膨胀：{ORANGE}{STRING} @@ -2524,10 +2523,7 @@ STR_8820_RENAME :{BLACK}重命名 STR_8823_SKIP :{BLACK}跳过 STR_8824_DELETE :{BLACK}删除 -STR_8825_NON_STOP :{BLACK}不停 STR_8826_GO_TO :{BLACK}前往 -STR_8827_FULL_LOAD :{BLACK}装货 -STR_8828_UNLOAD :{BLACK}卸货 STR_REFIT :{BLACK}改装 STR_REFIT_TIP :{BLACK}选择要在调度计划中改装的货物类型。CTRL+单击可以去掉说明。 STR_REFIT_ORDER :(改装为 {STRING}) @@ -2584,10 +2580,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}调度列表 - 单击一个调度指令可以使之高亮化. CTRL + 单击可以将视点移动到相应的车站 STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}跳过当前命令并执行下一条命令。CTRL并单击可以跳过选定的命令 STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}删除高亮的调度命令 -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}命令铁车在高亮的指令对应的车站不停车 STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}在调度列表的结尾或高亮项目的前面增加一条新指令 -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}命令列车在高亮项目对应的车站装满货物 -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}命令列车在高亮项目对应的车站卸载货物 STR_TIMETABLE_TOOLTIP :{BLACK}时间表 - 单击一个命令可以使其高亮。 STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}改变高亮选择的命令执行的时间 STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}清除高亮选择的命令的执行时间 @@ -2611,8 +2604,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}不能命令列车调头... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}重命名车辆的类型 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}不能重命名车辆的类型... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}命令列车在高亮指令对应的车站寄存货物 -STR_TRANSFER :{BLACK}联运 STR_CLEAR_TIME :{BLACK}清除时间 STR_RESET_LATENESS :{BLACK}清除晚点计数器 diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/slovak.txt --- a/src/lang/slovak.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/slovak.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1090,7 +1090,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Zapnut realnu akceleraciu vlakov: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Zakázat vlakom a lodiam otácanie o 90 st.: {ORANGE}{STRING} {LTBLUE} (vyžaduje NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Umoznit spajanie stanic: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Opustit stanicu ked jeden z nakladov je plny, pri 'plne naloz': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Pouzit vylepseny algoritmus nakladania: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Postupné nakladanie vozidiel: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflácia: {ORANGE}{STRING} @@ -2760,10 +2759,7 @@ STR_8820_RENAME :{BLACK}Premenovat STR_8823_SKIP :{BLACK}Preskocit STR_8824_DELETE :{BLACK}Vynechat -STR_8825_NON_STOP :{BLACK}Non-Stop STR_8826_GO_TO :{BLACK}Chod do -STR_8827_FULL_LOAD :{BLACK}Plne naloz -STR_8828_UNLOAD :{BLACK}Vylozit STR_REFIT :{BLACK}Prestavba STR_REFIT_TIP :{BLACK}Vyberte typ nákladu na prestavbu v tomto poradí. CTRL+klik na odstránenie príkazu prestavby STR_REFIT_ORDER :(Prestavba na {STRING}) @@ -2822,10 +2818,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Zoznam prikazov - kliknut na prikaz pre oznacenie STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Preskocit aktuálny príkaz a zacat další. Podržte CTRL pre skok na oznacený príkaz STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Vymazat oznaceny prikaz -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Oznaceny prikaz bude prevedeny bez zastavenia STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Vlozit novy prikaz pred oznaceny prikaz, alebo na koniec zoznamu -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Na oznacenom prikaze bude vozidlo cakat na plne nalozenie -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Na oznacenom prikaze bude vozidlo uplne vylozene STR_TIMETABLE_TOOLTIP :{BLACK}Cestovný poriadok - kliknite na príkaz pre jeho oznacenie STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Zmenit dlžku trvania oznaceného príkazu STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Vymazat dlžku trvania oznaceného príkazu @@ -2849,8 +2842,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Nemozno zmenit smer vlaku ... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Premenovat typ vlaku STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Typ vlaku nemoze byt premenovany ... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}U vyznaceneho prikazu musi vozidlo vylozit naklad -STR_TRANSFER :{BLACK}Prekladka STR_CLEAR_TIME :{BLACK}Vymazat cas STR_RESET_LATENESS :{BLACK}Reset meskania diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/slovenian.txt --- a/src/lang/slovenian.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/slovenian.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1068,7 +1068,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Omogoči bolj resnične pospeške vlakov: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Prepreči vlakom in ladjam 90-stopinjske zavoje: {ORANGE}{STRING} {LTBLUE} (potrebuje NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Združi železniške postaje, ki si stojijo blizu: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Zapusti postajo ko je ves tovor napolnjen ob podukazu 'napolni do vrha': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Uporabi izboljšan algoritem polnjenja: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Postopno polni vozila: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflacija: {ORANGE}{STRING} @@ -2777,10 +2776,7 @@ STR_8820_RENAME :{BLACK}Preimenuj STR_8823_SKIP :{BLACK}Preskoči STR_8824_DELETE :{BLACK}Izbriši -STR_8825_NON_STOP :{BLACK}Brez postanka STR_8826_GO_TO :{BLACK}Pojdi do -STR_8827_FULL_LOAD :{BLACK}Naloži polno -STR_8828_UNLOAD :{BLACK}Raztovori STR_REFIT :{BLACK}Predelaj STR_REFIT_TIP :{BLACK}Izberi predelavo za vrsto tovora, ki ga želiš. CTRL + klik za odstranitev ukaza predelave STR_REFIT_ORDER :(Predelaj za {STRING}) @@ -2839,10 +2835,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Seznam navodil - klikni na ukaz, da ga izbereš. CTRL+klik prikaže postajo STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Preskoči trenutni ukaz in začni naslednjega. CTRL + klik preskoči na izbran ukaz STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Zbriši izbran ukaz -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Označi izbran ukaz kot brez-postanka STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Vstavi nov ukaz pred izbranega ali pa ga dodaj na koncu seznama -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Označi izbran ukaz, naj vozilo čaka na polno obremenitev -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Označi izbran ukaz, naj se vozilo v celoti raztovori STR_TIMETABLE_TOOLTIP :{BLACK}Časovna tabela - clikni na ukaz za ga označit. STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Spremeni čas, ki naj bi ga označeni ukaz porabil STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Počisti čas za označen ukaz @@ -2866,8 +2859,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Ni mogoče spremeniti smeri vlaka ... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Preimenuj železniško vozilo STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Ni mogoče preimenovati železniškega vozila ... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Nastavi označen ukaz, naj prisili vozilo, da se raztovori -STR_TRANSFER :{BLACK}Pretovori STR_CLEAR_TIME :{BLACK}Počisti čas STR_RESET_LATENESS :{BLACK}Resetiraj Late Counter diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/spanish.txt --- a/src/lang/spanish.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/spanish.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1027,7 +1027,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Activar aceleración realista de trenes: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Prohibir a trenes/barcos giros de 90 grados: {ORANGE}{STRING} {LTBLUE} (requiere NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Unir estaciones de tren unas junto a otras: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Abandona est. con alguna carga completa, en 'carga completa': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Usar algoritmo mejorado de carga: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Cargar vehículos gradualmente: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Inflacción: {ORANGE}{STRING} @@ -2685,10 +2684,7 @@ STR_8820_RENAME :{BLACK}Renombrar STR_8823_SKIP :{BLACK}Saltarse STR_8824_DELETE :{BLACK}Borrar -STR_8825_NON_STOP :{BLACK}Sin parar STR_8826_GO_TO :{BLACK}Ir a -STR_8827_FULL_LOAD :{BLACK}Carga -STR_8828_UNLOAD :{BLACK}Descarga STR_REFIT :{BLACK}Recargar STR_REFIT_TIP :{BLACK}Selecciona el tipo de carga a recargar en esta orden. Control+click para quitar la orden de recargar STR_REFIT_ORDER :(Recargar en {STRING}) @@ -2745,10 +2741,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Lista de órdenes - click en orden para resaltarla STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Saltar orden actual y comenzar la siguiente STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Borrar orden resaltada -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Hacer la orden resaltada sin parada STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Añadir nueva orden antes de la orden resaltada, o añadirla al final de la lista -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Hacer que en la orden resaltada, el vehículo espere a carga completa -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Hacer que en la orden resaltada, el vehículo espere a descargar completamente STR_TIMETABLE_TOOLTIP :{BLACK}Horarios - pulse en una orden para marcarla. STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Cambia la cantidad de tiempo que debe tomar una orden marcada STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Limpiar la cantidad de tiempo para la orden seleccionada @@ -2772,8 +2765,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}No se puede revertir la dirección... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Renombrar tipo de vehículo STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}No se puede renombrar tipo de vehículo... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Hacer que la orden marcada fuerce al vehículo a descargar -STR_TRANSFER :{BLACK}Transferir STR_CLEAR_TIME :{BLACK}Limpiar Horario STR_RESET_LATENESS :{BLACK}Resetear Retrasos diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/swedish.txt --- a/src/lang/swedish.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/swedish.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1026,7 +1026,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Aktivera realistisk acceleration för tåg: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Förbjud tåg och skepp att göra 90° svängar: {ORANGE}{STRING} {LTBLUE} (kräver NPF) 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} @@ -2696,10 +2695,7 @@ STR_8820_RENAME :{BLACK}Byt namn på STR_8823_SKIP :{BLACK}Skippa STR_8824_DELETE :{BLACK}Ta bort -STR_8825_NON_STOP :{BLACK}Non-stop STR_8826_GO_TO :{BLACK}Gå Till -STR_8827_FULL_LOAD :{BLACK}Lasta -STR_8828_UNLOAD :{BLACK}Lasta av STR_REFIT :{BLACK}Anpassa STR_REFIT_TIP :{BLACK}Välj vilken godstyp anpassningen ska göras i denna order. CTRL+ klicka för att ta bort anpassningsordern STR_REFIT_ORDER :(Anpassa för {STRING}) @@ -2758,10 +2754,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Orderlista - klicka på order för att markera det STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Hoppa över nuvarande order och starta nästa. CTRL + klick hoppar över till vald order STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Ta bort markerad order -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Gör markerad order non-stop STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Infoga ny order före markerad order, eller lägg till i slutet av listan -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Gör markerad order att tvinga fordonet att vänta på full last -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Gör markerad order att tvinga fordonet att vänta på tom last STR_TIMETABLE_TOOLTIP :{BLACK}Tidstabell - klicka på en order för att markera den. STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Ändra tid som den markerade ordern bör ta STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Rensa tiden för markerad order @@ -2785,8 +2778,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Kan inte byta tågets riktning... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Byt namn på tågets fordonstyp STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Kan inte byta namn på tågets fordonstyp... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Gör så att den markerade ordern tvingar fordonet att lasta av -STR_TRANSFER :{BLACK}Lasta om STR_CLEAR_TIME :{BLACK}Rensa tid STR_RESET_LATENESS :{BLACK}Rensa räknaren för sen ankomst diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/traditional_chinese.txt --- a/src/lang/traditional_chinese.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/traditional_chinese.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1020,7 +1020,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}真實的列車加速：{ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}禁止列車直角轉向：{ORANGE}{STRING} {LTBLUE} (需要啟用 NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}合併建在一起的車站：{ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}其中一種貨物滿載，列車即可離開車站：{ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}使用改善過的載貨演算法：{ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}逐步載貨：{ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}通貨膨脹：{ORANGE}{STRING} @@ -2661,10 +2660,7 @@ STR_8820_RENAME :{BLACK}更名 STR_8823_SKIP :{BLACK}跳過 STR_8824_DELETE :{BLACK}刪除 -STR_8825_NON_STOP :{BLACK}中途不停 STR_8826_GO_TO :{BLACK}前往 -STR_8827_FULL_LOAD :{BLACK}滿載 -STR_8828_UNLOAD :{BLACK}卸載 STR_REFIT :{BLACK}改裝 STR_REFIT_TIP :{BLACK}選擇這個指令要改裝的酬載種類。按住 CTRL 點選可移除改裝指令 STR_REFIT_ORDER :(改裝成 {STRING}) @@ -2721,10 +2717,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}指令清單 - 點選指令可選擇。按住 CTRL 點選可跳到車站位置 STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}跳過目前的命令，從下一個開始。CTRL + 左鍵 可直接跳至所選的命令 STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}刪除選定指令 -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}使選定的指令中途不停 STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}在選定的指令前插入新指令，或在最後新增指令 -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}讓列車在選定的指令等待載滿 -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}讓列車在選定的指令強制卸載 STR_TIMETABLE_TOOLTIP :{BLACK}時刻表 - 點一個命令來標記它。 STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}改變目前選定命令所需花費的時間 STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}清除目前選定命令所設定的時間 @@ -2748,8 +2741,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}無法到轉列車方向... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}重新命名鐵道車輛 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}無法修改鐵道車輛名稱... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}讓列車在選定的指令強制卸載 -STR_TRANSFER :{BLACK}轉運 STR_CLEAR_TIME :{BLACK}清除時刻 STR_RESET_LATENESS :{BLACK}歸零誤點/慢分 diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/turkish.txt --- a/src/lang/turkish.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/turkish.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1025,7 +1025,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Gerçekçi tren hızlanması: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Tren ve gemilerin 90 derece dönmesini yasakla: {ORANGE}{STRING} {LTBLUE} (NPF gerektirir) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Yan yana yapılan tren istasyonlarını birleştir: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}'tam doldur' etkinse istasyonu tam dolunca terket: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Geliştirilmiş yükleme algoritması kullan: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Araçlar yavaş yavaş dolsun: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Enflasyon: {ORANGE}{STRING} @@ -2695,10 +2694,7 @@ STR_8820_RENAME :{BLACK}Yeni isim STR_8823_SKIP :{BLACK}Atla STR_8824_DELETE :{BLACK}Sil -STR_8825_NON_STOP :{BLACK}Durmadan STR_8826_GO_TO :{BLACK}Git -STR_8827_FULL_LOAD :{BLACK}Doldur -STR_8828_UNLOAD :{BLACK}Boşalt STR_REFIT :{BLACK}Modifiye STR_REFIT_TIP :{BLACK}Bu talimatta değiştirilecek kargo türünü seçin. Değiştirmeyi kaldırmak için CTRL ile tıklayın STR_REFIT_ORDER :(Moifiye ile > {STRING}) @@ -2755,10 +2751,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Talimat listesi - seçmek için komutu tıklayın. CTRL + tıklama istasyona kaydırir STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Şimdiki talimatı atla ve sonrakine geç. CTRL ile tıklanırsa seçili talimata geçilir STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Seçili talimatı sil -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Seçili talimatı durmadan yap STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Seçili talimatın önüne ya da listenin sonuna komut ekle -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Seçili talimatı yaparken tren dolana kadar beklesin -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Seçili talimatı yaparken tren mutlaka yükünü boşaltsın STR_TIMETABLE_TOOLTIP :{BLACK}Zaman çizelgesi - işaretlemek için bir talimata tıklayın. STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Seçili talimatın harcaması gereken süreyi değiştir STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Seçili talimatın harcaması gereken süreyi sil @@ -2782,8 +2775,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Tren çevrilemez... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Tren yeniden adlandırılamaz STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Tren yeniden adlandırılamaz... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Seçili talimatta aracı kargoyu boşaltmaya zorla -STR_TRANSFER :{BLACK}Aktar STR_CLEAR_TIME :{BLACK}Zamanı Temizle STR_RESET_LATENESS :{BLACK}Gecikme sayacını sıfırla diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/ukrainian.txt --- a/src/lang/ukrainian.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/ukrainian.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1151,7 +1151,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Реалістичне прискорення поїздів: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Поїздам і кораблям не повертати на 90 град.: {ORANGE}{STRING} {LTBLUE} (треба NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Будувати суміжні залізничні станції: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Від'їжджати при повному завантаженні будь-якого вантажу: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Використовувати покращений алгоритм завантаження: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Завантажувати поступово: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Інфляція: {ORANGE}{STRING} @@ -2858,10 +2857,7 @@ STR_8820_RENAME :{BLACK}Назва STR_8823_SKIP :{BLACK}Пропуск STR_8824_DELETE :{BLACK}Видалити -STR_8825_NON_STOP :{BLACK}Беззупн STR_8826_GO_TO :{BLACK}Прямувати -STR_8827_FULL_LOAD :{BLACK}Повністю -STR_8828_UNLOAD :{BLACK}Розвант STR_REFIT :{BLACK}Переобладнати STR_REFIT_TIP :{BLACK}Оберіть на який тип вантажу переобладнати це завдання. Control+клік видалити команду переобладнання STR_REFIT_ORDER :(Переобладнати до {STRING}) @@ -2920,10 +2916,7 @@ STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Маршрутний лист - клікніть на завданні для його вибору. CTRL + клік показати станцію STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Пропустити поточний наказ, і виконувати наступний. CTRL + клік переходить до вибраного наказу STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Видалити виділене завдання -STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Не зупинятися на відміченій станції STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Вставити новий пункт перед відміченим або додати в кінець -STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Чекати повного завантаження на цій станції -STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Лише розвантажитися на цій станції STR_TIMETABLE_TOOLTIP :{BLACK}Розклад - клікніть на наказі, щоб виділити. STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Змінити час, впродовж якого має виконуватись наказ STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Очистити час для виділеного наказу @@ -2947,8 +2940,6 @@ STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Неможливо розвернути поїзд... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Перейменувати тип поїзду STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Неможливо перейменувати тип поїзду... -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Наказати транспорту примусово відвантажити вантаж -STR_TRANSFER :{BLACK}Пересадка STR_CLEAR_TIME :{BLACK}Очистити час STR_RESET_LATENESS :{BLACK}Очистити лічильник запізнення diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/unfinished/greek.txt --- a/src/lang/unfinished/greek.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/unfinished/greek.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1013,7 +1013,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Ενεργοποίηση ρεαλιστικής επιτάχυνσης για τα τρένα: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Απαγόρευση στροφών 90 μοιρών για τρένα και πλοία: {ORANGE}{STRING} {LTBLUE} (απαιτεί NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Σύνδεση σταθμών τρένων χτισμένων κοντά: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Αναχώρηση από το σταθμό όταν οποιοδήποτε φορτίο είναι πλήρες, όταν 'πλήρης φόρτος': {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Χρησιμοποίηση βελτιωμένου αλγόριθμου φόρτωσης: {ORANGE}{STRING} STR_CONFIG_PATCHES_GRADUAL_LOADING :{LTBLUE}Φόρτωση οχημάτων σταδιακά: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Πληθωρισμός: {ORANGE}{STRING} diff -r fcf5fb2548eb -r 195d7f6dcf71 src/lang/unfinished/latvian.txt --- a/src/lang/unfinished/latvian.txt Tue Apr 15 00:47:19 2008 +0000 +++ b/src/lang/unfinished/latvian.txt Tue Apr 15 19:47:58 2008 +0000 @@ -1007,7 +1007,6 @@ STR_CONFIG_PATCHES_REALISTICACCEL :{LTBLUE}Atl'aut rea'lu vilcienu pa'atrina'jumu: {ORANGE}{STRING} STR_CONFIG_PATCHES_FORBID_90_DEG :{LTBLUE}Aizliedz vilcieniem un kug'iem taisi't 90 gra'du pagriezienus: {ORANGE}{STRING} {LTBLUE} (nepiecies'ams NPF) STR_CONFIG_PATCHES_JOINSTATIONS :{LTBLUE}Savienot vilciena stacijas kas celtas blakus: {ORANGE}{STRING} -STR_CONFIG_PATCHES_FULLLOADANY :{LTBLUE}Izbraukt no stacijas ja jebkura krava ir uzpildi'ta un "pilna krava" ir iesle'gta: {ORANGE}{STRING} STR_CONFIG_PATCHES_IMPROVEDLOAD :{LTBLUE}Lietot uzlabotu uzla'de's'anas algoritmu: {ORANGE}{STRING} STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Infla'cija: {ORANGE}{STRING} STR_CONFIG_PATCHES_SELECTGOODS :{LTBLUE}Transporte't kravu uz staciju tikai tad ja ir pieprasijums: {ORANGE}{STRING} @@ -1789,8 +1788,6 @@ STR_8865_NAME_TRAIN :{WHITE}Nosaukt vilcienu STR_8867_NAME_TRAIN :{BLACK}Nosaukt vilcienu -STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Uzsve'rtai pa'velei spiest tansportli'dzekl'im nomest kravu -STR_TRANSFER :{BLACK}Tranzi'ts diff -r fcf5fb2548eb -r 195d7f6dcf71 src/newgrf.cpp --- a/src/newgrf.cpp Tue Apr 15 00:47:19 2008 +0000 +++ b/src/newgrf.cpp Tue Apr 15 19:47:58 2008 +0000 @@ -5431,8 +5431,8 @@ | (0 << 0x0B) // enhancedgui | (0 << 0x0C) // newagerating | ((_patches.build_on_slopes ? 1 : 0) << 0x0D) // buildonslopes - | ((_patches.full_load_any ? 1 : 0) << 0x0E) // fullloadany - | (1 << 0x0F) // planespeed - TODO depends on patch when implemented + | (1 << 0x0E) // fullloadany + | (1 << 0x0F) // planespeed | (0 << 0x10) // moreindustriesperclimate - obsolete | (0 << 0x11) // moretoylandfeatures | (1 << 0x12) // newstations diff -r fcf5fb2548eb -r 195d7f6dcf71 src/openttd.cpp --- a/src/openttd.cpp Tue Apr 15 00:47:19 2008 +0000 +++ b/src/openttd.cpp Tue Apr 15 19:47:58 2008 +0000 @@ -2494,6 +2494,32 @@ } } + if (CheckSavegameVersion(93)) { + /* Rework of orders. */ + Order *order; + FOR_ALL_ORDERS(order) order->ConvertFromOldSavegame(); + + Vehicle *v; + FOR_ALL_VEHICLES(v) v->current_order.ConvertFromOldSavegame(); + } else if (CheckSavegameVersion(94)) { + /* Unload and transfer are now mutual exclusive. */ + Order *order; + FOR_ALL_ORDERS(order) { + if ((order->GetUnloadType() & (OUFB_UNLOAD | OUFB_TRANSFER)) == (OUFB_UNLOAD | OUFB_TRANSFER)) { + order->SetUnloadType(OUFB_TRANSFER); + order->SetLoadType(OLFB_NO_LOAD); + } + } + + Vehicle *v; + FOR_ALL_VEHICLES(v) { + if ((v->current_order.GetUnloadType() & (OUFB_UNLOAD | OUFB_TRANSFER)) == (OUFB_UNLOAD | OUFB_TRANSFER)) { + v->current_order.SetUnloadType(OUFB_TRANSFER); + v->current_order.SetLoadType(OLFB_NO_LOAD); + } + } + } + return InitializeWindowsAndCaches(); } diff -r fcf5fb2548eb -r 195d7f6dcf71 src/order_base.h --- a/src/order_base.h Tue Apr 15 00:47:19 2008 +0000 +++ b/src/order_base.h Tue Apr 15 19:47:58 2008 +0000 @@ -27,8 +27,8 @@ friend void Load_VEHS(); ///< Loading of ancient vehicles. friend const struct SaveLoad *GetOrderDescription(); ///< Saving and loading of orders. - OrderTypeByte type; ///< The type of order - uint8 flags; ///< 'Sub'type of order + uint8 type; ///< The type of order + non-stop flags + uint8 flags; ///< Load/unload types, depot order/action types. DestinationID dest; ///< The destination of the order. CargoID refit_cargo; ///< Refit CargoID @@ -60,13 +60,13 @@ * @param type the type to check against. * @return true if the order matches. */ - inline bool IsType(OrderType type) const { return this->type == type; } + inline bool IsType(OrderType type) const { return this->GetType() == type; } /** * Get the type of order of this order. * @return the order type. */ - inline OrderType GetType() const { return this->type; } + inline OrderType GetType() const { return (OrderType)GB(this->type, 0, 6); } /** * 'Free' the order @@ -161,26 +161,26 @@ void SetRefit(CargoID cargo, byte subtype = 0); /** How must the consist be loaded? */ - OrderLoadFlags GetLoadType() const; + inline OrderLoadFlags GetLoadType() const { return (OrderLoadFlags)GB(this->flags, 4, 4); } /** How must the consist be unloaded? */ - inline OrderUnloadFlags GetUnloadType() const { return (OrderUnloadFlags)GB(this->flags, 0, 2); } + inline OrderUnloadFlags GetUnloadType() const { return (OrderUnloadFlags)GB(this->flags, 0, 4); } /** Where must we stop? */ - OrderNonStopFlags GetNonStopType() const; + inline OrderNonStopFlags GetNonStopType() const { return (OrderNonStopFlags)GB(this->type, 6, 2); } /** What caused us going to the depot? */ - inline OrderDepotTypeFlags GetDepotOrderType() const { return (OrderDepotTypeFlags)this->flags; } + inline OrderDepotTypeFlags GetDepotOrderType() const { return (OrderDepotTypeFlags)GB(this->flags, 0, 4); } /** What are we going to do when in the depot. */ - inline OrderDepotActionFlags GetDepotActionType() const { return (OrderDepotActionFlags)(this->flags & ODATFB_HALT); } + inline OrderDepotActionFlags GetDepotActionType() const { return (OrderDepotActionFlags)GB(this->flags, 4, 4); } /** Set how the consist must be loaded. */ - inline void SetLoadType(OrderLoadFlags load_type) { SB(this->flags, 2, 1, !!load_type); } + inline void SetLoadType(OrderLoadFlags load_type) { SB(this->flags, 4, 4, load_type); } /** Set how the consist must be unloaded. */ - inline void SetUnloadType(OrderUnloadFlags unload_type) { SB(this->flags, 0, 2, unload_type); } + inline void SetUnloadType(OrderUnloadFlags unload_type) { SB(this->flags, 0, 4, unload_type); } /** Set whether we must stop at stations or not. */ - inline void SetNonStopType(OrderNonStopFlags non_stop_type) { SB(this->flags, 3, 1, !!non_stop_type); } + inline void SetNonStopType(OrderNonStopFlags non_stop_type) { SB(this->type, 6, 2, non_stop_type); } /** Set the cause to go to the depot. */ - inline void SetDepotOrderType(OrderDepotTypeFlags depot_order_type) { this->flags = depot_order_type == ODTFB_SERVICE ? ODTF_MANUAL : depot_order_type; } + inline void SetDepotOrderType(OrderDepotTypeFlags depot_order_type) { SB(this->flags, 0, 4, depot_order_type); } /** Set what we are going to do in the depot. */ - inline void SetDepotActionType(OrderDepotActionFlags depot_service_type) { this->flags = depot_service_type; } + inline void SetDepotActionType(OrderDepotActionFlags depot_service_type) { SB(this->flags, 4, 4, depot_service_type); } bool ShouldStopAtStation(const Vehicle *v, StationID station) const; @@ -204,6 +204,12 @@ * @note unpacking is done in the constructor. */ uint32 Pack() const; + + /** + * Converts this order from an old savegame's version; + * it moves all bits to the new location. + */ + void ConvertFromOldSavegame(); }; static inline VehicleOrderID GetMaxOrderIndex() diff -r fcf5fb2548eb -r 195d7f6dcf71 src/order_cmd.cpp --- a/src/order_cmd.cpp Tue Apr 15 00:47:19 2008 +0000 +++ b/src/order_cmd.cpp Tue Apr 15 19:47:58 2008 +0000 @@ -41,21 +41,6 @@ DEFINE_OLD_POOL_GENERIC(Order, Order); -OrderLoadFlags Order::GetLoadType() const -{ - if ((this->flags & OLFB_FULL_LOAD) == 0) return OLF_LOAD_IF_POSSIBLE; - return _patches.full_load_any ? OLF_FULL_LOAD_ANY : OLFB_FULL_LOAD; -} - -OrderNonStopFlags Order::GetNonStopType() const -{ - if (_patches.new_nonstop) { - return (this->flags & 0x08) ? ONSF_NO_STOP_AT_ANY_STATION : ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS; - } - - return (this->flags & 0x08) ? ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS : ONSF_STOP_EVERYWHERE; -} - void Order::Free() { this->type = OT_NOTHING; @@ -157,6 +142,50 @@ this->travel_time = 0; } +void Order::ConvertFromOldSavegame() +{ + /* First handle non-stop, because those bits are going to be reused. */ + if (_patches.sg_new_nonstop) { + this->SetNonStopType((this->flags & 0x08) ? ONSF_NO_STOP_AT_ANY_STATION : ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS); + } else { + this->SetNonStopType((this->flags & 0x08) ? ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS : ONSF_STOP_EVERYWHERE); + } + + switch (this->GetType()) { + /* Only a few types need the other savegame conversions. */ + case OT_GOTO_DEPOT: case OT_GOTO_STATION: case OT_LOADING: break; + default: return; + } + + /* Then the load/depot action flags because those bits are going to be reused too + * and they reuse the non-stop bits. */ + if (this->GetType() != OT_GOTO_DEPOT) { + if ((this->flags & 4) == 0) { + this->SetLoadType(OLF_LOAD_IF_POSSIBLE); + } else { + this->SetLoadType(_patches.sg_full_load_any ? OLF_FULL_LOAD_ANY : OLFB_FULL_LOAD); + } + } else { + this->SetDepotActionType(((this->flags & 6) == 4) ? ODATFB_HALT : ODATF_SERVICE_ONLY); + } + + /* Finally fix the unload/depot type flags. */ + if (this->GetType() != OT_GOTO_DEPOT) { + uint t = ((this->flags & 1) == 0) ? OUF_UNLOAD_IF_POSSIBLE : OUFB_TRANSFER; + if ((this->flags & 2) != 0) t |= OUFB_UNLOAD; + this->SetUnloadType((OrderUnloadFlags)t); + + if ((this->GetUnloadType() & (OUFB_UNLOAD | OUFB_TRANSFER)) == (OUFB_UNLOAD | OUFB_TRANSFER)) { + this->SetUnloadType(OUFB_TRANSFER); + this->SetLoadType(OLFB_NO_LOAD); + } + } else { + uint t = ((this->flags & 6) == 6) ? ODTFB_SERVICE : ODTF_MANUAL; + if ((this->flags & 2) != 0) t |= ODTFB_PART_OF_ORDERS; + this->SetDepotOrderType((OrderDepotTypeFlags)t); + } +} + /** * * Unpacks a order from savegames with version 4 and lower @@ -322,7 +351,7 @@ } /* Non stop not allowed for non-trains. */ - // TODO: implement properly once savegame bump is done. if ((new_order.GetNonStopType() & ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) != 0 && v->type != VEH_TRAIN) return CMD_ERROR; + if (new_order.GetNonStopType() != ONSF_STOP_EVERYWHERE && v->type != VEH_TRAIN) return CMD_ERROR; /* Full load and unload are mutual exclusive. */ if ((new_order.GetLoadType() & OLFB_FULL_LOAD) && (new_order.GetUnloadType() & OUFB_UNLOAD)) return CMD_ERROR; @@ -372,7 +401,7 @@ } } - // TODO: implement properly once savegame bump is done. if (new_order.GetNonStopType() != ONSF_STOP_EVERYWHERE && v->type != VEH_TRAIN) return CMD_ERROR; + if (new_order.GetNonStopType() != ONSF_STOP_EVERYWHERE && v->type != VEH_TRAIN) return CMD_ERROR; if (new_order.GetDepotOrderType() & ~ODTFB_PART_OF_ORDERS) return CMD_ERROR; if (new_order.GetDepotActionType() & ~ODATFB_HALT) return CMD_ERROR; break; @@ -390,8 +419,7 @@ /* Order flags can be any of the following for waypoints: * [non-stop] * non-stop orders (if any) are only valid for trains */ - // TODO: implement properly once savegame bump is done. if (new_order.GetNonStopType() != ONSF_STOP_EVERYWHERE && v->type != VEH_TRAIN) return CMD_ERROR; - + if (new_order.GetNonStopType() != ONSF_STOP_EVERYWHERE && v->type != VEH_TRAIN) return CMD_ERROR; break; } @@ -773,12 +801,14 @@ break; case MOF_UNLOAD: - if ((data & ~(OUFB_UNLOAD | OUFB_TRANSFER)) != 0) return CMD_ERROR; + if ((data & ~(OUFB_UNLOAD | OUFB_TRANSFER | OUFB_NO_UNLOAD)) != 0) return CMD_ERROR; + /* Unload and no-unload are mutual exclusive and so are transfer and no unload. */ + if (data != 0 && ((data & (OUFB_UNLOAD | OUFB_TRANSFER)) != 0) == ((data & OUFB_NO_UNLOAD) != 0)) return CMD_ERROR; if (data == order->GetUnloadType()) return CMD_ERROR; break; case MOF_LOAD: - if ((data & ~OLFB_FULL_LOAD) != 0) return CMD_ERROR; + if (data > OLFB_NO_LOAD || data == 1) return CMD_ERROR; if (data == order->GetLoadType()) return CMD_ERROR; break; @@ -795,17 +825,16 @@ case MOF_UNLOAD: order->SetUnloadType((OrderUnloadFlags)data); - /* Full loading gets disabled when un loading! */ - if ((data & OUFB_UNLOAD) != 0) { - order->SetLoadType((OrderLoadFlags)(order->GetLoadType() & ~(OLFB_FULL_LOAD | OLF_FULL_LOAD_ANY))); + if ((data & OUFB_NO_UNLOAD) != 0 && (order->GetLoadType() & OLFB_NO_LOAD) != 0) { + order->SetLoadType((OrderLoadFlags)(order->GetLoadType() & ~OLFB_NO_LOAD)); } break; case MOF_LOAD: order->SetLoadType((OrderLoadFlags)data); - /* Unloading gets disabled when full loading! */ - if ((data & OLFB_FULL_LOAD) != 0) { - order->SetUnloadType((OrderUnloadFlags)(order->GetUnloadType() & ~OUFB_UNLOAD)); + if ((data & OLFB_NO_LOAD) != 0 && (order->GetUnloadType() & OUFB_NO_UNLOAD) != 0) { + /* No load + no unload isn't compatible */ + order->SetUnloadType((OrderUnloadFlags)(order->GetUnloadType() & ~OUFB_NO_UNLOAD)); } break; diff -r fcf5fb2548eb -r 195d7f6dcf71 src/order_gui.cpp --- a/src/order_gui.cpp Tue Apr 15 00:47:19 2008 +0000 +++ b/src/order_gui.cpp Tue Apr 15 19:47:58 2008 +0000 @@ -44,7 +44,6 @@ ORDER_WIDGET_FULL_LOAD, ORDER_WIDGET_UNLOAD, ORDER_WIDGET_REFIT, - ORDER_WIDGET_TRANSFER, ORDER_WIDGET_SERVICE, ORDER_WIDGET_RESIZE_BAR, ORDER_WIDGET_SHARED_ORDER_LIST, @@ -97,19 +96,63 @@ static const StringID _station_load_types[][5] = { { STR_EMPTY, - STR_ORDER_UNLOAD, + INVALID_STRING_ID, STR_ORDER_FULL_LOAD, STR_ORDER_FULL_LOAD_ANY, STR_ORDER_NO_LOAD, }, { + STR_ORDER_UNLOAD, + INVALID_STRING_ID, + STR_ORDER_UNLOAD_FULL_LOAD, + STR_ORDER_UNLOAD_FULL_LOAD_ANY, + STR_ORDER_UNLOAD_NO_LOAD, + }, { STR_ORDER_TRANSFER, - STR_ORDER_TRANSFER_UNLOAD, + INVALID_STRING_ID, STR_ORDER_TRANSFER_FULL_LOAD, STR_ORDER_TRANSFER_FULL_LOAD_ANY, + STR_ORDER_TRANSFER_NO_LOAD, + }, { + /* Unload and transfer do not work together. */ + INVALID_STRING_ID, + INVALID_STRING_ID, + INVALID_STRING_ID, + INVALID_STRING_ID, + }, { + STR_ORDER_NO_UNLOAD, + INVALID_STRING_ID, + STR_ORDER_NO_UNLOAD_FULL_LOAD, + STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY, INVALID_STRING_ID, } }; +static const StringID _order_non_stop_drowdown[] = { + STR_ORDER_GO_TO, + STR_ORDER_GO_NON_STOP_TO, + STR_ORDER_GO_VIA, + STR_ORDER_GO_NON_STOP_VIA, + INVALID_STRING_ID +}; + +static const StringID _order_full_load_drowdown[] = { + STR_ORDER_DROP_LOAD_IF_POSSIBLE, + STR_EMPTY, + STR_ORDER_DROP_FULL_LOAD_ALL, + STR_ORDER_DROP_FULL_LOAD_ANY, + STR_ORDER_DROP_NO_LOADING, + INVALID_STRING_ID +}; + +static const StringID _order_unload_drowdown[] = { + STR_ORDER_DROP_UNLOAD_IF_ACCEPTED, + STR_ORDER_DROP_UNLOAD, + STR_ORDER_DROP_TRANSFER, + STR_EMPTY, + STR_ORDER_DROP_NO_UNLOADING, + INVALID_STRING_ID +}; + static void DrawOrdersWindow(Window *w) { const Vehicle *v = GetVehicle(w->window_number); @@ -121,6 +164,11 @@ const Order *order = GetVehicleOrder(v, sel); if (v->owner == _local_player) { + /* Set the strings for the dropdown boxes. */ + w->widget[ORDER_WIDGET_NON_STOP].data = _order_non_stop_drowdown[order == NULL ? 0 : order->GetNonStopType()]; + w->widget[ORDER_WIDGET_FULL_LOAD].data = _order_full_load_drowdown[order == NULL ? 0 : order->GetLoadType()]; + w->widget[ORDER_WIDGET_UNLOAD].data = _order_unload_drowdown[order == NULL ? 0 : order->GetUnloadType()]; + /* skip */ w->SetWidgetDisabledState(ORDER_WIDGET_SKIP, v->num_orders <= 1); @@ -130,9 +178,8 @@ /* non-stop only for trains */ w->SetWidgetDisabledState(ORDER_WIDGET_NON_STOP, v->type != VEH_TRAIN || order == NULL); - w->SetWidgetDisabledState(ORDER_WIDGET_FULL_LOAD, order == NULL); // full load - w->SetWidgetDisabledState(ORDER_WIDGET_UNLOAD, order == NULL); // unload - w->SetWidgetDisabledState(ORDER_WIDGET_TRANSFER, order == NULL); // transfer + w->SetWidgetDisabledState(ORDER_WIDGET_FULL_LOAD, order == NULL || (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) != 0); // full load + w->SetWidgetDisabledState(ORDER_WIDGET_UNLOAD, order == NULL || (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) != 0); // unload /* Disable list of vehicles with the same shared orders if there is no list */ w->SetWidgetDisabledState(ORDER_WIDGET_SHARED_ORDER_LIST, !shared_orders || v->orders == NULL); w->SetWidgetDisabledState(ORDER_WIDGET_REFIT, order == NULL); // Refit @@ -140,12 +187,11 @@ w->HideWidget(ORDER_WIDGET_REFIT); // Refit w->HideWidget(ORDER_WIDGET_SERVICE); // Service } else { - w->DisableWidget(ORDER_WIDGET_TRANSFER); w->DisableWidget(ORDER_WIDGET_FULL_LOAD); } w->ShowWidget(ORDER_WIDGET_UNLOAD); - w->ShowWidget(ORDER_WIDGET_TRANSFER); + w->ShowWidget(ORDER_WIDGET_FULL_LOAD); if (order != NULL) { switch (order->GetType()) { @@ -156,7 +202,6 @@ case OT_GOTO_WAYPOINT: w->DisableWidget(ORDER_WIDGET_FULL_LOAD); w->DisableWidget(ORDER_WIDGET_UNLOAD); - w->DisableWidget(ORDER_WIDGET_TRANSFER); break; case OT_GOTO_DEPOT: @@ -165,7 +210,7 @@ /* Remove unload and replace it with refit */ w->HideWidget(ORDER_WIDGET_UNLOAD); w->ShowWidget(ORDER_WIDGET_REFIT); - w->HideWidget(ORDER_WIDGET_TRANSFER); + w->HideWidget(ORDER_WIDGET_FULL_LOAD); w->ShowWidget(ORDER_WIDGET_SERVICE); break; @@ -186,7 +231,7 @@ StringID str; while (order != NULL) { str = (v->cur_order_index == i) ? STR_8805 : STR_8804; - SetDParam(3, STR_EMPTY); + SetDParam(5, STR_EMPTY); if (i - w->vscroll.pos < w->vscroll.cap) { SetDParam(1, 6); @@ -204,8 +249,7 @@ SetDParam(1, STR_GO_TO_STATION); SetDParam(2, STR_ORDER_GO_TO + (v->type == VEH_TRAIN ? order->GetNonStopType() : 0)); SetDParam(3, order->GetDestination()); - /* Yes, this is ugly, but... once the savegame bump is done, it'll look a lot better! */ - SetDParam(4, _station_load_types[unload & OUFB_TRANSFER][((load & 1) | (load >> 1)) + ((unload & ~(OUFB_NO_UNLOAD | OUFB_TRANSFER)) >> 1)]); + SetDParam(4, (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) ? STR_EMPTY : _station_load_types[unload][load]); } break; case OT_GOTO_DEPOT: { @@ -229,10 +273,8 @@ SetDParam(1, s); if (order->IsRefit()) { - SetDParam(3, STR_REFIT_ORDER); - SetDParam(4, GetCargo(order->GetRefitCargo())->name); - } else { - SetDParam(3, STR_EMPTY); + SetDParam(5, STR_REFIT_ORDER); + SetDParam(6, GetCargo(order->GetRefitCargo())->name); } break; } @@ -331,6 +373,7 @@ (facil = FACIL_TRUCK_STOP, 1); if (st->facilities & facil) { order.MakeGoToStation(st_index); + if (_patches.new_nonstop && v->type == VEH_TRAIN) order.SetNonStopType(ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS); return order; } } @@ -408,9 +451,18 @@ VehicleOrderID sel_ord = OrderGetSel(w); const Order *order = GetVehicleOrder(v, sel_ord); - if (load_type > 0) load_type += 3; - if (load_type >= 0 && (order->GetLoadType() & OLFB_FULL_LOAD) == (load_type & OLFB_FULL_LOAD)) return; - DoCommandP(v->tile, v->index + (sel_ord << 16), MOF_LOAD | ((order->GetLoadType() & OLFB_FULL_LOAD) ^ OLFB_FULL_LOAD) << 2, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER)); + if (order->GetLoadType() == load_type) return; + + if (load_type < 0) { + switch (order->GetLoadType()) { + case OLF_LOAD_IF_POSSIBLE: load_type = OLFB_FULL_LOAD; break; + case OLFB_FULL_LOAD: load_type = OLF_FULL_LOAD_ANY; break; + case OLF_FULL_LOAD_ANY: load_type = OLFB_NO_LOAD; break; + case OLFB_NO_LOAD: load_type = OLF_LOAD_IF_POSSIBLE; break; + default: NOT_REACHED(); + } + } + DoCommandP(v->tile, v->index + (sel_ord << 16), MOF_LOAD | (load_type << 2), NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER)); } /** @@ -430,12 +482,24 @@ * @param w current window * @param v current vehicle */ -static void OrderClick_Unload(Window *w, const Vehicle *v, int i) +static void OrderClick_Unload(Window *w, const Vehicle *v, int unload_type) { VehicleOrderID sel_ord = OrderGetSel(w); const Order *order = GetVehicleOrder(v, sel_ord); - DoCommandP(v->tile, v->index + (sel_ord << 16), MOF_UNLOAD | (order->GetUnloadType() ^ OUFB_UNLOAD) << 2, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER)); + if (order->GetUnloadType() == unload_type) return; + + if (unload_type < 0) { + switch (order->GetUnloadType()) { + case OUF_UNLOAD_IF_POSSIBLE: unload_type = OUFB_UNLOAD; break; + case OUFB_UNLOAD: unload_type = OUFB_TRANSFER; break; + case OUFB_TRANSFER: unload_type = OUFB_NO_UNLOAD; break; + case OUFB_NO_UNLOAD: unload_type = OUF_UNLOAD_IF_POSSIBLE; break; + default: NOT_REACHED(); + } + } + + DoCommandP(v->tile, v->index + (sel_ord << 16), MOF_UNLOAD | (unload_type << 2), NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER)); } /** @@ -451,7 +515,6 @@ const Order *order = GetVehicleOrder(v, sel_ord); if (order->GetNonStopType() == non_stop) return; - if (_patches.new_nonstop && non_stop == ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) non_stop = ONSF_STOP_EVERYWHERE; /* Keypress if negative, so 'toggle' to the next */ if (non_stop < 0) { @@ -472,7 +535,7 @@ VehicleOrderID sel_ord = OrderGetSel(w); const Order *order = GetVehicleOrder(v, sel_ord); - DoCommandP(v->tile, v->index + (sel_ord << 16), MOF_UNLOAD | (order->GetUnloadType() ^ OUFB_TRANSFER) << 2, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER)); + DoCommandP(v->tile, v->index + (sel_ord << 16), MOF_UNLOAD | ((order->GetUnloadType() & ~OUFB_NO_UNLOAD) ^ OUFB_TRANSFER) << 2, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER)); } /** @@ -549,39 +612,12 @@ 'K' //unload }; -static const StringID _order_non_stop_drowdown[] = { - STR_ORDER_GO_TO, - STR_ORDER_GO_NON_STOP_TO, - STR_ORDER_GO_VIA, - STR_ORDER_GO_NON_STOP_VIA, - INVALID_STRING_ID -}; - -static const StringID _order_full_load_drowdown[] = { - STR_ORDER_DROP_LOAD_IF_POSSIBLE, - STR_ORDER_DROP_FULL_LOAD_ALL, - STR_ORDER_DROP_FULL_LOAD_ANY, - INVALID_STRING_ID -}; - static void OrdersWndProc(Window *w, WindowEvent *e) { const Vehicle *v = GetVehicle(w->window_number); switch (e->event) { case WE_CREATE: - /* Ensure that the refit and unload buttons always remain at the same location. - * Only one of them can be active at any one time and takes turns on being disabled. - * To ensure that they stay at the same location, we also verify that they behave the same - * when resizing. */ - if (v->owner == _local_player) { // only the vehicle owner got these buttons - assert(w->widget[ORDER_WIDGET_REFIT].left == w->widget[ORDER_WIDGET_UNLOAD].left); - assert(w->widget[ORDER_WIDGET_REFIT].right == w->widget[ORDER_WIDGET_UNLOAD].right); - assert(w->widget[ORDER_WIDGET_REFIT].top == w->widget[ORDER_WIDGET_UNLOAD].top); - assert(w->widget[ORDER_WIDGET_REFIT].bottom == w->widget[ORDER_WIDGET_UNLOAD].bottom); - assert(w->widget[ORDER_WIDGET_REFIT].display_flags == w->widget[ORDER_WIDGET_UNLOAD].display_flags); - } - if (_patches.timetabling) { w->widget[ORDER_WIDGET_CAPTION].right -= 61; } else { @@ -595,10 +631,10 @@ break; case WE_CLICK: + if (w->widget[e->we.click.widget].type != WWT_DROPDOWN) HideDropDownMenu(w); switch (e->we.click.widget) { case ORDER_WIDGET_ORDER_LIST: { ResetObjectToPlace(); - HideDropDownMenu(w); int sel = GetOrderFromOrderWndPt(w, e->we.click.pt.y, v); @@ -649,30 +685,27 @@ OrderClick_Delete(w, v, 0); break; - case ORDER_WIDGET_NON_STOP: - ShowDropDownMenu(w, _order_non_stop_drowdown, GetVehicleOrder(v, OrderGetSel(w))->GetNonStopType(), ORDER_WIDGET_NON_STOP, 0, _patches.new_nonstop ? 5 : 12, 124); - break; + case ORDER_WIDGET_NON_STOP: { + const Order *o = GetVehicleOrder(v, OrderGetSel(w)); + ShowDropDownMenu(w, _order_non_stop_drowdown, o->GetNonStopType(), ORDER_WIDGET_NON_STOP, 0, o->IsType(OT_GOTO_STATION) ? 0 : (o->IsType(OT_GOTO_WAYPOINT) ? 3 : 12)); + } break; case ORDER_WIDGET_GOTO: OrderClick_Goto(w, v, 0); break; case ORDER_WIDGET_FULL_LOAD: - ShowDropDownMenu(w, _order_full_load_drowdown, GetVehicleOrder(v, OrderGetSel(w))->GetLoadType() << 2, ORDER_WIDGET_FULL_LOAD, 0, _patches.full_load_any ? 2 : 4, 124); + ShowDropDownMenu(w, _order_full_load_drowdown, GetVehicleOrder(v, OrderGetSel(w))->GetLoadType(), ORDER_WIDGET_FULL_LOAD, 0, 2); break; case ORDER_WIDGET_UNLOAD: - OrderClick_Unload(w, v, 0); + ShowDropDownMenu(w, _order_unload_drowdown, GetVehicleOrder(v, OrderGetSel(w))->GetUnloadType(), ORDER_WIDGET_UNLOAD, 0, 8); break; case ORDER_WIDGET_REFIT: OrderClick_Refit(w, v, 0); break; - case ORDER_WIDGET_TRANSFER: - OrderClick_Transfer(w, v, 0); - break; - case ORDER_WIDGET_SERVICE: OrderClick_Service(w, v, 0); break; @@ -696,6 +729,10 @@ case ORDER_WIDGET_FULL_LOAD: OrderClick_FullLoad(w, v, e->we.dropdown.index); break; + + case ORDER_WIDGET_UNLOAD: + OrderClick_Unload(w, v, e->we.dropdown.index); + break; } break; @@ -733,17 +770,6 @@ } break; - case WE_RCLICK: { - int s = OrderGetSel(w); - - if (e->we.click.widget != ORDER_WIDGET_FULL_LOAD) break; - if (s == v->num_orders || !GetVehicleOrder(v, s)->IsType(OT_GOTO_DEPOT)) { - GuiShowTooltips(STR_8857_MAKE_THE_HIGHLIGHTED_ORDER); - } else { - GuiShowTooltips(STR_SERVICE_HINT); - } - } break; - case WE_PLACE_OBJ: OrdersPlaceObj(GetVehicle(w->window_number), e->we.place.tile, w); break; @@ -801,13 +827,12 @@ { WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 123, 88, 99, STR_8823_SKIP, STR_8853_SKIP_THE_CURRENT_ORDER}, // ORDER_WIDGET_SKIP { WWT_PUSHTXTBTN, RESIZE_TB, 14, 124, 247, 88, 99, STR_8824_DELETE, STR_8854_DELETE_THE_HIGHLIGHTED}, // ORDER_WIDGET_DELETE - { WWT_DROPDOWN, RESIZE_TB, 14, 0, 92, 76, 87, STR_8825_NON_STOP, STR_8855_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_NON_STOP + { WWT_DROPDOWN, RESIZE_TB, 14, 0, 123, 76, 87, STR_NULL, STR_ORDER_TOOLTIP_NON_STOP}, // ORDER_WIDGET_NON_STOP { WWT_TEXTBTN, RESIZE_TB, 14, 248, 371, 88, 99, STR_8826_GO_TO, STR_8856_INSERT_A_NEW_ORDER_BEFORE}, // ORDER_WIDGET_GOTO - { WWT_DROPDOWN, RESIZE_TB, 14, 93, 185, 76, 87, STR_8827_FULL_LOAD, STR_8857_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_FULL_LOAD - { WWT_PUSHTXTBTN, RESIZE_TB, 14, 186, 278, 76, 87, STR_8828_UNLOAD, STR_8858_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_UNLOAD - { WWT_PUSHTXTBTN, RESIZE_TB, 14, 186, 278, 76, 87, STR_REFIT, STR_REFIT_TIP}, // ORDER_WIDGET_REFIT - { WWT_PUSHTXTBTN, RESIZE_TB, 14, 279, 371, 76, 87, STR_TRANSFER, STR_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_TRANSFER - { WWT_PUSHTXTBTN, RESIZE_TB, 14, 279, 371, 76, 87, STR_SERVICE, STR_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_SERVICE + { WWT_DROPDOWN, RESIZE_TB, 14, 124, 247, 76, 87, STR_NULL, STR_ORDER_TOOLTIP_FULL_LOAD}, // ORDER_WIDGET_FULL_LOAD + { WWT_DROPDOWN, RESIZE_TB, 14, 248, 371, 76, 87, STR_NULL, STR_ORDER_TOOLTIP_UNLOAD}, // ORDER_WIDGET_UNLOAD + { WWT_PUSHTXTBTN, RESIZE_TB, 14, 124, 247, 76, 87, STR_REFIT, STR_REFIT_TIP}, // ORDER_WIDGET_REFIT + { WWT_PUSHTXTBTN, RESIZE_TB, 14, 248, 371, 76, 87, STR_SERVICE, STR_SERVICE_HINT}, // ORDER_WIDGET_SERVICE { WWT_PANEL, RESIZE_RTB, 14, 372, 373, 76, 99, 0x0, STR_NULL}, // ORDER_WIDGET_RESIZE_BAR { WWT_PUSHIMGBTN, RESIZE_LRTB, 14, 372, 385, 76, 87, SPR_SHARED_ORDERS_ICON, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP}, // ORDER_WIDGET_SHARED_ORDER_LIST @@ -840,11 +865,10 @@ { WWT_PUSHTXTBTN, RESIZE_TB, 14, 124, 247, 88, 99, STR_8824_DELETE, STR_8854_DELETE_THE_HIGHLIGHTED}, // ORDER_WIDGET_DELETE { WWT_EMPTY, RESIZE_TB, 14, 0, 0, 76, 87, 0x0, 0x0}, // ORDER_WIDGET_NON_STOP { WWT_TEXTBTN, RESIZE_TB, 14, 248, 371, 88, 99, STR_8826_GO_TO, STR_8856_INSERT_A_NEW_ORDER_BEFORE}, // ORDER_WIDGET_GOTO - { WWT_DROPDOWN, RESIZE_TB, 14, 0, 123, 76, 87, STR_8827_FULL_LOAD, STR_8857_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_FULL_LOAD - { WWT_PUSHTXTBTN, RESIZE_TB, 14, 124, 247, 76, 87, STR_8828_UNLOAD, STR_8858_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_UNLOAD - { WWT_PUSHTXTBTN, RESIZE_TB, 14, 124, 247, 76, 87, STR_REFIT, STR_REFIT_TIP}, // ORDER_WIDGET_REFIT - { WWT_PUSHTXTBTN, RESIZE_TB, 14, 248, 372, 76, 87, STR_TRANSFER, STR_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_TRANSFER - { WWT_PUSHTXTBTN, RESIZE_TB, 14, 248, 372, 76, 87, STR_SERVICE, STR_NULL}, // ORDER_WIDGET_SERVICE + { WWT_DROPDOWN, RESIZE_TB, 14, 0, 185, 76, 87, STR_NULL, STR_ORDER_TOOLTIP_FULL_LOAD}, // ORDER_WIDGET_FULL_LOAD + { WWT_DROPDOWN, RESIZE_TB, 14, 186, 372, 76, 87, STR_NULL, STR_ORDER_TOOLTIP_UNLOAD}, // ORDER_WIDGET_UNLOAD + { WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 185, 76, 87, STR_REFIT, STR_REFIT_TIP}, // ORDER_WIDGET_REFIT + { WWT_PUSHTXTBTN, RESIZE_TB, 14, 186, 372, 76, 87, STR_SERVICE, STR_SERVICE_HINT}, // ORDER_WIDGET_SERVICE { WWT_PANEL, RESIZE_RTB, 14, 372, 373, 76, 99, 0x0, STR_NULL}, // ORDER_WIDGET_RESIZE_BAR { WWT_PUSHIMGBTN, RESIZE_LRTB, 14, 372, 385, 76, 87, SPR_SHARED_ORDERS_ICON, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP}, // ORDER_WIDGET_SHARED_ORDER_LIST @@ -880,7 +904,6 @@ { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_FULL_LOAD { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_UNLOAD { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_REFIT - { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_TRANSFER { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_SERVICE { WWT_PANEL, RESIZE_RTB, 14, 0, 373, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_RESIZE_BAR diff -r fcf5fb2548eb -r 195d7f6dcf71 src/order_type.h --- a/src/order_type.h Tue Apr 15 00:47:19 2008 +0000 +++ b/src/order_type.h Tue Apr 15 19:47:58 2008 +0000 @@ -41,8 +41,8 @@ */ enum OrderUnloadFlags { OUF_UNLOAD_IF_POSSIBLE = 0, ///< Unload all cargo that the station accepts. - OUFB_TRANSFER = 1 << 0, ///< Transfer all cargo onto the platform. - OUFB_UNLOAD = 1 << 1, ///< Force unloading all cargo onto the platform, possibly not getting paid. + OUFB_UNLOAD = 1 << 0, ///< Force unloading all cargo onto the platform, possibly not getting paid. + OUFB_TRANSFER = 1 << 1, ///< Transfer all cargo onto the platform. OUFB_NO_UNLOAD = 1 << 2, ///< Totally no unloading will be done. }; @@ -51,8 +51,9 @@ */ enum OrderLoadFlags { OLF_LOAD_IF_POSSIBLE = 0, ///< Load as long as there is cargo that fits in the train. - OLFB_FULL_LOAD = 1 << 2, ///< Full load the complete the consist. - OLF_FULL_LOAD_ANY = 5, ///< Full load the a single cargo of the consist. + OLFB_FULL_LOAD = 1 << 1, ///< Full load the complete the consist. + OLF_FULL_LOAD_ANY = 3, ///< Full load the a single cargo of the consist. + OLFB_NO_LOAD = 4, ///< Do not load anything. }; /** @@ -71,7 +72,7 @@ */ enum OrderDepotTypeFlags { ODTF_MANUAL = 0, ///< The player initiated this order manually. - ODTFB_SERVICE = 1 << 2, ///< This depot order is because of the servicing limit. + ODTFB_SERVICE = 1 << 0, ///< This depot order is because of the servicing limit. ODTFB_PART_OF_ORDERS = 1 << 1, ///< This depot order is because of a regular order. }; @@ -80,7 +81,7 @@ */ enum OrderDepotActionFlags { ODATF_SERVICE_ONLY = 0, ///< Only service the vehicle. - ODATFB_HALT = 1 << 2, ///< Service the vehicle and then halt it. + ODATFB_HALT = 1 << 0, ///< Service the vehicle and then halt it. }; /** diff -r fcf5fb2548eb -r 195d7f6dcf71 src/saveload.h --- a/src/saveload.h Tue Apr 15 00:47:19 2008 +0000 +++ b/src/saveload.h Tue Apr 15 19:47:58 2008 +0000 @@ -13,7 +13,7 @@ #define SIZE_MAX ((size_t)-1) -static const uint NEWGRF_AIRPORTS_SAVEGAME = 93; +static const uint NEWGRF_AIRPORTS_SAVEGAME = 94; enum SaveOrLoadResult { SL_OK = 0, ///< completed successfully diff -r fcf5fb2548eb -r 195d7f6dcf71 src/settings.cpp --- a/src/settings.cpp Tue Apr 15 00:47:19 2008 +0000 +++ b/src/settings.cpp Tue Apr 15 19:47:58 2008 +0000 @@ -1461,10 +1461,11 @@ /***************************************************************************/ /* Station section of the GUI-configure patches window */ SDT_BOOL(Patches, join_stations, 0, 0, true, STR_CONFIG_PATCHES_JOINSTATIONS, NULL), - SDT_BOOL(Patches, full_load_any, 0,NN, true, STR_CONFIG_PATCHES_FULLLOADANY, NULL), + SDT_CONDBOOL(Patches, sg_full_load_any, 0, 92, 0, 0, true, STR_NULL, NULL), SDT_BOOL(Patches, improved_load, 0,NN, false, STR_CONFIG_PATCHES_IMPROVEDLOAD, NULL), SDT_BOOL(Patches, selectgoods, 0, 0, true, STR_CONFIG_PATCHES_SELECTGOODS, NULL), - SDT_BOOL(Patches, new_nonstop, 0, 0, false, STR_CONFIG_PATCHES_NEW_NONSTOP, NULL), + SDT_BOOL(Patches, new_nonstop, S, 0, false, STR_CONFIG_PATCHES_NEW_NONSTOP, NULL), + SDT_CONDBOOL(Patches, sg_new_nonstop, 0, 92, 0, 0, false, STR_NULL, NULL), SDT_BOOL(Patches, nonuniform_stations, 0,NN, true, STR_CONFIG_PATCHES_NONUNIFORM_STATIONS,NULL), SDT_VAR(Patches, station_spread,SLE_UINT8,0, 0, 12, 4, 64, 0, STR_CONFIG_PATCHES_STATION_SPREAD, InvalidateStationBuildWindow), SDT_BOOL(Patches, serviceathelipad, 0, 0, true, STR_CONFIG_PATCHES_SERVICEATHELIPAD, NULL), diff -r fcf5fb2548eb -r 195d7f6dcf71 src/settings_gui.cpp --- a/src/settings_gui.cpp Tue Apr 15 00:47:19 2008 +0000 +++ b/src/settings_gui.cpp Tue Apr 15 19:47:58 2008 +0000 @@ -748,7 +748,6 @@ static const char *_patches_stations[] = { "join_stations", - "full_load_any", "improved_load", "selectgoods", "new_nonstop", diff -r fcf5fb2548eb -r 195d7f6dcf71 src/settings_type.h --- a/src/settings_type.h Tue Apr 15 00:47:19 2008 +0000 +++ b/src/settings_type.h Tue Apr 15 19:47:58 2008 +0000 @@ -62,7 +62,7 @@ bool build_on_slopes; ///< allow building on slopes bool mammoth_trains; ///< allow very long trains bool join_stations; ///< allow joining of train stations - bool full_load_any; ///< new full load calculation, any cargo must be full + bool sg_full_load_any; ///< new full load calculation, any cargo must be full read from pre v93 savegames bool improved_load; ///< improved loading algorithm bool gradual_loading; ///< load vehicles gradually byte station_spread; ///< amount a station may spread @@ -79,6 +79,7 @@ bool status_long_date; ///< always show long date in status bar bool signal_side; ///< show signals on right side bool show_finances; ///< show finances at end of year + bool sg_new_nonstop; ///< ttdpatch compatible nonstop handling read from pre v93 savegames bool new_nonstop; ///< ttdpatch compatible nonstop handling bool roadveh_queue; ///< buggy road vehicle queueing bool autoscroll; ///< scroll when moving mouse to the edge. diff -r fcf5fb2548eb -r 195d7f6dcf71 src/vehicle.cpp --- a/src/vehicle.cpp Tue Apr 15 00:47:19 2008 +0000 +++ b/src/vehicle.cpp Tue Apr 15 19:47:58 2008 +0000 @@ -3105,7 +3105,7 @@ /* Convert the current_order.type (which is a mix of type and flags, because * in those versions, they both were 4 bits big) to type and flags */ v->current_order.flags = GB(v->current_order.type, 4, 4); - v->current_order.type.m_val &= 0x0F; + v->current_order.type &= 0x0F; } /* Advanced vehicle lists got added */ @@ -3140,6 +3140,9 @@ if (this->current_order.IsType(OT_GOTO_STATION) && this->current_order.GetDestination() == this->last_station_visited) { + current_order.MakeLoading(true); + UpdateVehicleTimetable(this, true); + /* Furthermore add the Non Stop flag to mark that this station * is the actual destination of the vehicle, which is (for example) * necessary to be known for HandleTrainLoading to determine @@ -3147,10 +3150,7 @@ * that arrives at random stations is bad. */ this->current_order.SetNonStopType(ONSF_NO_STOP_AT_ANY_STATION); - current_order.MakeLoading(true); - UpdateVehicleTimetable(this, true); } else { - this->current_order.SetNonStopType(ONSF_STOP_EVERYWHERE); current_order.MakeLoading(false); } diff -r fcf5fb2548eb -r 195d7f6dcf71 src/widgets/dropdown.cpp --- a/src/widgets/dropdown.cpp Tue Apr 15 00:47:19 2008 +0000 +++ b/src/widgets/dropdown.cpp Tue Apr 15 19:47:58 2008 +0000 @@ -258,7 +258,7 @@ _dropdown_menu_widgets); dw->widget[0].color = wi->color; - dw->widget[0].right = width + 1; + dw->widget[0].right = width - 1; dw->widget[0].bottom = height - 1; dw->SetWidgetHiddenState(1, !scroll);