From a9a21e784da0e13eb7d6240c0346d17d487307b4 Mon Sep 17 00:00:00 2001 From: Nicolas Chappe <74881848+nchappe@users.noreply.github.com> Date: Tue, 26 Jul 2022 18:27:54 +0200 Subject: [PATCH 01/17] Codechange: Always set the ODATFB_NEAREST_DEPOT flag for 'any depot' orders --- src/depot_type.h | 6 +++++- src/order_cmd.cpp | 6 +++--- src/order_gui.cpp | 2 +- src/script/api/script_order.cpp | 2 +- src/train_cmd.cpp | 2 +- src/vehicle_gui.cpp | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/depot_type.h b/src/depot_type.h index a2326794a0..d511b1b9e5 100644 --- a/src/depot_type.h +++ b/src/depot_type.h @@ -10,9 +10,13 @@ #ifndef DEPOT_TYPE_H #define DEPOT_TYPE_H -typedef uint16 DepotID; ///< Type for the unique identifier of depots. +#include "station_type.h" + +typedef StationID DepotID; ///< Type for the unique identifier of depots. struct Depot; +static const DepotID INVALID_DEPOT = INVALID_STATION; + static const uint MAX_LENGTH_DEPOT_NAME_CHARS = 32; ///< The maximum length of a depot name in characters including '\0' #endif /* DEPOT_TYPE_H */ diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp index 42cad82ad3..37f1c5ed34 100644 --- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -656,7 +656,7 @@ void OrderList::DebugCheckSanity() const static inline bool OrderGoesToStation(const Vehicle *v, const Order *o) { return o->IsType(OT_GOTO_STATION) || - (v->type == VEH_AIRCRAFT && o->IsType(OT_GOTO_DEPOT) && !(o->GetDepotActionType() & ODATFB_NEAREST_DEPOT)); + (v->type == VEH_AIRCRAFT && o->IsType(OT_GOTO_DEPOT) && o->GetDestination() != INVALID_STATION); } /** @@ -690,7 +690,7 @@ TileIndex Order::GetLocation(const Vehicle *v, bool airport) const return BaseStation::Get(this->GetDestination())->xy; case OT_GOTO_DEPOT: - if ((this->GetDepotActionType() & ODATFB_NEAREST_DEPOT) != 0) return INVALID_TILE; + if (this->GetDestination() == INVALID_DEPOT) return INVALID_TILE; return (v->type == VEH_AIRCRAFT) ? Station::Get(this->GetDestination())->xy : Depot::Get(this->GetDestination())->xy; default: @@ -1991,7 +1991,7 @@ bool UpdateOrderDest(Vehicle *v, const Order *order, int conditional_depth, bool if (pbs_look_ahead && reverse) return false; v->SetDestTile(location); - v->current_order.MakeGoToDepot(destination, v->current_order.GetDepotOrderType(), v->current_order.GetNonStopType(), (OrderDepotActionFlags)(v->current_order.GetDepotActionType() & ~ODATFB_NEAREST_DEPOT), v->current_order.GetRefitCargo()); + v->current_order.SetDestination(destination); /* If there is no depot in front, reverse automatically (trains only) */ if (v->type == VEH_TRAIN && reverse) Command::Do(DC_EXEC, v->index, false); diff --git a/src/order_gui.cpp b/src/order_gui.cpp index 982c8f7b29..16f5d49447 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -619,7 +619,7 @@ private: Order order; order.next = nullptr; order.index = 0; - order.MakeGoToDepot(0, ODTFB_PART_OF_ORDERS, + order.MakeGoToDepot(INVALID_DEPOT, ODTFB_PART_OF_ORDERS, _settings_client.gui.new_nonstop && this->vehicle->IsGroundVehicle() ? ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS : ONSF_STOP_EVERYWHERE); order.SetDepotActionType(ODATFB_NEAREST_DEPOT); diff --git a/src/script/api/script_order.cpp b/src/script/api/script_order.cpp index c127d11e3c..1886080aa7 100644 --- a/src/script/api/script_order.cpp +++ b/src/script/api/script_order.cpp @@ -470,7 +470,7 @@ static int ScriptOrderPositionToRealOrderPosition(VehicleID vehicle_id, ScriptOr if (order_flags & OF_GOTO_NEAREST_DEPOT) odaf |= ODATFB_NEAREST_DEPOT; OrderNonStopFlags onsf = (OrderNonStopFlags)((order_flags & OF_NON_STOP_INTERMEDIATE) ? ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS : ONSF_STOP_EVERYWHERE); if (order_flags & OF_GOTO_NEAREST_DEPOT) { - order.MakeGoToDepot(0, odtf, onsf, odaf); + order.MakeGoToDepot(INVALID_DEPOT, odtf, onsf, odaf); } else { /* Check explicitly if the order is to a station (for aircraft) or * to a depot (other vehicle types). */ diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index e84ac6b8ea..b08c57587b 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -3974,7 +3974,7 @@ static void CheckIfTrainNeedsService(Train *v) } SetBit(v->gv_flags, GVF_SUPPRESS_IMPLICIT_ORDERS); - v->current_order.MakeGoToDepot(depot, ODTFB_SERVICE); + v->current_order.MakeGoToDepot(depot, ODTFB_SERVICE, ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS, ODATFB_NEAREST_DEPOT); v->dest_tile = tfdd.tile; SetWindowWidgetDirty(WC_VEHICLE_VIEW, v->index, WID_VV_START_STOP); } diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 41ac89846c..49e57c605e 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -2864,7 +2864,7 @@ public: SetDParam(0, v->type); SetDParam(1, v->current_order.GetDestination()); SetDParam(2, v->GetDisplaySpeed()); - if (v->current_order.GetDepotActionType() & ODATFB_NEAREST_DEPOT) { + if (v->current_order.GetDestination() == INVALID_DEPOT) { /* This case *only* happens when multiple nearest depot orders * follow each other (including an order list only one order: a * nearest depot order) and there are no reachable depots. From 227626b0b70d2049ee045b5ec2f4d332d9ceafed Mon Sep 17 00:00:00 2001 From: Nicolas Chappe <74881848+nchappe@users.noreply.github.com> Date: Wed, 27 Jul 2022 18:45:23 +0200 Subject: [PATCH 02/17] Change: [YAPF] All compatible depots are targets for 'any depot' orders --- src/pathfinder/yapf/yapf_destrail.hpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/pathfinder/yapf/yapf_destrail.hpp b/src/pathfinder/yapf/yapf_destrail.hpp index 7f89639bf2..1c41579cba 100644 --- a/src/pathfinder/yapf/yapf_destrail.hpp +++ b/src/pathfinder/yapf/yapf_destrail.hpp @@ -118,6 +118,7 @@ protected: TileIndex m_destTile; TrackdirBits m_destTrackdirs; StationID m_dest_station_id; + bool m_any_depot; /** to access inherited path finder */ Tpf& Yapf() @@ -128,6 +129,7 @@ protected: public: void SetDestination(const Train *v) { + m_any_depot = false; switch (v->current_order.GetType()) { case OT_GOTO_WAYPOINT: if (!Waypoint::Get(v->current_order.GetDestination())->IsSingleTile()) { @@ -146,6 +148,12 @@ public: m_destTrackdirs = INVALID_TRACKDIR_BIT; break; + case OT_GOTO_DEPOT: + if (v->current_order.GetDepotActionType() & ODATFB_NEAREST_DEPOT) { + m_any_depot = true; + } + FALLTHROUGH; + default: m_destTile = v->dest_tile; m_dest_station_id = INVALID_STATION; @@ -170,6 +178,10 @@ public: && (GetRailStationTrack(tile) == TrackdirToTrack(td)); } + if (m_any_depot) { + return IsRailDepotTile(tile); + } + return (tile == m_destTile) && HasTrackdir(m_destTrackdirs, td); } From 7e7d943526fe20e2f38c625c24277e4372cd2681 Mon Sep 17 00:00:00 2001 From: Nicolas Chappe <74881848+nchappe@users.noreply.github.com> Date: Wed, 27 Jul 2022 18:34:01 +0200 Subject: [PATCH 03/17] Codechange: [YAPF] Allow to retrieve the final tile of the calculated path --- src/pathfinder/yapf/yapf.h | 3 ++- src/pathfinder/yapf/yapf_rail.cpp | 22 +++++++++++++--------- src/train_cmd.cpp | 11 +++++++---- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/pathfinder/yapf/yapf.h b/src/pathfinder/yapf/yapf.h index d644669807..80b6c4ca54 100644 --- a/src/pathfinder/yapf/yapf.h +++ b/src/pathfinder/yapf/yapf.h @@ -56,9 +56,10 @@ Trackdir YapfRoadVehicleChooseTrack(const RoadVehicle *v, TileIndex tile, DiagDi * @param path_found [out] Whether a path has been found (true) or has been guessed (false) * @param reserve_track indicates whether YAPF should try to reserve the found path * @param target [out] the target tile of the reservation, free is set to true if path was reserved + * @param dest [out] the final tile of the best path found * @return the best track for next turn */ -Track YapfTrainChooseTrack(const Train *v, TileIndex tile, DiagDirection enterdir, TrackBits tracks, bool &path_found, bool reserve_track, struct PBSTileInfo *target); +Track YapfTrainChooseTrack(const Train *v, TileIndex tile, DiagDirection enterdir, TrackBits tracks, bool &path_found, bool reserve_track, struct PBSTileInfo *target, TileIndex *dest); /** * Used when user sends road vehicle to the nearest depot or if road vehicle needs servicing using YAPF. diff --git a/src/pathfinder/yapf/yapf_rail.cpp b/src/pathfinder/yapf/yapf_rail.cpp index 8933c6f299..1b6f1a2528 100644 --- a/src/pathfinder/yapf/yapf_rail.cpp +++ b/src/pathfinder/yapf/yapf_rail.cpp @@ -395,19 +395,19 @@ public: return 't'; } - static Trackdir stChooseRailTrack(const Train *v, TileIndex tile, DiagDirection enterdir, TrackBits tracks, bool &path_found, bool reserve_track, PBSTileInfo *target) + static Trackdir stChooseRailTrack(const Train *v, TileIndex tile, DiagDirection enterdir, TrackBits tracks, bool &path_found, bool reserve_track, PBSTileInfo *target, TileIndex *dest) { /* create pathfinder instance */ Tpf pf1; Trackdir result1; if (_debug_desync_level < 2) { - result1 = pf1.ChooseRailTrack(v, tile, enterdir, tracks, path_found, reserve_track, target); + result1 = pf1.ChooseRailTrack(v, tile, enterdir, tracks, path_found, reserve_track, target, dest); } else { - result1 = pf1.ChooseRailTrack(v, tile, enterdir, tracks, path_found, false, nullptr); + result1 = pf1.ChooseRailTrack(v, tile, enterdir, tracks, path_found, false, nullptr, nullptr); Tpf pf2; pf2.DisableCache(true); - Trackdir result2 = pf2.ChooseRailTrack(v, tile, enterdir, tracks, path_found, reserve_track, target); + Trackdir result2 = pf2.ChooseRailTrack(v, tile, enterdir, tracks, path_found, reserve_track, target, dest); if (result1 != result2) { Debug(desync, 2, "CACHE ERROR: ChooseRailTrack() = [{}, {}]", result1, result2); DumpState(pf1, pf2); @@ -417,9 +417,10 @@ public: return result1; } - inline Trackdir ChooseRailTrack(const Train *v, TileIndex tile, DiagDirection enterdir, TrackBits tracks, bool &path_found, bool reserve_track, PBSTileInfo *target) + inline Trackdir ChooseRailTrack(const Train *v, TileIndex tile, DiagDirection enterdir, TrackBits tracks, bool &path_found, bool reserve_track, PBSTileInfo *target, TileIndex *dest) { if (target != nullptr) target->tile = INVALID_TILE; + if (dest != nullptr) *dest = INVALID_TILE; /* set origin and destination nodes */ PBSTileInfo origin = FollowTrainReservation(v); @@ -449,7 +450,10 @@ public: Node &best_next_node = *pPrev; next_trackdir = best_next_node.GetTrackdir(); - if (reserve_track && path_found) this->TryReservePath(target, pNode->GetLastTile()); + if (reserve_track && path_found) { + if (dest != nullptr) *dest = Yapf().GetBestNode()->GetLastTile(); + this->TryReservePath(target, pNode->GetLastTile()); + } } /* Treat the path as found if stopped on the first two way signal(s). */ @@ -528,10 +532,10 @@ struct CYapfAnySafeTileRail1 : CYapfT > {}; -Track YapfTrainChooseTrack(const Train *v, TileIndex tile, DiagDirection enterdir, TrackBits tracks, bool &path_found, bool reserve_track, PBSTileInfo *target) +Track YapfTrainChooseTrack(const Train *v, TileIndex tile, DiagDirection enterdir, TrackBits tracks, bool &path_found, bool reserve_track, PBSTileInfo *target, TileIndex *dest) { /* default is YAPF type 2 */ - typedef Trackdir (*PfnChooseRailTrack)(const Train*, TileIndex, DiagDirection, TrackBits, bool&, bool, PBSTileInfo*); + typedef Trackdir (*PfnChooseRailTrack)(const Train*, TileIndex, DiagDirection, TrackBits, bool&, bool, PBSTileInfo*, TileIndex*); PfnChooseRailTrack pfnChooseRailTrack = &CYapfRail1::stChooseRailTrack; /* check if non-default YAPF type needed */ @@ -539,7 +543,7 @@ Track YapfTrainChooseTrack(const Train *v, TileIndex tile, DiagDirection enterdi pfnChooseRailTrack = &CYapfRail2::stChooseRailTrack; // Trackdir, forbid 90-deg } - Trackdir td_ret = pfnChooseRailTrack(v, tile, enterdir, tracks, path_found, reserve_track, target); + Trackdir td_ret = pfnChooseRailTrack(v, tile, enterdir, tracks, path_found, reserve_track, target, dest); return (td_ret != INVALID_TRACKDIR) ? TrackdirToTrack(td_ret) : FindFirstTrack(tracks); } diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index b08c57587b..2f0a743274 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -2318,13 +2318,16 @@ static const byte _initial_tile_subcoord[6][4][3] = { * @param[out] path_found Whether a path has been found or not. * @param do_track_reservation Path reservation is requested * @param[out] dest State and destination of the requested path + * @param[out] final_dest Final tile of the best path found * @return The best track the train should follow */ -static Track DoTrainPathfind(const Train *v, TileIndex tile, DiagDirection enterdir, TrackBits tracks, bool &path_found, bool do_track_reservation, PBSTileInfo *dest) +static Track DoTrainPathfind(const Train *v, TileIndex tile, DiagDirection enterdir, TrackBits tracks, bool &path_found, bool do_track_reservation, PBSTileInfo *dest, TileIndex *final_dest) { + if (final_dest != nullptr) *final_dest = INVALID_TILE; + switch (_settings_game.pf.pathfinder_for_trains) { case VPF_NPF: return NPFTrainChooseTrack(v, path_found, do_track_reservation, dest); - case VPF_YAPF: return YapfTrainChooseTrack(v, tile, enterdir, tracks, path_found, do_track_reservation, dest); + case VPF_YAPF: return YapfTrainChooseTrack(v, tile, enterdir, tracks, path_found, do_track_reservation, dest, final_dest); default: NOT_REACHED(); } @@ -2596,7 +2599,7 @@ static Track ChooseTrainTrack(Train *v, TileIndex tile, DiagDirection enterdir, bool path_found = true; TileIndex new_tile = res_dest.tile; - Track next_track = DoTrainPathfind(v, new_tile, dest_enterdir, tracks, path_found, do_track_reservation, &res_dest); + Track next_track = DoTrainPathfind(v, new_tile, dest_enterdir, tracks, path_found, do_track_reservation, &res_dest, nullptr); if (new_tile == tile) best_track = next_track; v->HandlePathfindingResult(path_found); } @@ -2644,7 +2647,7 @@ static Track ChooseTrainTrack(Train *v, TileIndex tile, DiagDirection enterdir, if (orders.SwitchToNextOrder(true)) { PBSTileInfo cur_dest; bool path_found; - DoTrainPathfind(v, next_tile, exitdir, reachable, path_found, true, &cur_dest); + DoTrainPathfind(v, next_tile, exitdir, reachable, path_found, true, &cur_dest, nullptr); if (cur_dest.tile != INVALID_TILE) { res_dest = cur_dest; if (res_dest.okay) continue; From a4052ca3480f7b032c2c8dab8dd13caca4d2cc12 Mon Sep 17 00:00:00 2001 From: Nicolas Chappe <74881848+nchappe@users.noreply.github.com> Date: Wed, 27 Jul 2022 18:44:12 +0200 Subject: [PATCH 04/17] Codechange: Add VehicleOrderSaver::Restore() --- src/train_cmd.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 2f0a743274..e2b9d375d2 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -2449,6 +2449,7 @@ private: StationID old_last_station_visited; VehicleOrderID index; bool suppress_implicit_orders; + bool restored; public: VehicleOrderSaver(Train *_v) : @@ -2457,16 +2458,29 @@ public: old_dest_tile(_v->dest_tile), old_last_station_visited(_v->last_station_visited), index(_v->cur_real_order_index), - suppress_implicit_orders(HasBit(_v->gv_flags, GVF_SUPPRESS_IMPLICIT_ORDERS)) + suppress_implicit_orders(HasBit(_v->gv_flags, GVF_SUPPRESS_IMPLICIT_ORDERS)), + restored(false) { } - ~VehicleOrderSaver() + /** + * Restore the saved order to the vehicle. + */ + void Restore() { this->v->current_order = this->old_order; this->v->dest_tile = this->old_dest_tile; this->v->last_station_visited = this->old_last_station_visited; SB(this->v->gv_flags, GVF_SUPPRESS_IMPLICIT_ORDERS, 1, suppress_implicit_orders ? 1: 0); + this->restored = true; + } + + /** + * Restore the saved order to the vehicle, if Restore() has not already been called. + */ + ~VehicleOrderSaver() + { + if (!this->restored) this->Restore(); } /** From 721d98a7d097f1845f93fa7f944d76e75145aef9 Mon Sep 17 00:00:00 2001 From: Nicolas Chappe <74881848+nchappe@users.noreply.github.com> Date: Wed, 27 Jul 2022 18:56:58 +0200 Subject: [PATCH 05/17] Feature: Constantly update destination of 'any depot' orders --- src/train_cmd.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index e2b9d375d2..bb23f4b34f 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -2541,6 +2541,7 @@ static Track ChooseTrainTrack(Train *v, TileIndex tile, DiagDirection enterdir, Track best_track = INVALID_TRACK; bool do_track_reservation = _settings_game.pf.reserve_paths || force_res; bool changed_signal = false; + TileIndex final_dest = INVALID_TILE; assert((tracks & ~TRACK_BIT_MASK) == 0); @@ -2613,7 +2614,7 @@ static Track ChooseTrainTrack(Train *v, TileIndex tile, DiagDirection enterdir, bool path_found = true; TileIndex new_tile = res_dest.tile; - Track next_track = DoTrainPathfind(v, new_tile, dest_enterdir, tracks, path_found, do_track_reservation, &res_dest, nullptr); + Track next_track = DoTrainPathfind(v, new_tile, dest_enterdir, tracks, path_found, do_track_reservation, &res_dest, &final_dest); if (new_tile == tile) best_track = next_track; v->HandlePathfindingResult(path_found); } @@ -2687,6 +2688,15 @@ static Track ChooseTrainTrack(Train *v, TileIndex tile, DiagDirection enterdir, if (changed_signal) MarkTileDirtyByTile(tile); + orders.Restore(); + if (v->current_order.IsType(OT_GOTO_DEPOT) && + (v->current_order.GetDepotActionType() & ODATFB_NEAREST_DEPOT) && + final_dest != INVALID_TILE && IsRailDepotTile(final_dest)) { + v->current_order.SetDestination(GetDepotIndex(final_dest)); + v->dest_tile = final_dest; + SetWindowWidgetDirty(WC_VEHICLE_VIEW, v->index, WID_VV_START_STOP); + } + return best_track; } From c536bde19e782d5908cf5680591c753979d8ef93 Mon Sep 17 00:00:00 2001 From: Artin Alavi Date: Fri, 30 Sep 2022 15:20:25 -0700 Subject: [PATCH 06/17] Fix #8252: Remove duplicate functionality in `screenshot.cpp` --- src/screenshot.cpp | 44 ++------------------------------------------ src/smallmap_gui.cpp | 14 +++++++++----- src/smallmap_gui.h | 9 +++++++++ 3 files changed, 20 insertions(+), 47 deletions(-) diff --git a/src/screenshot.cpp b/src/screenshot.cpp index ddb22f13e1..e4cce7e1ed 100644 --- a/src/screenshot.cpp +++ b/src/screenshot.cpp @@ -27,6 +27,7 @@ #include "tile_map.h" #include "landscape.h" #include "video/video_driver.hpp" +#include "smallmap_gui.h" #include "table/strings.h" @@ -995,48 +996,8 @@ bool MakeScreenshot(ScreenshotType t, std::string name, uint32 width, uint32 hei } -/** - * Return the owner of a tile to display it with in the small map in mode "Owner". - * - * @param tile The tile of which we would like to get the colour. - * @return The owner of tile in the small map in mode "Owner" - */ -static Owner GetMinimapOwner(TileIndex tile) -{ - Owner o; - - if (IsTileType(tile, MP_VOID)) { - return OWNER_END; - } else { - switch (GetTileType(tile)) { - case MP_INDUSTRY: o = OWNER_DEITY; break; - case MP_HOUSE: o = OWNER_TOWN; break; - default: o = GetTileOwner(tile); break; - /* FIXME: For MP_ROAD there are multiple owners. - * GetTileOwner returns the rail owner (level crossing) resp. the owner of ROADTYPE_ROAD (normal road), - * even if there are no ROADTYPE_ROAD bits on the tile. - */ - } - - return o; - } -} - static void MinimapScreenCallback(void *userdata, void *buf, uint y, uint pitch, uint n) { - /* Fill with the company colours */ - byte owner_colours[OWNER_END + 1]; - for (const Company *c : Company::Iterate()) { - owner_colours[c->index] = MKCOLOUR(_colour_gradient[c->colour][5]); - } - - /* Fill with some special colours */ - owner_colours[OWNER_TOWN] = PC_DARK_RED; - owner_colours[OWNER_NONE] = PC_GRASS_LAND; - owner_colours[OWNER_WATER] = PC_WATER; - owner_colours[OWNER_DEITY] = PC_DARK_GREY; // industry - owner_colours[OWNER_END] = PC_BLACK; - uint32 *ubuf = (uint32 *)buf; uint num = (pitch * n); for (uint i = 0; i < num; i++) { @@ -1044,8 +1005,7 @@ static void MinimapScreenCallback(void *userdata, void *buf, uint y, uint pitch, uint col = (MapSizeX() - 1) - (i % pitch); TileIndex tile = TileXY(col, row); - Owner o = GetMinimapOwner(tile); - byte val = owner_colours[o]; + byte val = GetSmallMapOwnerPixels(tile, GetTileType(tile), IncludeHeightmap::Never) & 0xFF; uint32 colour_buf = 0; colour_buf = (_cur_palette.palette[val].b << 0); diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp index 4c28f2baa6..2989263201 100644 --- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -556,15 +556,18 @@ static inline uint32 GetSmallMapVegetationPixels(TileIndex tile, TileType t) /** * Return the colour a tile would be displayed with in the small map in mode "Owner". * - * @param tile The tile of which we would like to get the colour. - * @param t Effective tile type of the tile (see #SmallMapWindow::GetTileColours). + * @note If include_heightmap is IH_NEVER, the return value can safely be used as a palette colour (by masking it to a uint8) + * @param tile The tile of which we would like to get the colour. + * @param t Effective tile type of the tile (see #SmallMapWindow::GetTileColours). + * @param include_heightmap Whether to return the heightmap/contour colour of this tile (instead of the default land tile colour) * @return The colour of tile in the small map in mode "Owner" */ -static inline uint32 GetSmallMapOwnerPixels(TileIndex tile, TileType t) +inline uint32 GetSmallMapOwnerPixels(TileIndex tile, TileType t, IncludeHeightmap include_heightmap) { Owner o; switch (t) { + case MP_VOID: return MKCOLOUR_XXXX(PC_BLACK); case MP_INDUSTRY: return MKCOLOUR_XXXX(PC_DARK_GREY); case MP_HOUSE: return MKCOLOUR_XXXX(PC_DARK_RED); default: o = GetTileOwner(tile); break; @@ -577,7 +580,8 @@ static inline uint32 GetSmallMapOwnerPixels(TileIndex tile, TileType t) if ((o < MAX_COMPANIES && !_legend_land_owners[_company_to_list_pos[o]].show_on_map) || o == OWNER_NONE || o == OWNER_WATER) { if (t == MP_WATER) return MKCOLOUR_XXXX(PC_WATER); const SmallMapColourScheme *cs = &_heightmap_schemes[_settings_client.gui.smallmap_land_colour]; - return _smallmap_show_heightmap ? cs->height_colours[TileHeight(tile)] : cs->default_colour; + return ((include_heightmap == IncludeHeightmap::IfEnabled && _smallmap_show_heightmap) || include_heightmap == IncludeHeightmap::Always) + ? cs->height_colours[TileHeight(tile)] : cs->default_colour; } else if (o == OWNER_TOWN) { return MKCOLOUR_XXXX(PC_DARK_RED); } @@ -814,7 +818,7 @@ inline uint32 SmallMapWindow::GetTileColours(const TileArea &ta) const return GetSmallMapVegetationPixels(tile, et); case SMT_OWNER: - return GetSmallMapOwnerPixels(tile, et); + return GetSmallMapOwnerPixels(tile, et, IncludeHeightmap::IfEnabled); default: NOT_REACHED(); } diff --git a/src/smallmap_gui.h b/src/smallmap_gui.h index a5552333cd..d585ed7b8d 100644 --- a/src/smallmap_gui.h +++ b/src/smallmap_gui.h @@ -27,6 +27,15 @@ void ShowSmallMap(); void BuildLandLegend(); void BuildOwnerLegend(); +/** Enum for how to include the heightmap pixels/colours in small map related functions */ +enum class IncludeHeightmap { + Never, ///< Never include the heightmap + IfEnabled, ///< Only include the heightmap if its enabled in the gui by the player + Always ///< Always include the heightmap +}; + +uint32 GetSmallMapOwnerPixels(TileIndex tile, TileType t, IncludeHeightmap include_heightmap); + /** Structure for holding relevant data for legends in small map */ struct LegendAndColour { uint8 colour; ///< Colour of the item on the map. From e7a16f4514275f0feb42d40cc32390882455e7ad Mon Sep 17 00:00:00 2001 From: translators Date: Sat, 22 Oct 2022 18:58:11 +0000 Subject: [PATCH 07/17] Update: Translations from eints english (au): 3 changes by krysclarke vietnamese: 7 changes by KhoiCanDev catalan: 7 changes by J0anJosep --- src/lang/catalan.txt | 10 +++++++--- src/lang/english_AU.txt | 3 +++ src/lang/vietnamese.txt | 10 +++++++--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 80ee25aabc..041cbf70c8 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -379,7 +379,7 @@ STR_SCENEDIT_TOOLBAR_ROAD_CONSTRUCTION :{BLACK}Construc STR_SCENEDIT_TOOLBAR_TRAM_CONSTRUCTION :{BLACK}Construcció de vies de tramvia STR_SCENEDIT_TOOLBAR_PLANT_TREES :{BLACK}Planta arbres. Shift per sols mostrar el cost estimat. STR_SCENEDIT_TOOLBAR_PLACE_SIGN :{BLACK}Situa un senyal -STR_SCENEDIT_TOOLBAR_PLACE_OBJECT :{BLACK}Situa objecte. Shift per sols mostrar el cost estimat. +STR_SCENEDIT_TOOLBAR_PLACE_OBJECT :{BLACK}Crea un objecte. Amb Ctrl, es selecciona una àrea diagonal. Amb Maj, es commuta entre construir o mostrar el cost estimat. # Scenario editor file menu ###length 7 @@ -2619,6 +2619,9 @@ STR_LINKGRAPH_LEGEND_SATURATED :{G=Masculin}{TI STR_LINKGRAPH_LEGEND_OVERLOADED :{G=Masculin}{TINY_FONT}{BLACK}sobrecarregat # Linkgraph tooltip +STR_LINKGRAPH_STATS_TOOLTIP :{BLACK}{CARGO_LONG} a transportar cada mes de {STATION} a {STATION} ({COMMA}{NBSP}% de capacitat){STRING} +STR_LINKGRAPH_STATS_TOOLTIP_RETURN_EXTENSION :{}{CARGO_LONG} per a transportar de tornada ({COMMA}{NBSP}% de capacitat) +STR_LINKGRAPH_STATS_TOOLTIP_TIME_EXTENSION :{}Temps de viatge mitjà: {NUM}{NBSP}di{P a es} # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Marca l'àrea de cobertura @@ -2815,11 +2818,11 @@ STR_LANDSCAPING_TOOLBAR :{WHITE}Creació STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND :{BLACK}Rebaixa una cantonada del terreny. Arrossegant rebaixa la primera cantonada seleccionada i anivella l'àrea seleccionada a la nova alçada de la cantonada. Ctrl selecciona l'àrea diagonalment. Shift commuta construeix/mostra el cost estimat STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND :{BLACK}Eleva una cantonada del terreny. Arrossegant eleva la primera cantonada selecciona i anivella l'àrea a la nova alçada de la cantonada. Ctrl selecciona l'àrea diagonalment. Shift commuta construeix/mostra el cost estimat STR_LANDSCAPING_LEVEL_LAND_TOOLTIP :{BLACK}Anivella el terreny a l'alçada de la primera cantonada seleccionada. Ctrl selecciona l'àrea diagonalment. Shift commuta construeix/mostra el cost estimat -STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Compra un terreny per un ús posterior. Shift commuta construeix/mostra el cost estimat +STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Compra terreny per a fer-lo servir més endavant. Amb Ctrl, es selecciona una àrea diagonal. Maj commuta entre construir i mostrar el cost estimat. # Object construction window STR_OBJECT_BUILD_CAPTION :{WHITE}Selecció d'objecte -STR_OBJECT_BUILD_TOOLTIP :{BLACK}Selecciona l'objecte a construir. Shift commuta construeix/mostra el cost estimat +STR_OBJECT_BUILD_TOOLTIP :{BLACK}Seleccioneu l'objecte a construir. Amb Ctrl, es selecciona una àrea diagonal. Amb Maj, es commuta entre construir i mostrar el cost estimat. STR_OBJECT_BUILD_CLASS_TOOLTIP :{BLACK}Selecciona la classe d'objecte a construir STR_OBJECT_BUILD_PREVIEW_TOOLTIP :{BLACK}Previsualització de l'objecte STR_OBJECT_BUILD_SIZE :{BLACK}Mida: {GOLD}{NUM} x {NUM} cel·les @@ -4928,6 +4931,7 @@ STR_ERROR_OBJECT_IN_THE_WAY :{WHITE}Objecte STR_ERROR_COMPANY_HEADQUARTERS_IN :{WHITE}... seu de la companyia en el camí STR_ERROR_CAN_T_PURCHASE_THIS_LAND :{WHITE}No pots comprar aquesta àrea de terreny... STR_ERROR_YOU_ALREADY_OWN_IT :{WHITE}... ja és propietat teva! +STR_ERROR_BUILD_OBJECT_LIMIT_REACHED :{WHITE}... s'ha assolit el límit de construcció d'objectes. # Group related errors STR_ERROR_GROUP_CAN_T_CREATE :{WHITE}No es pot crear el grup... diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index 08abb07bd2..16fd3b4611 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -2618,6 +2618,9 @@ STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}overloaded # Linkgraph tooltip +STR_LINKGRAPH_STATS_TOOLTIP :{BLACK}{CARGO_LONG} to be transported per month from {STATION} to {STATION} ({COMMA}% of capacity){STRING} +STR_LINKGRAPH_STATS_TOOLTIP_RETURN_EXTENSION :{}{CARGO_LONG} to be transported back ({COMMA}% of capacity) +STR_LINKGRAPH_STATS_TOOLTIP_TIME_EXTENSION :{}Average travel time: {NUM}{NBSP}day{P "" s} # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Coverage area highlight diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index 4fba1bdc6a..979ec0d3a1 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -378,7 +378,7 @@ STR_SCENEDIT_TOOLBAR_ROAD_CONSTRUCTION :{BLACK}Xây d STR_SCENEDIT_TOOLBAR_TRAM_CONSTRUCTION :{BLACK}Xây dựng đường xe điện STR_SCENEDIT_TOOLBAR_PLANT_TREES :{BLACK}Trồng cây. Nhấn Shift để xem chi phí dự tính STR_SCENEDIT_TOOLBAR_PLACE_SIGN :{BLACK}Tạo bảng ký hiệu -STR_SCENEDIT_TOOLBAR_PLACE_OBJECT :{BLACK}Đặt đối tượng. Nhấn Shift để xem chi phí dự tính +STR_SCENEDIT_TOOLBAR_PLACE_OBJECT :{BLACK}Đặt đối tượng. Ctrl để chọn khu vực theo đường chéo. Shift để xem chi phí dự tính # Scenario editor file menu ###length 7 @@ -2618,6 +2618,9 @@ STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}quá tải # Linkgraph tooltip +STR_LINKGRAPH_STATS_TOOLTIP :{BLACK}{CARGO_LONG} sẽ được vận chuyển hằng tháng từ {STATION} đến {STATION} ({COMMA}% dung lượng){STRING} +STR_LINKGRAPH_STATS_TOOLTIP_RETURN_EXTENSION :{}{CARGO_LONG} sẽ được hoàn chuyển ({COMMA}% dung lượng) +STR_LINKGRAPH_STATS_TOOLTIP_TIME_EXTENSION :{}Thời gian đi lại trung bình: {NUM}{NBSP}ngày # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Hiện rõ vùng phủ ảnh hưởng @@ -2814,11 +2817,11 @@ STR_LANDSCAPING_TOOLBAR :{WHITE}Tôn h STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND :{BLACK}Hạ thấp một góc đất. Kéo để hạ đất từ điểm đã chọn tới điểm thấp mới. Ctrl để chọn đường chéo. Shift để hiện chi phí dự tính STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND :{BLACK}Nâng cao một góc đất. Kéo để nâng đất từ điểm đã chọn tới điểm cao mới. Ctrl để chọn đường chéo. Shift để hiện chi phí dự tính STR_LANDSCAPING_LEVEL_LAND_TOOLTIP :{BLACK}Làm bình địa tới độ cao của điểm chọn đầu tiên. Ctrl để chọn vùng theo đường chéo. Shift để hiện chi phí dự tính -STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Mua đất dành cho tương lai. Shift+Click để xem chi phí dự tính +STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Mua đất dành cho tương lai. Ctrl để chọn khu vực theo đường chéo. Shift để xem chi phí dự tính # Object construction window STR_OBJECT_BUILD_CAPTION :{WHITE}Trình Chọn Đối Tượng -STR_OBJECT_BUILD_TOOLTIP :{BLACK}Chọn đối tượng để xây. Shift+Click để xem chi phí dự tính +STR_OBJECT_BUILD_TOOLTIP :{BLACK}Chọn đối tượng để xây. Ctrl để chọn khu vực theo đường chéo. Shift để xem chi phí dự tính STR_OBJECT_BUILD_CLASS_TOOLTIP :{BLACK}Chọn lớp đối tượng để xây dựng STR_OBJECT_BUILD_PREVIEW_TOOLTIP :{BLACK}Xem trước đối tượng STR_OBJECT_BUILD_SIZE :{BLACK}Kích thước: {GOLD}{NUM} x {NUM} ô @@ -4927,6 +4930,7 @@ STR_ERROR_OBJECT_IN_THE_WAY :{WHITE}Có vậ STR_ERROR_COMPANY_HEADQUARTERS_IN :{WHITE}... trụ sở công ty nằm trên đường STR_ERROR_CAN_T_PURCHASE_THIS_LAND :{WHITE}Không thể mua được mảnh đất này... STR_ERROR_YOU_ALREADY_OWN_IT :{WHITE}... bạn đã có nó rồi! +STR_ERROR_BUILD_OBJECT_LIMIT_REACHED :{WHITE}... đã đến giới hạn xây của đối tượng # Group related errors STR_ERROR_GROUP_CAN_T_CREATE :{WHITE}Không thể tạo nhóm... From ef8322ba25bdef950dd659d12e2be3b60c68510f Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Sun, 9 Oct 2022 16:34:37 +0100 Subject: [PATCH 08/17] Change: Add panel widget to waypoint GUI. --- src/rail_gui.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index c67f007522..8089c939cb 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -2080,8 +2080,10 @@ static const NWidgetPart _nested_build_waypoint_widgets[] = { NWidget(WWT_DEFSIZEBOX, COLOUR_DARK_GREEN), EndContainer(), NWidget(NWID_HORIZONTAL), - NWidget(NWID_MATRIX, COLOUR_DARK_GREEN, WID_BRW_WAYPOINT_MATRIX), SetPIP(3, 2, 3), SetScrollbar(WID_BRW_SCROLL), - NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BRW_WAYPOINT), SetMinimalSize(66, 60), SetDataTip(0x0, STR_WAYPOINT_GRAPHICS_TOOLTIP), SetScrollbar(WID_BRW_SCROLL), EndContainer(), + NWidget(WWT_PANEL, COLOUR_DARK_GREEN), + NWidget(NWID_MATRIX, COLOUR_DARK_GREEN, WID_BRW_WAYPOINT_MATRIX), SetPIP(0, 2, 0), SetPadding(3), SetScrollbar(WID_BRW_SCROLL), + NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BRW_WAYPOINT), SetMinimalSize(66, 60), SetDataTip(0x0, STR_WAYPOINT_GRAPHICS_TOOLTIP), SetScrollbar(WID_BRW_SCROLL), EndContainer(), + EndContainer(), EndContainer(), NWidget(NWID_VERTICAL), NWidget(NWID_VSCROLLBAR, COLOUR_DARK_GREEN, WID_BRW_SCROLL), From 1e3e30c096da2eff205cfbb2e2b192396170e7b1 Mon Sep 17 00:00:00 2001 From: Tyler Trahan Date: Sun, 23 Oct 2022 06:01:36 -0600 Subject: [PATCH 09/17] Fix a394be2: Spell Maintenance correctly (#10097) --- src/lang/english.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/english.txt b/src/lang/english.txt index 52d1b850cc..5db6fc4a12 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -2630,7 +2630,7 @@ STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Don't hi STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Highlight coverage area of proposed site STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepts: {GOLD}{CARGO_LIST} STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Supplies: {GOLD}{CARGO_LIST} -STR_STATION_BUILD_INFRASTRUCTURE_COST :{BLACK}Maintainance cost: {GOLD}{CURRENCY_SHORT}/yr +STR_STATION_BUILD_INFRASTRUCTURE_COST :{BLACK}Maintenance cost: {GOLD}{CURRENCY_SHORT}/yr # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Join station From 3a11a2ed0e277dfe9d36184b58c1755ccef35053 Mon Sep 17 00:00:00 2001 From: Michael Lutz Date: Sun, 23 Oct 2022 13:08:15 +0200 Subject: [PATCH 10/17] Fix a9a21e78: Depots aren't really stations. --- src/depot_type.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/depot_type.h b/src/depot_type.h index d511b1b9e5..8c41857138 100644 --- a/src/depot_type.h +++ b/src/depot_type.h @@ -12,10 +12,10 @@ #include "station_type.h" -typedef StationID DepotID; ///< Type for the unique identifier of depots. +typedef uint16 DepotID; ///< Type for the unique identifier of depots. struct Depot; -static const DepotID INVALID_DEPOT = INVALID_STATION; +static const DepotID INVALID_DEPOT = (DepotID)INVALID_STATION; static const uint MAX_LENGTH_DEPOT_NAME_CHARS = 32; ///< The maximum length of a depot name in characters including '\0' From b04298f13199abf0656ebce4976f88b29b570b98 Mon Sep 17 00:00:00 2001 From: PeterN Date: Sun, 23 Oct 2022 14:21:10 +0100 Subject: [PATCH 11/17] Fix #9087: NewGRF invalidation calls ReInitAllWindows with wrong parameter. (#10102) --- src/settings_table.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings_table.cpp b/src/settings_table.cpp index d0b1fb95e3..9b401774e9 100644 --- a/src/settings_table.cpp +++ b/src/settings_table.cpp @@ -286,7 +286,7 @@ static void InvalidateNewGRFChangeWindows(int32 new_value) { InvalidateWindowClassesData(WC_SAVELOAD); CloseWindowByClass(WC_GAME_OPTIONS); - ReInitAllWindows(_gui_zoom_cfg); + ReInitAllWindows(false); } static void InvalidateCompanyLiveryWindow(int32 new_value) From 4052feef1f6b027e8b2e4e9cbf4cc4264bc6eb0c Mon Sep 17 00:00:00 2001 From: translators Date: Sun, 23 Oct 2022 18:58:18 +0000 Subject: [PATCH 12/17] Update: Translations from eints english (au): 1 change by krysclarke english (us): 1 change by 2TallTyler russian: 1 change by Ln-Wolf portuguese: 1 change by azulcosta polish: 3 changes by pAter-exe --- src/lang/english_AU.txt | 1 + src/lang/english_US.txt | 1 + src/lang/polish.txt | 3 +++ src/lang/portuguese.txt | 1 + src/lang/russian.txt | 1 + 5 files changed, 7 insertions(+) diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index 16fd3b4611..904fa45fc1 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -2630,6 +2630,7 @@ STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Don't hi STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Highlight coverage area of proposed site STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepts: {GOLD}{CARGO_LIST} STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Supplies: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_INFRASTRUCTURE_COST :{BLACK}Maintenance cost: {GOLD}{CURRENCY_SHORT}/yr # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Join station diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 5ec8d0c2a1..2d0e8ea5a3 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -2630,6 +2630,7 @@ STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Don't hi STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Highlight coverage area of proposed site STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepts: {GOLD}{CARGO_LIST} STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Supplies: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_INFRASTRUCTURE_COST :{BLACK}Maintainance cost: {GOLD}{CURRENCY_SHORT}/yr # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Join station diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 618126bd16..2890be2e74 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -2998,6 +2998,7 @@ STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}przeładowany # Linkgraph tooltip +STR_LINKGRAPH_STATS_TOOLTIP_TIME_EXTENSION :{}Średni czas podróży: {NUM}{NBSP}d{P zień ni ni} # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Podświetlaj zasięg @@ -3007,6 +3008,7 @@ STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Nie pod STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Podświetl zasięg projektowanej stacji STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Akceptuje: {GOLD}{CARGO_LIST} STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Zasoby: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_INFRASTRUCTURE_COST :{BLACK}Koszt utrzymania: {GOLD}{CURRENCY_SHORT}/rok # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Połącz stację @@ -5313,6 +5315,7 @@ STR_ERROR_OBJECT_IN_THE_WAY :{WHITE}Obiekt n STR_ERROR_COMPANY_HEADQUARTERS_IN :{WHITE}... siedziba firmy na drodze STR_ERROR_CAN_T_PURCHASE_THIS_LAND :{WHITE}Nie można nabyć tego terenu... STR_ERROR_YOU_ALREADY_OWN_IT :{WHITE}... to już jest twoje! +STR_ERROR_BUILD_OBJECT_LIMIT_REACHED :{WHITE}... osiągnięto limit budowy obiektów # Group related errors STR_ERROR_GROUP_CAN_T_CREATE :{WHITE}Nie można stworzyć grupy... diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 32e35638b3..0e02ac4219 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -2631,6 +2631,7 @@ STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Não exi STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Exibir área de cobertura do sítio proposto STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Aceita: {GOLD}{CARGO_LIST} STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Fornecimentos: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_INFRASTRUCTURE_COST :{BLACK}Custo de manutenção: {GOLD}{CURRENCY_SHORT}/ano # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Juntar estação diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 54d54d53d2..0038ae347d 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -2793,6 +2793,7 @@ STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Не п STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Показывать зону покрытия STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Принимается: {GOLD}{CARGO_LIST} STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Отправляется: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_INFRASTRUCTURE_COST :{BLACK}Стоимость обслуживания: {GOLD}{CURRENCY_SHORT}/г # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Объединить станции From 0afa6f2424036912d3652b2f23b4eb7d35626625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Guilloux?= Date: Mon, 24 Oct 2022 12:35:58 +0200 Subject: [PATCH 13/17] Codechange: [CMake] Auto-fill list of #include in script_window.hpp (#10103) --- cmake/scripts/GenerateWidget.cmake | 5 +++ src/script/api/script_window.hpp.in | 59 +---------------------------- 2 files changed, 6 insertions(+), 58 deletions(-) diff --git a/cmake/scripts/GenerateWidget.cmake b/cmake/scripts/GenerateWidget.cmake index f46a67e690..b6748422f5 100644 --- a/cmake/scripts/GenerateWidget.cmake +++ b/cmake/scripts/GenerateWidget.cmake @@ -13,6 +13,7 @@ cmake_minimum_required(VERSION 3.5) # The parameter "enumname" specifies the enumeration to extract. This can also be a regular expression. # The parameter "filename" specifies the relative path to the file, where the enumeration is extracted from. This can also be a glob expression. # +# All files where enumerations are extracted from are automatically added via #include # if(NOT GENERATE_SOURCE_FILE) @@ -41,6 +42,7 @@ foreach(ENUM IN LISTS ENUM_LINES) string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" FILE ${FILE}) string(APPEND ${PLACE_HOLDER} "\n${ADD_INDENT}/* automatically generated from ${FILE} */") + list(APPEND INCLUDES "#include \"${FILE}\"") foreach(LINE IN LISTS SOURCE_LINES) string(REPLACE "${RM_INDENT}" "" LINE "${LINE}") @@ -116,4 +118,7 @@ foreach(ENUM IN LISTS ENUM_LINES) endforeach() endforeach() + list(REMOVE_DUPLICATES INCLUDES) + string(REPLACE ";" "\n" INCLUDES "${INCLUDES}") + configure_file(${GENERATE_SOURCE_FILE} ${GENERATE_BINARY_FILE}) diff --git a/src/script/api/script_window.hpp.in b/src/script/api/script_window.hpp.in index a1dbb65670..c0f37d1070 100644 --- a/src/script/api/script_window.hpp.in +++ b/src/script/api/script_window.hpp.in @@ -11,65 +11,8 @@ #define SCRIPT_WINDOW_HPP #include "script_object.hpp" -#include "../../window_type.h" -#include "../../gfx_type.h" -#include "../../widgets/ai_widget.h" -#include "../../widgets/airport_widget.h" -#include "../../widgets/autoreplace_widget.h" -#include "../../widgets/bootstrap_widget.h" -#include "../../widgets/bridge_widget.h" -#include "../../widgets/build_vehicle_widget.h" -#include "../../widgets/cheat_widget.h" -#include "../../widgets/company_widget.h" -#include "../../widgets/console_widget.h" -#include "../../widgets/date_widget.h" -#include "../../widgets/depot_widget.h" -#include "../../widgets/dock_widget.h" -#include "../../widgets/dropdown_widget.h" -#include "../../widgets/engine_widget.h" -#include "../../widgets/error_widget.h" -#include "../../widgets/fios_widget.h" -#include "../../widgets/framerate_widget.h" -#include "../../widgets/genworld_widget.h" -#include "../../widgets/goal_widget.h" -#include "../../widgets/graph_widget.h" -#include "../../widgets/group_widget.h" -#include "../../widgets/highscore_widget.h" -#include "../../widgets/industry_widget.h" -#include "../../widgets/intro_widget.h" -#include "../../widgets/main_widget.h" -#include "../../widgets/misc_widget.h" -#include "../../widgets/music_widget.h" -#include "../../widgets/network_chat_widget.h" -#include "../../widgets/network_content_widget.h" -#include "../../widgets/network_widget.h" -#include "../../widgets/newgrf_debug_widget.h" -#include "../../widgets/newgrf_widget.h" -#include "../../widgets/news_widget.h" -#include "../../widgets/object_widget.h" -#include "../../widgets/order_widget.h" -#include "../../widgets/osk_widget.h" -#include "../../widgets/rail_widget.h" -#include "../../widgets/road_widget.h" -#include "../../widgets/screenshot_widget.h" -#include "../../widgets/settings_widget.h" -#include "../../widgets/sign_widget.h" -#include "../../widgets/smallmap_widget.h" -#include "../../widgets/station_widget.h" -#include "../../widgets/statusbar_widget.h" -#include "../../widgets/subsidy_widget.h" -#include "../../widgets/terraform_widget.h" -#include "../../widgets/timetable_widget.h" -#include "../../widgets/toolbar_widget.h" -#include "../../widgets/town_widget.h" -#include "../../widgets/transparency_widget.h" -#include "../../widgets/tree_widget.h" -#include "../../widgets/vehicle_widget.h" -#include "../../widgets/viewport_widget.h" -#include "../../widgets/waypoint_widget.h" -#include "../../widgets/link_graph_legend_widget.h" -#include "../../widgets/story_widget.h" +${INCLUDES} /** * Class that handles window interaction. A Window in OpenTTD has two imporant From 845174914de1f84e46f149c2ae282bf0be929b3c Mon Sep 17 00:00:00 2001 From: translators Date: Mon, 24 Oct 2022 19:08:45 +0000 Subject: [PATCH 14/17] Update: Translations from eints frisian: 8 changes by Bouke english (us): 1 change by 2TallTyler dutch: 7 changes by Bouke polish: 5 changes by pAter-exe --- src/lang/dutch.txt | 13 +++++++------ src/lang/english_US.txt | 2 +- src/lang/frisian.txt | 12 ++++++++---- src/lang/polish.txt | 8 +++++--- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 0bf7d2344f..580b067948 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -855,10 +855,10 @@ STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_GENERAL :{BIG_FONT}{BLAC STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_COAL :{BIG_FONT}{BLACK}Nieuwe kolenader gevonden bij {INDUSTRY}!{}Men verwacht productieverdubbeling! STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_OIL :{BIG_FONT}{BLACK}Nieuwe oliebronnen gevonden bij {INDUSTRY}!{}Men verwacht productieverdubbeling! STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_FARM :{BIG_FONT}{BLACK}Verbeterde landbouwmethoden bij {INDUSTRY} zorgen voor een verwachte productieverdubbeling! -STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_SMOOTH :{BIG_FONT}{BLACK}{STRING} productie van {INDUSTRY} stijgt met {COMMA}%! +STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_SMOOTH :{BIG_FONT}{BLACK}Productie van {STRING} door {INDUSTRY} stijgt met {COMMA}%! STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_GENERAL :{BIG_FONT}{BLACK}Productie van {INDUSTRY} verlaagd met 50% STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_FARM :{BIG_FONT}{BLACK}Insectenplaag zorgt voor ravage bij {INDUSTRY}!{}Productie gezakt met 50% -STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH :{BIG_FONT}{BLACK}{STRING} productie van {INDUSTRY} daalt met {COMMA}%! +STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH :{BIG_FONT}{BLACK}Productie van {STRING} door {INDUSTRY} daalt met {COMMA}%! ###length VEHICLE_TYPES STR_NEWS_TRAIN_IS_WAITING :{WHITE}{VEHICLE} wacht in remise @@ -1250,7 +1250,7 @@ STR_CONFIG_SETTING_CONSTRUCTION_COSTS :Bouwkosten: {ST STR_CONFIG_SETTING_CONSTRUCTION_COSTS_HELPTEXT :Het niveau van bouw- en aankoopkosten instellen STR_CONFIG_SETTING_RECESSIONS :Recessies: {STRING} -STR_CONFIG_SETTING_RECESSIONS_HELPTEXT :Wanneer dit is ingeschakeld, kunnen om de paar jaar recessies optreden. Tijdens een recessie is alle productie aanzienlijk lager (deze keert terug naar het vorige niveau als de recessie voorbij is). +STR_CONFIG_SETTING_RECESSIONS_HELPTEXT :Wanneer dit is ingeschakeld kunnen om de paar jaar recessies optreden. Tijdens een recessie is alle productie aanzienlijk lager (deze keert terug naar het vorige niveau als de recessie voorbij is). STR_CONFIG_SETTING_TRAIN_REVERSING :Niet toestaan dat treinen keren in stations: {STRING} STR_CONFIG_SETTING_TRAIN_REVERSING_HELPTEXT :Indien ingeschakeld zullen treinen niet omkeren in niet-eind stations, zelfs als er een kortere weg naar hun volgende bestemming is bij omkeren @@ -1275,7 +1275,7 @@ STR_CONFIG_SETTING_CATCHMENT :Meer realistisc STR_CONFIG_SETTING_CATCHMENT_HELPTEXT :Verzorgingsgebieden met verschillende groottes voor verschillende typen stations en luchthavens STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES :Stations van het bedrijf kunnen leveren aan industrieën met bijbehorend neutraal station: {STRING} -STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES_HELPTEXT :Wanneer dit is ingeschakeld, kunnen industrieën met bijbehorende stations (zoals olievelden) ook worden voorzien door stations van het bedrijf die in de buurt zijn gebouwd. Wanneer dit is uitgeschakeld, kunnen deze industrieën alleen worden voorzien door het bijbehorende station. Eventuele stations van het bedrijif in de buurt kunnen niet aan ze leveren; ook levert het bijbehorende station alleen aan de industrie zelf. +STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES_HELPTEXT :Wanneer dit is ingeschakeld kunnen industrieën met bijbehorende stations (zoals olievelden) ook worden voorzien door stations van het bedrijf die in de buurt zijn gebouwd. Wanneer dit is uitgeschakeld kunnen deze industrieën alleen worden voorzien door het bijbehorende station. Eventuele stations van het bedrijif in de buurt kunnen niet aan ze leveren; ook levert het bijbehorende station alleen aan de industrie zelf. STR_CONFIG_SETTING_EXTRADYNAMITE :Verwijderen van meer stedelijke wegen, bruggen en tunnels toestaan: {STRING} STR_CONFIG_SETTING_EXTRADYNAMITE_HELPTEXT :Maakt het gemakkelijker om door de stad beheerde infrastructuur en gebouwen te verwijderen. @@ -1853,13 +1853,13 @@ STR_CONFIG_SETTING_TOWN_LAYOUT_RANDOM :Willekeurig STR_CONFIG_SETTING_ALLOW_TOWN_ROADS :Steden mogen wegen bouwen: {STRING} STR_CONFIG_SETTING_ALLOW_TOWN_ROADS_HELPTEXT :Steden toestaan om wegen te bouwen ten behoeve van groei. Schakel deze optie uit als je niet wilt dat steden zelf wegen bouwen. STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS :Steden mogen gelijkvloerse kruisingen bouwen: {STRING} -STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS_HELPTEXT :Door deze optie in te schakelen, kunnen steden gelijkvloerse kruisingen bouwen. +STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS_HELPTEXT :Door deze optie in te schakelen kunnen steden gelijkvloerse kruisingen bouwen STR_CONFIG_SETTING_NOISE_LEVEL :Geluidsniveaucontrole door steden voor vliegvelden toestaan: {STRING} STR_CONFIG_SETTING_NOISE_LEVEL_HELPTEXT :Als je deze instelling uitschakelt, mogen er twee luchthavens per stad zijn. Als je deze instelling ingeschakelt, wordt het aantal luchthavens in een stad beperkt door de lawaaitolerantie van de stad; deze is afhankelijk van de bevolking en de grootte en afstand van de luchthaven. STR_CONFIG_SETTING_TOWN_FOUNDING :Steden stichten in spel: {STRING} -STR_CONFIG_SETTING_TOWN_FOUNDING_HELPTEXT :Wanneer deze instelling is ingeschakeld, kunnen spelers nieuwe steden stichten tijdens het spel. +STR_CONFIG_SETTING_TOWN_FOUNDING_HELPTEXT :Wanneer deze instelling is ingeschakeld kunnen spelers nieuwe steden stichten tijdens het spel ###length 3 STR_CONFIG_SETTING_TOWN_FOUNDING_FORBIDDEN :Verboden STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED :Toestaan @@ -2630,6 +2630,7 @@ STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Markeer STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Markeer het dekkingsgebied van de voorgestelde locatie STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepteert: {GOLD}{CARGO_LIST} STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Biedt aan: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_INFRASTRUCTURE_COST :{BLACK}Onderhoudskosten: {GOLD}{CURRENCY_SHORT}/jaar # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Station samenvoegen diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 2d0e8ea5a3..73c9629c33 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -2630,7 +2630,7 @@ STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Don't hi STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Highlight coverage area of proposed site STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepts: {GOLD}{CARGO_LIST} STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Supplies: {GOLD}{CARGO_LIST} -STR_STATION_BUILD_INFRASTRUCTURE_COST :{BLACK}Maintainance cost: {GOLD}{CURRENCY_SHORT}/yr +STR_STATION_BUILD_INFRASTRUCTURE_COST :{BLACK}Maintenance cost: {GOLD}{CURRENCY_SHORT}/yr # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Join station diff --git a/src/lang/frisian.txt b/src/lang/frisian.txt index 18eaf218d4..178c8a33a7 100644 --- a/src/lang/frisian.txt +++ b/src/lang/frisian.txt @@ -830,10 +830,10 @@ STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_GENERAL :{BIG_FONT}{BLAC STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_COAL :{BIG_FONT}{BLACK}Nije koalier fûn by {INDUSTRY}!{}Produksje wurdt ferwachte te ferdûbeljen! STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_OIL :{BIG_FONT}{BLACK}Nije oaljereserves fûn by {INDUSTRY}!{}Produksje wurdt ferwachte te ferdûbeljen! STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_FARM :{BIG_FONT}{BLACK}Troch ferbetterde metoades wurdt de produskje fan {INDUSTRY} ferwachte te ferdûbeljen! -STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_SMOOTH :{BIG_FONT}{BLACK}{STRING} Produksje by {INDUSTRY} giet omheech mei {COMMA}%! -STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_GENERAL :{BIG_FONT}{BLACK} Produksje fan {INDUSTRY} giet omleech mei 50% +STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_SMOOTH :{BIG_FONT}{BLACK}Produksje fan {STRING} troch {INDUSTRY} giet omheech mei {COMMA}%! +STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_GENERAL :{BIG_FONT}{BLACK}Produksje fan {INDUSTRY} giet omleech mei 50% STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_FARM :{BIG_FONT}{BLACK}Insektenpleach jout gaos by {INDUSTRY}!{}Produksje giet omleech mei 50% -STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH :{BIG_FONT}{BLACK}{STRING} produksje fan {INDUSTRY} wurdt tebekset mei {COMMA}%! +STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH :{BIG_FONT}{BLACK}Produksje fan {STRING} troch {INDUSTRY} wurdt tebekset mei {COMMA}%! ###length VEHICLE_TYPES STR_NEWS_TRAIN_IS_WAITING :{WHITE}{VEHICLE} stiet opsteld yn depot @@ -1103,7 +1103,7 @@ STR_TERRAIN_TYPE_ALPINIST :Alpinist ###length 4 STR_CITY_APPROVAL_TOLERANT :Tolerant STR_CITY_APPROVAL_HOSTILE :Fijannich -STR_CITY_APPROVAL_PERMISSIVE :Tajouwend +STR_CITY_APPROVAL_PERMISSIVE :Tajouwend (gjin effekt op bedriuwsaktiviteit) STR_WARNING_NO_SUITABLE_AI :{WHITE}Gjin brûkbere AIs beskikber...{}jo kinne ferskillende AIs downloade fia it 'Online Content' systeem @@ -1182,6 +1182,7 @@ STR_CONFIG_SETTING_VEHICLE_BREAKDOWNS_HELPTEXT :Behearskje hoe STR_CONFIG_SETTING_SUBSIDY_MULTIPLIER :Subsydzjefermannichfâldiger: {STRING} STR_CONFIG_SETTING_SUBSIDY_MULTIPLIER_HELPTEXT :Stel yn hoefolle der betelle wurdt foar subsidiearre ferbinings +STR_CONFIG_SETTING_SUBSIDY_DURATION_HELPTEXT :Stel it oantal jierren yn wêrfoar subsydzje takend wurdt STR_CONFIG_SETTING_SUBSIDY_DURATION_VALUE :{NUM} jier ###setting-zero-is-special @@ -1691,6 +1692,7 @@ STR_CONFIG_SETTING_STARTING_YEAR :Begjin jier: {S STR_CONFIG_SETTING_ALLOW_SHARES :Stea it keapjen fan oandielen ta: {STRING} +STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES :Minimale leeftiid fan it bedriuw om oandielen te hanneljen: {STRING} STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY :By slepe, pleats seinen eltse: {STRING} @@ -1716,6 +1718,7 @@ STR_CONFIG_SETTING_TOWN_LAYOUT_RANDOM :Soksawat STR_CONFIG_SETTING_ALLOW_TOWN_ROADS :Doarpen en stêden meie dyken boue: {STRING} STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS :Stêden meie spoaroergongen boue: {STRING} +STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS_HELPTEXT :Troch dizze opsje yn te skeakeljen kinne stêden oergongen krúspunten op gelikense hichte bouwe STR_CONFIG_SETTING_NOISE_LEVEL :Wetten oer maximale lûdesdruk foar fleanfjilden: {STRING} @@ -2176,6 +2179,7 @@ STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED :ûnjildich of STR_NETWORK_ERROR_CLIENT_WRONG_REVISION :ferkearde revyzje STR_NETWORK_ERROR_CLIENT_NAME_IN_USE :namme is al beset STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD :ferkeard wachtwurd +STR_NETWORK_ERROR_CLIENT_KICKED :fuortstjoerd troch server STR_NETWORK_ERROR_CLIENT_CHEATER :besocht falsk te spieljen STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS :joech tevolle opdrachten STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP :kaart delheljen duorret te lang diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 2890be2e74..8ef4fbbe61 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -757,7 +757,7 @@ STR_SCENEDIT_TOOLBAR_ROAD_CONSTRUCTION :{BLACK}Konstruk STR_SCENEDIT_TOOLBAR_TRAM_CONSTRUCTION :{BLACK}Konstrukcja torów tramwajowych STR_SCENEDIT_TOOLBAR_PLANT_TREES :{BLACK}Posadź drzewa. Shift przełącza pomiędzy trybem sadzenia a szacowaniem jego kosztów STR_SCENEDIT_TOOLBAR_PLACE_SIGN :{BLACK}Umieść napis -STR_SCENEDIT_TOOLBAR_PLACE_OBJECT :{BLACK}Umieść obiekt. Shift przełącza pomiędzy trybem budowania a szacowaniem jego kosztów +STR_SCENEDIT_TOOLBAR_PLACE_OBJECT :{BLACK}Umieść obiekt. Ctrl zaznacza obszar po przekątnej. Shift przełącza pomiędzy trybem budowania a szacowaniem jego kosztów # Scenario editor file menu ###length 7 @@ -2998,6 +2998,8 @@ STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}przeładowany # Linkgraph tooltip +STR_LINKGRAPH_STATS_TOOLTIP :{BLACK}{CARGO_LONG} miesięcznie do przetransportowania z {STATION} do {STATION} ({COMMA}% przepustowości){STRING} +STR_LINKGRAPH_STATS_TOOLTIP_RETURN_EXTENSION :{}{CARGO_LONG} do przetransportowania z powrotem ({COMMA}% przepustowości) STR_LINKGRAPH_STATS_TOOLTIP_TIME_EXTENSION :{}Średni czas podróży: {NUM}{NBSP}d{P zień ni ni} # Base for station construction window(s) @@ -3196,11 +3198,11 @@ STR_LANDSCAPING_TOOLBAR :{WHITE}Krajobra STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND :{BLACK}Obniżenie narożnika terenu. Przeciągnięcie obniża pierwszy zaznaczony róg i wyrównuje zaznaczony obszar do nowej wysokości rogu. Ctrl zaznacza obszar po przekątnej. Shift przełącza pomiędzy trybem budowania a szacowaniem jego kosztów STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND :{BLACK}Podwyższenie narożnika terenu. Przeciągnięcie podnosi pierwszy zaznaczony róg i wyrównuje zaznaczony obszar do nowej wysokości rogu. Ctrl zaznacza obszar po przekątnej. Shift przełącza pomiędzy trybem budowania a szacowaniem jego kosztów STR_LANDSCAPING_LEVEL_LAND_TOOLTIP :{BLACK}Wyrównaj teren do wysykości pierwszego zaznaczonego rogu. Ctrl zaznacza teren po przekątnej. Shift przełącza pomiędzy trybem budowania a szacowaniem jego kosztów -STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Zakup teren do przyszłego użycia. Shift przełącza pomiędzy trybem kupowania a szacowaniem jego kosztów +STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Zakup teren do przyszłego użycia. Ctrl zaznacza obszar po przekątnej. Shift przełącza pomiędzy trybem kupowania a szacowaniem jego kosztów # Object construction window STR_OBJECT_BUILD_CAPTION :{WHITE}Wybór obiektu -STR_OBJECT_BUILD_TOOLTIP :{BLACK}Wybierz obiekt do budowy. Shift przełącza pomiędzy trybem budowy a szacowaniem jej kosztów +STR_OBJECT_BUILD_TOOLTIP :{BLACK}Wybierz obiekt do budowy. Ctrl zaznacza obszar po przekątnej. Shift przełącza pomiędzy trybem budowy a szacowaniem jej kosztów STR_OBJECT_BUILD_CLASS_TOOLTIP :{BLACK}Wybierz rodzaj obiektu do budowy STR_OBJECT_BUILD_PREVIEW_TOOLTIP :{BLACK}Podgląd obiektu STR_OBJECT_BUILD_SIZE :{BLACK}Rozmiar: {GOLD}{NUM} x {NUM} pól From dd44f2139e01509c5916fc3c9c9611cf33010849 Mon Sep 17 00:00:00 2001 From: Artin Alavi <1361714+Arastais@users.noreply.github.com> Date: Mon, 24 Oct 2022 19:41:27 -0700 Subject: [PATCH 15/17] Fix c536bde: Remove problematic inline specifier (#10109) --- src/smallmap_gui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp index 2989263201..e0045efb0a 100644 --- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -562,7 +562,7 @@ static inline uint32 GetSmallMapVegetationPixels(TileIndex tile, TileType t) * @param include_heightmap Whether to return the heightmap/contour colour of this tile (instead of the default land tile colour) * @return The colour of tile in the small map in mode "Owner" */ -inline uint32 GetSmallMapOwnerPixels(TileIndex tile, TileType t, IncludeHeightmap include_heightmap) +uint32 GetSmallMapOwnerPixels(TileIndex tile, TileType t, IncludeHeightmap include_heightmap) { Owner o; From bfa155eb065cbedf38a2ec0ae1fe956322567e81 Mon Sep 17 00:00:00 2001 From: translators Date: Tue, 25 Oct 2022 19:25:45 +0000 Subject: [PATCH 16/17] Update: Translations from eints frisian: 91 changes by Bouke dutch: 3 changes by Bouke french: 9 changes by glx22 --- src/lang/dutch.txt | 6 +- src/lang/french.txt | 14 +++-- src/lang/frisian.txt | 135 +++++++++++++++++++++++++++++-------------- 3 files changed, 103 insertions(+), 52 deletions(-) diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 580b067948..917391e880 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -3082,7 +3082,7 @@ STR_FRAMERATE_GL_SHIPS :{BLACK} Scheeps STR_FRAMERATE_GL_AIRCRAFT :{BLACK} Vliegtuigtikken: STR_FRAMERATE_GL_LANDSCAPE :{BLACK} Wereldtikken: STR_FRAMERATE_GL_LINKGRAPH :{BLACK} Vertraging koppelinggrafiek: -STR_FRAMERATE_DRAWING :{WHITE}Grafische weergave: +STR_FRAMERATE_DRAWING :{BLACK}Grafische weergave: STR_FRAMERATE_DRAWING_VIEWPORTS :{BLACK} Wereldkijkvensters: STR_FRAMERATE_VIDEO :{BLACK}Video-uitvoer: STR_FRAMERATE_SOUND :{BLACK}Geluid mengen: @@ -4201,7 +4201,7 @@ STR_VEHICLE_INFO_MAX_SPEED :{BLACK}Max.snel STR_VEHICLE_INFO_MAX_SPEED_TYPE :{BLACK}Max.snelheid: {LTBLUE}{VELOCITY} {BLACK}Vliegtuigtype: {LTBLUE}{STRING} STR_VEHICLE_INFO_MAX_SPEED_TYPE_RANGE :{BLACK}Max.snelheid: {LTBLUE}{VELOCITY} {BLACK}Vliegtuigtype: {LTBLUE}{STRING} {BLACK}Bereik: {LTBLUE}{COMMA} tegels STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Gewicht: {LTBLUE}{WEIGHT_SHORT} {BLACK}Vermogen: {LTBLUE}{POWER}{BLACK} Max.snelheid: {LTBLUE}{VELOCITY} -STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Gewicht: {LTBLUE}{WEIGHT_SHORT} {BLACK}Vermogen: {LTBLUE}{POWER}{BLACK} Max.snelheid: {LTBLUE}{VELOCITY} {BLACK}Max. tr.kr..: {LTBLUE}{FORCE} +STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Gewicht: {LTBLUE}{WEIGHT_SHORT} {BLACK}Vermogen: {LTBLUE}{POWER}{BLACK} Max.snelheid: {LTBLUE}{VELOCITY} {BLACK}Max. tr.kr.: {LTBLUE}{FORCE} STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR :{BLACK}Winst dit jaar: {LTBLUE}{CURRENCY_LONG} (vorig jaar: {CURRENCY_LONG}) STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS :{BLACK}Betrouwbaarheid: {LTBLUE}{COMMA}% {BLACK}Aantal keren motorpech sinds laatste onderhoud: {LTBLUE}{COMMA} @@ -4257,7 +4257,7 @@ STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY :{BLACK}Capacite STR_REFIT_CAPTION :{WHITE}{VEHICLE} (Ombouwen) STR_REFIT_TITLE :{GOLD}Vrachttype selecteren: STR_REFIT_NEW_CAPACITY_COST_OF_REFIT :{BLACK}Nieuwe capaciteit: {GOLD}{CARGO_LONG}{}{BLACK}Ombouwkosten: {RED}{CURRENCY_LONG} -STR_REFIT_NEW_CAPACITY_INCOME_FROM_REFIT :{BLACK}Nieuwe capaciteit: {GOLD}{CARGO_LONG}{}{BLACK}Inkomsten na ombouwen: {GREEN}{CURRENCY_LONG} +STR_REFIT_NEW_CAPACITY_INCOME_FROM_REFIT :{BLACK}Nieuwe capaciteit: {GOLD}{CARGO_LONG}{}{BLACK}Inkomsten van ombouwen: {GREEN}{CURRENCY_LONG} STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT :{BLACK}Nieuwe capaciteit: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Ombouwkosten: {RED}{CURRENCY_LONG} STR_REFIT_NEW_CAPACITY_INCOME_FROM_AIRCRAFT_REFIT :{BLACK}Nieuwe capaciteit: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Inkomsten na ombouwen: {GREEN}{CURRENCY_LONG} STR_REFIT_SELECT_VEHICLES_TOOLTIP :{BLACK}Selecteer het voertuig dat je wilt ombouwen. Sleep met de muis om meerdere voertuigen te selecteren. Klik op een lege ruimte om het hele voertuig te selecteren. Met Ctrl+klik selecteer je een voertuig en de volgende keten diff --git a/src/lang/french.txt b/src/lang/french.txt index 2742b5c4cd..ede1a339a3 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -227,8 +227,8 @@ STR_UNITS_HEIGHT_SI :{COMMA}{NBSP}m # Common window strings STR_LIST_FILTER_TITLE :{BLACK}Filtre{NBSP}: -STR_LIST_FILTER_OSKTITLE :{BLACK}Entrer le filtre -STR_LIST_FILTER_TOOLTIP :{BLACK}Entrer un mot-clé pour filtrer la liste +STR_LIST_FILTER_OSKTITLE :{BLACK}Entrer un ou plusieurs mot-clés pour filtrer la liste +STR_LIST_FILTER_TOOLTIP :{BLACK}Entrer un ou plusieurs mot-clés pour filtrer la liste STR_TOOLTIP_GROUP_ORDER :{BLACK}Ordre de regroupement STR_TOOLTIP_SORT_ORDER :{BLACK}Choisir l'ordre de tri (croissant/décroissant) @@ -379,7 +379,7 @@ STR_SCENEDIT_TOOLBAR_ROAD_CONSTRUCTION :{BLACK}Construc STR_SCENEDIT_TOOLBAR_TRAM_CONSTRUCTION :{BLACK}Construction de tramway STR_SCENEDIT_TOOLBAR_PLANT_TREES :{BLACK}Planter des arbres.{}Shift pour afficher seulement le coût estimé. STR_SCENEDIT_TOOLBAR_PLACE_SIGN :{BLACK}Placer un panneau -STR_SCENEDIT_TOOLBAR_PLACE_OBJECT :{BLACK}Placer un objet.{}Shift pour afficher seulement le coût estimé. +STR_SCENEDIT_TOOLBAR_PLACE_OBJECT :{BLACK}Placer un objet.{}Ctrl pour sélectionner en diagonale.{}Shift pour afficher seulement le coût estimé. # Scenario editor file menu ###length 7 @@ -2619,6 +2619,7 @@ STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}surchargé # Linkgraph tooltip +STR_LINKGRAPH_STATS_TOOLTIP_TIME_EXTENSION :{}Temps de trajet moyen{NBSP}: {NUM}{NBSP}jour{P "" s} # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Afficher la zone couverte @@ -2628,6 +2629,7 @@ STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Ne pas a STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Afficher la zone couverte STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Accepte{NBSP}: {GOLD}{CARGO_LIST} STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Fournit{NBSP}: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_INFRASTRUCTURE_COST :{BLACK}Coût d'entretien{NBSP}: {GOLD}{CURRENCY_SHORT}/an # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Joindre une station @@ -2815,11 +2817,11 @@ STR_LANDSCAPING_TOOLBAR :{WHITE}Manipula STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND :{BLACK}Abaisser le terrain.{}Glisser abaisse le premier coin sélectionné et nivelle la zone sélectionnée à cette nouvelle hauteur.{}Ctrl pour sélectionner en diagonale.{}Shift pour afficher seulement le coût estimé. STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND :{BLACK}Élever le terrain.{}Glisser élève le premier coin sélectionné et nivelle la zone sélectionnée à cette nouvelle hauteur.{}Ctrl pour sélectionner en diagonale.{}Shift pour afficher seulement le coût estimé. STR_LANDSCAPING_LEVEL_LAND_TOOLTIP :{BLACK}Niveler le terrain à la hauteur du premier coin sélectionné.{}Ctrl pour sélectionner en diagonale.{}Shift pour afficher seulement le coût estimé. -STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Acheter le terrain pour une utilisation ultérieure.{}Shift pour afficher seulement le coût estimé. +STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Acheter le terrain pour une utilisation ultérieure.{}Ctrl pour sélectionner en diagonale.{}Shift pour afficher seulement le coût estimé. # Object construction window STR_OBJECT_BUILD_CAPTION :{WHITE}Sélection de l'objet -STR_OBJECT_BUILD_TOOLTIP :{BLACK}Sélectionner l'objet à construire.{}Shift pour afficher seulement le coût estimé. +STR_OBJECT_BUILD_TOOLTIP :{BLACK}Sélectionner l'objet à construire.{}Ctrl pour sélectionner en diagonale.{}Shift pour afficher seulement le coût estimé. STR_OBJECT_BUILD_CLASS_TOOLTIP :{BLACK}Choisir le type d'objet à construire STR_OBJECT_BUILD_PREVIEW_TOOLTIP :{BLACK}Aperçu de l'objet STR_OBJECT_BUILD_SIZE :{BLACK}Taille{NBSP}: {GOLD}{NUM}{NBSP}×{NBSP}{NUM} cases @@ -3644,6 +3646,7 @@ STR_FINANCES_SECTION_LOAN_INTEREST :{GOLD}Intérêt STR_FINANCES_SECTION_OTHER :{GOLD}Autres STR_FINANCES_NEGATIVE_INCOME :-{CURRENCY_LONG} +STR_FINANCES_ZERO_INCOME :{CURRENCY_LONG} STR_FINANCES_POSITIVE_INCOME :+{CURRENCY_LONG} STR_FINANCES_NET_PROFIT :{WHITE}Bénéfice net STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Solde bancaire @@ -4927,6 +4930,7 @@ STR_ERROR_OBJECT_IN_THE_WAY :{WHITE}Objet pr STR_ERROR_COMPANY_HEADQUARTERS_IN :{WHITE}... siège de la compagnie présent STR_ERROR_CAN_T_PURCHASE_THIS_LAND :{WHITE}Impossible d'acheter ce terrain... STR_ERROR_YOU_ALREADY_OWN_IT :{WHITE}... il vous appartient déjà{NBSP}! +STR_ERROR_BUILD_OBJECT_LIMIT_REACHED :{WHITE}...{NBSP}limite de construction d'objets atteinte # Group related errors STR_ERROR_GROUP_CAN_T_CREATE :{WHITE}Impossible de créer le groupe... diff --git a/src/lang/frisian.txt b/src/lang/frisian.txt index 178c8a33a7..dc0aed575c 100644 --- a/src/lang/frisian.txt +++ b/src/lang/frisian.txt @@ -478,7 +478,7 @@ STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Skeakel console oan/ût STR_ABOUT_MENU_AI_DEBUG :AI/Gamescript debug STR_ABOUT_MENU_SCREENSHOT :Skermôfbylding -STR_ABOUT_MENU_SHOW_FRAMERATE :Byldsnelhyd sjen litte +STR_ABOUT_MENU_SHOW_FRAMERATE :Toan byldsnelheid STR_ABOUT_MENU_ABOUT_OPENTTD :Oer 'OpenTTD' STR_ABOUT_MENU_SPRITE_ALIGNER :Flakken rjochtsje STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Skeakel seleksjekaders oan/út @@ -737,6 +737,7 @@ STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLA STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}Rûch Lân STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}Gerslân STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}Skraal Lân +STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}Reinwâld STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}Fjilden STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}Beammen STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}Stiennen @@ -769,8 +770,9 @@ STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS :{BLACK}Lit lêt STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - - STR_STATUSBAR_PAUSED :{YELLOW}* * SKOFTE* * STR_STATUSBAR_AUTOSAVE :{RED}Automatysk bewarje -STR_STATUSBAR_SAVING_GAME :{RED}* * SLAAT SPUL OP * * +STR_STATUSBAR_SAVING_GAME :{RED}* * SPUL AN IT BEWARJEN * * +STR_STATUSBAR_SPECTATOR :{WHITE}(taskôger) # News message history STR_MESSAGE_HISTORY :{WHITE}Berjochtenskiednis @@ -852,7 +854,7 @@ STR_NEWS_PLANE_USES_TOO_SHORT_RUNWAY :{WHITE}{VEHICLE STR_NEWS_VEHICLE_IS_GETTING_OLD :{WHITE}{VEHICLE} begjint âld te wurden STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD :{WHITE}{VEHICLE} begjint tige âld te wurden STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND :{WHITE}{VEHICLE} begjint tige âld te wurden en is nedich oan ferfanging ta -STR_NEWS_TRAIN_IS_STUCK :{WHITE}{VEHICLE} kin gjin paad finne om fierder te gean +STR_NEWS_TRAIN_IS_STUCK :{WHITE}{VEHICLE} kin gjin paad fine om fierder te gean STR_NEWS_VEHICLE_IS_LOST :{WHITE}{VEHICLE} is it paad kwyt. STR_NEWS_VEHICLE_IS_UNPROFITABLE :{WHITE}{VEHICLE} hie ôfrûne jier in winst fan {CURRENCY_LONG} STR_NEWS_AIRCRAFT_DEST_TOO_FAR :{WHITE}{VEHICLE} kin net op de folgjende bestimming komme, dizze leit bûten de aksjeradius @@ -926,7 +928,13 @@ STR_GAME_OPTIONS_CURRENCY_CUSTOM :Oanpasse... STR_GAME_OPTIONS_CURRENCY_GEL :Georgyske Lari (GEL) STR_GAME_OPTIONS_CURRENCY_IRR :Iraanske Rial (IRR) STR_GAME_OPTIONS_CURRENCY_RUB :Neie Russyske Rubels (RUB) +STR_GAME_OPTIONS_CURRENCY_MXN :Meksikaanse Peso (MXN) +STR_GAME_OPTIONS_CURRENCY_NTD :Neie Taiwanesyske Dollar (NTD) +STR_GAME_OPTIONS_CURRENCY_CNY :Sineeske Renminbi (CNY) +STR_GAME_OPTIONS_CURRENCY_HKD :Hongkongske Dollar (HKD) STR_GAME_OPTIONS_CURRENCY_INR :Yndyske rupee (INR) +STR_GAME_OPTIONS_CURRENCY_IDR :Yndonezyske Roepia (IDR) +STR_GAME_OPTIONS_CURRENCY_MYR :Maleizyske Ringgit (MYR) ###length 2 STR_GAME_OPTIONS_ROAD_VEHICLES_DROPDOWN_LEFT :Lofts ride @@ -978,6 +986,7 @@ STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP :{BLACK}Finkje d STR_GAME_OPTIONS_RESOLUTION :{BLACK}Skermresolúsje STR_GAME_OPTIONS_RESOLUTION_TOOLTIP :{BLACK}Selektearje de skermresolutje om te brûken STR_GAME_OPTIONS_RESOLUTION_OTHER :oars +STR_GAME_OPTIONS_RESOLUTION_ITEM :{NUM}x{NUM} @@ -1101,6 +1110,7 @@ STR_TERRAIN_TYPE_MOUNTAINOUS :Bergich STR_TERRAIN_TYPE_ALPINIST :Alpinist ###length 4 +STR_CITY_APPROVAL_LENIENT :Meigeand STR_CITY_APPROVAL_TOLERANT :Tolerant STR_CITY_APPROVAL_HOSTILE :Fijannich STR_CITY_APPROVAL_PERMISSIVE :Tajouwend (gjin effekt op bedriuwsaktiviteit) @@ -1115,11 +1125,11 @@ STR_CONFIG_SETTING_COLLAPSE_ALL :{BLACK}Alles yn STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT :(gjin útlis beskikber) STR_CONFIG_SETTING_DEFAULT_VALUE :{LTBLUE}Standerdwaarde: {ORANGE}{STRING} STR_CONFIG_SETTING_TYPE :{LTBLUE}Ynstellingstype: {ORANGE}{STRING} -STR_CONFIG_SETTING_TYPE_CLIENT :Kliïntynstellings (wurdt net per spul opslein; hat ynvloed op alle spullen) -STR_CONFIG_SETTING_TYPE_GAME_MENU :Spulynstellings (wurdt per spul opslein; hat allinich effekt op nije spullen) -STR_CONFIG_SETTING_TYPE_GAME_INGAME :Spulynstellings (wurdt per spul opslein; hat allinich effekt op it hjoeddeiske spul) -STR_CONFIG_SETTING_TYPE_COMPANY_MENU :Bedriuwynstellings (wurdt per spul opslein; hat allinich effekt op nije spullen) -STR_CONFIG_SETTING_TYPE_COMPANY_INGAME :Bedriuwynstellings (wurdt per spul opslein; hat allinich effekt op it hjoeddeiske bedriuw) +STR_CONFIG_SETTING_TYPE_CLIENT :Kliïntynstellings (wurdt net per spul bewarre; hat ynfloed op alle spullen) +STR_CONFIG_SETTING_TYPE_GAME_MENU :Spulynstellings (wurdt per spul bewarre; hat allinich effekt op nije spullen) +STR_CONFIG_SETTING_TYPE_GAME_INGAME :Spulynstellings (wurdt per spul bewarre; hat allinich effekt op it hjoeddeiske spul) +STR_CONFIG_SETTING_TYPE_COMPANY_MENU :Bedriuwynstellings (wurdt per spul bewarre; hat allinich effekt op nije spullen) +STR_CONFIG_SETTING_TYPE_COMPANY_INGAME :Bedriuwynstellings (wurdt per spul bewarre; hat allinich effekt op it hjoeddeiske bedriuw) STR_CONFIG_SETTING_RESTRICT_CATEGORY :{BLACK}Kategory: STR_CONFIG_SETTING_RESTRICT_TYPE :{BLACK}Type: @@ -1132,11 +1142,11 @@ STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW :Ynstellings dy' STR_CONFIG_SETTING_TYPE_DROPDOWN_HELPTEXT :{BLACK}Behein de ûndersteande list ta bepaalde ynstellingtypes STR_CONFIG_SETTING_TYPE_DROPDOWN_ALL :Alle ynstellingtypes -STR_CONFIG_SETTING_TYPE_DROPDOWN_CLIENT :Kliïntynstellings (wurdt net per spul opslein; hat ynvloed op alle spullen) -STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_MENU :Spulynstellings (wurdt per spul opslein; hat allinich effekt op nije spullen) -STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_INGAME :Spulynstellings (wurdt per spul opslein; hat allinich effekt op it hjoeddeiske spul) -STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_MENU :Bedriuwynstellings (wurdt per spul opslein; hat allinich effekt op nije spullen) -STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME :Bedriuwynstellings (wurdt per spul opslein; hat allinich effekt op it hjoeddeiske bedriuw) +STR_CONFIG_SETTING_TYPE_DROPDOWN_CLIENT :Kliïntynstellings (wurdt net per spul bewarre; hat ynfloed op alle spullen) +STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_MENU :Spulynstellings (wurdt per spul bewarre; hat allinich effekt op nije spullen) +STR_CONFIG_SETTING_TYPE_DROPDOWN_GAME_INGAME :Spulynstellings (wurdt per spul bewarre; hat allinich effekt op it hjoeddeiske spul) +STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_MENU :Bedriuwynstellings (wurdt per spul bewarre; hat allinich effekt op nije spullen) +STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME :Bedriuwynstellings (wurdt per spul bewarre; hat allinich effekt op it hjoeddeiske bedriuw) STR_CONFIG_SETTINGS_NONE :{WHITE}- Gjin - ###length 3 @@ -1168,7 +1178,7 @@ STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN :Maksimale start STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_HELPTEXT :Maksimale bedrach hokker troch in bedriuw lient wurde kin (sûnder acht te slaan op de ynflaasje) STR_CONFIG_SETTING_INTEREST_RATE :Rinte: {STRING} -STR_CONFIG_SETTING_INTEREST_RATE_HELPTEXT :Rinte op lienings; behearsket ek ynflaasje at dizze oan stiet +STR_CONFIG_SETTING_INTEREST_RATE_HELPTEXT :Rinte op liening; behearsket ek ynflaasje at dizze oan stiet STR_CONFIG_SETTING_RUNNING_COSTS :Eksploitaasjekosten: {STRING} STR_CONFIG_SETTING_RUNNING_COSTS_HELPTEXT :Stel hichte ûnderhâlds- en ekploitaasjekosten fan fiertugen en ynfrastruktuer yn @@ -1276,10 +1286,10 @@ STR_CONFIG_SETTING_SHOWFINANCES :Finansjeel oers STR_CONFIG_SETTING_SHOWFINANCES_HELPTEXT :By ynskeakeljen wurdt der elts jier in finansjeel jierferlslach sjen litten, dit makket it makliker in oersjoch fan de finansjele steat fan it bedriuw te krijen STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT :Nije oarder binne standert 'non-stop': {STRING} -STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT_HELPTEXT :Normaalsprutsen sil in fiertúch op alle stasjons dy't hy tsjinkomt stopje. Troch dizze opsje yn te skeakeljen sille nije oarders standerd op non-stop set wurden. Dit hat dus gjin ynvloed op besteande oarders! +STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT_HELPTEXT :Normaalsprutsen sil in fiertúch op alle stasjons dy't hy tsjinkomt stopje. Troch dizze opsje yn te skeakeljen sille nije oarders standerd op non-stop set wurden. Dit hat dus gjin ynfloed op besteande oarders! STR_CONFIG_SETTING_STOP_LOCATION :Nije treinoarders stopje de trein standert {STRING} fan it perron -STR_CONFIG_SETTING_STOP_LOCATION_HELPTEXT :Plak wêr't treinen stopje by it binnenriden fan in stasjon. Dit hat allinnich ynvloed op nije oarders en kin altyd yndividueel ynstelt wurde +STR_CONFIG_SETTING_STOP_LOCATION_HELPTEXT :Plak wêr't treinen stopje by it binnenriden fan in stasjon. Dit hat allinnich ynfloed op nije oarders en kin altyd yndividueel ynstelt wurde ###length 3 STR_CONFIG_SETTING_STOP_LOCATION_NEAR_END :oan it ein STR_CONFIG_SETTING_STOP_LOCATION_MIDDLE :yn it midden @@ -1450,6 +1460,7 @@ STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN :Donker grien STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET :Fiolet ###length 4 +STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED :Griis nei read ###length 4 @@ -1500,8 +1511,8 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF :Ut STR_CONFIG_SETTING_AUTOSAVE :Automatysk bewarje: {STRING} STR_CONFIG_SETTING_AUTOSAVE_HELPTEXT :Selektearje de tiid tusken automatysk bewarje fan it spul -STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES :Brûk it {STRING} datumformaat yn de nammen fan opsleine splullen -STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_HELPTEXT :Datumformaat foar de bestânsnammen fan opsleine spullen +STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES :Brûk it {STRING} datumformaat yn de nammen fan bewarre spullen +STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_HELPTEXT :Datumformaat foar de bestânsnammen fan bewarre spullen ###length 3 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG :lang (31 Dec 2008) STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT :koart (31-12-2008) @@ -1533,7 +1544,7 @@ STR_CONFIG_SETTING_TIMETABLE_SHOW_ARRIVAL_DEPARTURE_HELPTEXT :Lit oankomst- e STR_CONFIG_SETTING_QUICKGOTO :Flugge oanmaak fan fiertúchoarders: {STRING} STR_CONFIG_SETTING_QUICKGOTO_HELPTEXT :By it iepenjen fan it oardersfinster direktst it 'gean-nei'-ark iepenje -STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE :Standert spoarsoart (by nij of opslein spul): {STRING} +STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE :Standert spoarsoart (by nij of bewarre spul): {STRING} STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_HELPTEXT :Spoartype om te selektearjen nei it starten fan in nij spul. 'Earst beskikber' selektearret it âldste spoartype, 'Lêst beskikber' selektearret it nijste spoartype en 'Meast brûkt' selektearret is spoartyp hokker it measte brûkt wurdt ###length 3 STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_FIRST :Earst beskikber @@ -1686,6 +1697,7 @@ STR_CONFIG_SETTING_COLOURED_NEWS_YEAR :Krante verskien STR_CONFIG_SETTING_COLOURED_NEWS_YEAR_HELPTEXT :It jier wêrop kranteberjochten oergean op kleur. Foar dit jier oan binne sy swart/wyt STR_CONFIG_SETTING_STARTING_YEAR :Begjin jier: {STRING} +STR_CONFIG_SETTING_ENDING_YEAR_VALUE :{NUM} ###setting-zero-is-special ###length 3 @@ -1838,7 +1850,7 @@ STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}konstru STR_CONFIG_SETTING_ADVISORS :{ORANGE}Nijs / Adviseurs STR_CONFIG_SETTING_COMPANY :{ORANGE}Bedriuw STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Boekhâlding -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Auto's +STR_CONFIG_SETTING_VEHICLES :{ORANGE}Motorreauwen STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Natuerkundig model STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Route STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Beheinings @@ -1892,7 +1904,7 @@ STR_INTRO_SCRIPT_SETTINGS :{BLACK}AI/Spuls STR_INTRO_QUIT :{BLACK}Ôfslute STR_INTRO_TOOLTIP_NEW_GAME :{BLACK}Begjin in nei spul. Ctrl + klik slaat kaartynstelling oer -STR_INTRO_TOOLTIP_LOAD_GAME :{BLACK}Laad in opslein spul +STR_INTRO_TOOLTIP_LOAD_GAME :{BLACK}Laad in bewarre spul STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP :{BLACK}Begjin in nij spul, mei de hichtekaart as lânskip STR_INTRO_TOOLTIP_PLAY_SCENARIO :{BLACK}Start in nei spul, mei in selsmakke lânskip STR_INTRO_TOOLTIP_SCENARIO_EDITOR :{BLACK}Meitsje in selsmakke lânskip @@ -2032,6 +2044,7 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Feroarje # Matches ServerGameType ###length 3 STR_NETWORK_SERVER_VISIBILITY_LOCAL :Lokaal +STR_NETWORK_SERVER_VISIBILITY_INVITE_ONLY :Allinnich op útnûging # Network server list STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multiplayer @@ -2068,6 +2081,7 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Meidwaan STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Server ferfarskje STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Serverynfo ferfarskje +STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN_TOOLTIP :{BLACK}Op lokaal netwurk sykje nei server STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Server tafoegje STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Start server STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP :{BLACK}Start dien eigen server @@ -2114,12 +2128,14 @@ STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Bedriuw STR_NETWORK_COMPANY_LIST_CLIENT_LIST :{WHITE}Client lyst # Network client list +STR_NETWORK_CLIENT_LIST_SERVER_NAME :{BLACK}Namme STR_NETWORK_CLIENT_LIST_SERVER_NAME_TOOLTIP :{BLACK}Namme fan de server wêrsto op spilest STR_NETWORK_CLIENT_LIST_PLAYER_ICON_SELF_TOOLTIP :{BLACK}Dit bisto sels STR_NETWORK_CLIENT_LIST_CLIENT_COMPANY_COUNT :{BLACK}{NUM} klïïnt{P "" en} / {NUM} bedriuw{P "" en} # Matches ConnectionType ###length 5 +STR_NETWORK_CLIENT_LIST_SERVER_CONNECTION_TYPE_DIRECT :{BLACK}Iepenbier @@ -2129,6 +2145,7 @@ STR_NETWORK_ASK_RELAY_YES_ALWAYS :{BLACK}Ja, net STR_NETWORK_SPECTATORS :Taskôgers # Network set password +STR_COMPANY_PASSWORD_CANCEL :{BLACK}It ynfulde wachtwurd net bewarje STR_COMPANY_PASSWORD_OK :{BLACK}Jou it bedriuw it nije wachtwurd STR_COMPANY_PASSWORD_CAPTION :{WHITE}Bedriuwswachtwurd STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP :{BLACK}Brûk dit bedriuwswachtwurd gewoanwei foar alle nije bedriuwen @@ -2155,11 +2172,12 @@ STR_NETWORK_CHAT_OSKTITLE :{BLACK}Skriuw b STR_NETWORK_ERROR_NEWGRF_MISMATCH :{WHITE}Koe gjin ferbyning meitsje fanwegen ferkearde NewGRF STR_NETWORK_ERROR_DESYNC :{WHITE}Koe net synchronisearje mei netwurkspul STR_NETWORK_ERROR_LOSTCONNECTION :{WHITE}Networkspul ferbining kwyt -STR_NETWORK_ERROR_SAVEGAMEERROR :{WHITE}Koe opslein spul net laden +STR_NETWORK_ERROR_SAVEGAMEERROR :{WHITE}Koe spul net lade STR_NETWORK_ERROR_SERVER_START :{WHITE}Koe de server net starte STR_NETWORK_ERROR_SERVER_ERROR :{WHITE}In protokol flater is opmurken en de ferbining is sletten STR_NETWORK_ERROR_WRONG_PASSWORD :{WHITE}Ferkeard wachtwurd STR_NETWORK_ERROR_SERVER_FULL :{WHITE}De server is fol +STR_NETWORK_ERROR_SERVER_BANNED :{WHITE}Do bist ferbanne fan disse server STR_NETWORK_ERROR_KICK_MESSAGE :{WHITE}Reden: {STRING} STR_NETWORK_ERROR_CHEATER :Falsk spielje net tastien op disse server STR_NETWORK_ERROR_TOO_MANY_COMMANDS :{WHITE}Do stjoerst tevolle opdrachten ny de server @@ -2182,6 +2200,8 @@ STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD :ferkeard wachtw STR_NETWORK_ERROR_CLIENT_KICKED :fuortstjoerd troch server STR_NETWORK_ERROR_CLIENT_CHEATER :besocht falsk te spieljen STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS :joech tevolle opdrachten +STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD :wachtwurd net op tiid ûntfongen +STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER :tiidlimyt ferstrutsen STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP :kaart delheljen duorret te lang STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN :kaart ferwurkje duorret te lang STR_NETWORK_ERROR_CLIENT_INVALID_CLIENT_NAME :ûnjildige namme @@ -2251,13 +2271,14 @@ STR_CONTENT_DOWNLOAD_PROGRESS_SIZE :{WHITE}{BYTES} # Content downloading error messages STR_CONTENT_ERROR_COULD_NOT_CONNECT :{WHITE}Koe gjin ferbyning mei ynhâldserver meitsje... STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD :{WHITE}Delheljen net slagge... -STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE :{WHITE}... bestân koe net opslein wurde +STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE :{WHITE}... bestân koe net bewarre wurde STR_CONTENT_ERROR_COULD_NOT_EXTRACT :{WHITE}Kin it delhelle bestân net útpakke STR_MISSING_GRAPHICS_SET_CAPTION :{WHITE}Missende ôfbyldings STR_MISSING_GRAPHICS_YES_DOWNLOAD :{BLACK}Ja, ôfbyldings delheljen STR_MISSING_GRAPHICS_NO_QUIT :{BLACK}Nee, OpenTTD ôfslute +STR_MISSING_GRAPHICS_ERROR_QUIT :{BLACK}Slút OpenTTD ôf # Transparency settings window STR_TRANSPARENCY_CAPTION :{WHITE}Trochsichtigenopsjes @@ -2269,6 +2290,7 @@ STR_LINKGRAPH_LEGEND_CAPTION :{BLACK}Frachtst STR_LINKGRAPH_LEGEND_ALL :{BLACK}Alle STR_LINKGRAPH_LEGEND_NONE :{BLACK}Gjin STR_LINKGRAPH_LEGEND_SELECT_COMPANIES :{BLACK}Selektearje bedriuwen om sjen te litten +STR_LINKGRAPH_LEGEND_COMPANY_TOOLTIP :{BLACK}{STRING}{}{COMPANY} # Linkgraph legend window and linkgraph legend in smallmap STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLACK}net brûkt @@ -2410,7 +2432,7 @@ STR_TOOLBAR_AIRCRAFT_CAPTION :{WHITE}Fleanfji # Airport construction window STR_STATION_BUILD_AIRPORT_CAPTION :{WHITE}Fleanfjild Seleksje -STR_STATION_BUILD_AIRPORT_TOOLTIP :{BLACK}Kies grutte/type fleanfjild +STR_STATION_BUILD_AIRPORT_TOOLTIP :{BLACK}Selektearje grutte en type fan it fleanfjild STR_STATION_BUILD_AIRPORT_CLASS_LABEL :{BLACK}Fleanfjild klasse STR_STATION_BUILD_AIRPORT_LAYOUT_NAME :{BLACK}Patroan {NUM} @@ -2486,7 +2508,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON :{BLACK}Lyts STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON :{BLACK}Middel STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON :{BLACK}Grut STR_FOUND_TOWN_SIZE_RANDOM :{BLACK}Samar in getal -STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP :{BLACK}Selektear de grutte fan 'e stêd +STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP :{BLACK}Selektearje de grutte fan 'e stêd STR_FOUND_TOWN_CITY :{BLACK}Stêd STR_FOUND_TOWN_CITY_TOOLTIP :{BLACK}Stêden groeien flugger as doarpen{}Ôfhinklik fan ynstellings binne se grutter at se makke wurde @@ -2501,9 +2523,12 @@ STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM :{BLACK}Samar # Fund new industry window STR_FUND_INDUSTRY_CAPTION :{WHITE}Betelje nije yndustry STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP :{BLACK}Pleats yndustry oer de map hinne +STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_CAPTION :{WHITE}Willekeurich neie yndustryen meitsje STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST :{BLACK}Kostet: {YELLOW}{CURRENCY_LONG} +STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY :{BLACK}Ûndersykje STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY :{BLACK}Bouwe STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY :{BLACK}Finansierje +STR_FUND_INDUSTRY_REMOVE_ALL_INDUSTRIES_CAPTION :{WHITE}Alle yndustryen fuorthelje # Industry cargoes window STR_INDUSTRY_CARGOES_INDUSTRY_CAPTION :{WHITE}Yndustrykeatlings foar {STRING} yndustry @@ -2642,7 +2667,12 @@ STR_ABOUT_VERSION :{BLACK}OpenTTD- STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-{STRING} It OpenTTD team # Framerate display window +STR_FRAMERATE_CAPTION :{WHITE}Byldsnelheid +STR_FRAMERATE_RATE_GAMELOOP :{BLACK}Simulaasjesnelheid: {STRING} STR_FRAMERATE_CURRENT :Aktueel +STR_FRAMERATE_AVERAGE :{WHITE}Gemiddeld +STR_FRAMERATE_MEMORYUSE :{WHITE}Geheugen +STR_FRAMERATE_GRAPH_MILLISECONDS :{TINY_FONT}{COMMA} ms ###length 15 @@ -2660,9 +2690,9 @@ STR_SAVELOAD_SAVE_HEIGHTMAP :{WHITE}Hichteka STR_SAVELOAD_HOME_BUTTON :{BLACK}Hjir klikke om nei standert opslach- en laadtriemtafel te gean STR_SAVELOAD_BYTES_FREE :{BLACK}{BYTES} frij STR_SAVELOAD_LIST_TOOLTIP :{BLACK}List fan skiven, mappen en bestânen -STR_SAVELOAD_EDITBOX_TOOLTIP :{BLACK}Op dit stuit selektearre namme foar opslein spul +STR_SAVELOAD_EDITBOX_TOOLTIP :{BLACK}Op dit stuit selektearre namme foar bewarre spul STR_SAVELOAD_DELETE_BUTTON :{BLACK}Fuortsmite -STR_SAVELOAD_DELETE_TOOLTIP :{BLACK}It no selektearre opsleine spul fuortsmite +STR_SAVELOAD_DELETE_TOOLTIP :{BLACK}It no selektearre bewarre spul fuortsmite STR_SAVELOAD_SAVE_BUTTON :{BLACK}Opslaan STR_SAVELOAD_SAVE_TOOLTIP :{BLACK}It hjoeddeisk spul opslaan ûnder de selektearre namme STR_SAVELOAD_LOAD_BUTTON :{BLACK}Laad @@ -2673,7 +2703,7 @@ STR_SAVELOAD_DETAIL_NOT_AVAILABLE :{BLACK}Gjin ynf STR_SAVELOAD_DETAIL_COMPANY_INDEX :{SILVER}{COMMA}: {WHITE}{STRING} STR_SAVELOAD_DETAIL_GRFSTATUS :{SILVER}NewGRF: {WHITE}{STRING} -STR_SAVELOAD_OSKTITLE :{BLACK}Fier in namme yn foar it opsleine spul +STR_SAVELOAD_OSKTITLE :{BLACK}Fier in namme yn foar it bewarre spul # World generation STR_MAPGEN_WORLD_GENERATION_CAPTION :{WHITE}Wrâldgeneraasje @@ -3088,7 +3118,7 @@ STR_STATION_VIEW_CENTER_TOOLTIP :{BLACK}Sintrear STR_STATION_VIEW_RENAME_TOOLTIP :{BLACK}Feroarje stasjonsnamme -STR_STATION_VIEW_RENAME_STATION_CAPTION :Jow stasjon in nije namme +STR_STATION_VIEW_RENAME_STATION_CAPTION :Jou stasjon in nije namme STR_STATION_VIEW_CLOSE_AIRPORT :{BLACK}Fleanfjild slute @@ -3102,10 +3132,11 @@ STR_BUOY_VIEW_CHANGE_BUOY_NAME :{BLACK}Namme fa STR_EDIT_WAYPOINT_NAME :{WHITE}Namme fan kontrôlepost oanpasse # Finances window -STR_FINANCES_CAPTION :{WHITE}{COMPANY} Finansieën {BLACK}{COMPANY_NUM} +STR_FINANCES_CAPTION :{WHITE}{COMPANY} Finânsjes {BLACK}{COMPANY_NUM} STR_FINANCES_YEAR :{WHITE}{NUM} ###length 3 +STR_FINANCES_CAPITAL_EXPENSES_TITLE :{WHITE}Kapitaalkosten ###length 13 @@ -3115,7 +3146,7 @@ STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Trein Ûn STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Lânfartugen ûnderhâldskosten STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Fleantúch Ûnderhâldskosten STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Skip Ûnderhâldskosten -STR_FINANCES_SECTION_LOAN_INTEREST :{GOLD}Rinte fan Liening +STR_FINANCES_SECTION_LOAN_INTEREST :{GOLD}Rinte op liening STR_FINANCES_SECTION_OTHER :{GOLD}Oaren STR_FINANCES_NEGATIVE_INCOME :{BLACK}-{CURRENCY_LONG} @@ -3123,7 +3154,8 @@ STR_FINANCES_POSITIVE_INCOME :{BLACK}+{CURREN STR_FINANCES_BANK_BALANCE_TITLE :{WHITE}Jild STR_FINANCES_OWN_FUNDS_TITLE :{WHITE}Eigen fûnsen STR_FINANCES_LOAN_TITLE :{WHITE}Liening -STR_FINANCES_MAX_LOAN :{WHITE}Maksimale Liening: {BLACK}{CURRENCY_LONG} +STR_FINANCES_INTEREST_RATE :{WHITE}Rinte op liening: {BLACK}{NUM}% +STR_FINANCES_MAX_LOAN :{WHITE}Maksimale liening: {BLACK}{CURRENCY_LONG} STR_FINANCES_TOTAL_CURRENCY :{BLACK}{CURRENCY_LONG} STR_FINANCES_BORROW_BUTTON :{BLACK}Lien {CURRENCY_LONG} STR_FINANCES_BORROW_TOOLTIP :{BLACK}Lien mear jild. Ctrl+Klik om it maksimale te lienen @@ -3183,6 +3215,7 @@ STR_BUY_COMPANY_MESSAGE :{WHITE}Wy sykje STR_COMPANY_INFRASTRUCTURE_VIEW_CAPTION :{WHITE}Ynfrastruktuer fan {COMPANY} STR_COMPANY_INFRASTRUCTURE_VIEW_SIGNALS :{WHITE}Seinen STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT :{GOLD}Stikjes dyk: +STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS :{WHITE}Kanalen STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT :{GOLD}Stasjons: STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS :{WHITE}Stasjontegels STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS :{WHITE}Fleanfjilden @@ -3248,7 +3281,9 @@ STR_GROUP_ALL_SHIPS :Alle skepen STR_GROUP_ALL_AIRCRAFTS :Alle fleantugen ###length VEHICLE_TYPES -STR_GROUP_DEFAULT_SHIPS :Net groepearre skepen +STR_GROUP_DEFAULT_TRAINS :Net-groepearre treinen +STR_GROUP_DEFAULT_ROAD_VEHICLES :Net-groepearre weinen +STR_GROUP_DEFAULT_SHIPS :Net-groepearre skepen STR_GROUP_COUNT_WITH_SUBGROUP :{TINY_FONT}{COMMA} (+{COMMA}) @@ -3261,6 +3296,7 @@ STR_QUERY_GROUP_DELETE_CAPTION :{WHITE}Ferwider STR_GROUP_REMOVE_ALL_VEHICLES :Alle fiertugen weihelje +STR_GROUP_PROFIT_THIS_YEAR :Winst dit jier: # Build vehicle window ###length 4 @@ -3299,7 +3335,7 @@ STR_PURCHASE_INFO_AIRCRAFT_TYPE :{BLACK}Fleantú ###length VEHICLE_TYPES ###length VEHICLE_TYPES -STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_BUTTON :{BLACK}Keapje auto +STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_BUTTON :{BLACK}Keapje trein STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON :{BLACK}Keapje auto STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON :{BLACK}Keapje boat STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON :{BLACK}Keapje fleantúch @@ -3316,10 +3352,10 @@ STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP :{BLACK}Keapje f ###length VEHICLE_TYPES ###length VEHICLE_TYPES -STR_BUY_VEHICLE_TRAIN_RENAME_BUTTON :{BLACK}Jow in nije namme -STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON :{BLACK}Jow in nije namme -STR_BUY_VEHICLE_SHIP_RENAME_BUTTON :{BLACK}Jow in nije namme -STR_BUY_VEHICLE_AIRCRAFT_RENAME_BUTTON :{BLACK}Jow in nije namme +STR_BUY_VEHICLE_TRAIN_RENAME_BUTTON :{BLACK}Jou in nije namme +STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON :{BLACK}Jou in nije namme +STR_BUY_VEHICLE_SHIP_RENAME_BUTTON :{BLACK}Jou in nije namme +STR_BUY_VEHICLE_AIRCRAFT_RENAME_BUTTON :{BLACK}Jou in nije namme ###length VEHICLE_TYPES STR_BUY_VEHICLE_TRAIN_RENAME_TOOLTIP :{BLACK}Treintype neame @@ -3391,6 +3427,7 @@ STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP :{BLACK}Nij skip STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP :{BLACK}Nij fleantúch keapje ###length VEHICLE_TYPES +STR_DEPOT_CLONE_TRAIN :{BLACK}Trein klone ###length VEHICLE_TYPES @@ -3441,6 +3478,7 @@ STR_REPLACE_HELP_LEFT_ARRAY :{BLACK}Selektea STR_REPLACE_VEHICLES_NOW :No alle fiertugen ferfange STR_REPLACE_VEHICLES_WHEN_OLD :Ferfang allinech âlde weinen +STR_REPLACE_ENGINES :Motoaren ###length 2 ###next-name-looks-similar @@ -3519,7 +3557,8 @@ STR_VEHICLE_INFO_AGE :{COMMA} jier{P STR_VEHICLE_INFO_AGE_RED :{RED}{COMMA} jier{P "" ren} ({COMMA}) STR_VEHICLE_INFO_MAX_SPEED :{BLACK}Maks. snelheid: {LTBLUE}{VELOCITY} -STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Gewicht: {LTBLUE}{WEIGHT_SHORT} {BLACK}Krêft: {LTBLUE}{POWER}{BLACK} Maks. faasje: {LTBLUE}{VELOCITY} +STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED :{BLACK}Gewicht: {LTBLUE}{WEIGHT_SHORT} {BLACK}Krêft: {LTBLUE}{POWER}{BLACK} Maks. snelheid: {LTBLUE}{VELOCITY} +STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE :{BLACK}Gewicht: {LTBLUE}{WEIGHT_SHORT} {BLACK}Krêft: {LTBLUE}{POWER}{BLACK} Maks. snelheid: {LTBLUE}{VELOCITY} {BLACK}Maks. lûkkrêft: {LTBLUE}{FORCE} STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS :{BLACK}betrouberens: {LTBLUE}{COMMA}% {BLACK}Stikken west sûnt lêste ûnderhâld: {LTBLUE}{COMMA} @@ -3570,11 +3609,12 @@ STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY :{BLACK}Kapasite STR_REFIT_CAPTION :{WHITE}{VEHICLE} (Ombouwe) STR_REFIT_TITLE :{GOLD}Selektearje it soart fracht om mei te nimmen: STR_REFIT_NEW_CAPACITY_COST_OF_REFIT :{BLACK}Nije kapasiteit: {GOLD}{CARGO_LONG}{}{BLACK}Kosten fan ombou: {RED}{CURRENCY_LONG} +STR_REFIT_NEW_CAPACITY_INCOME_FROM_REFIT :{BLACK}Nije kapasiteit: {GOLD}{CARGO_LONG}{}{BLACK}Ynkomsten fan ombouw: {GREEN}{CURRENCY_LONG} STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT :{BLACK}Nije kapasiteit: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}kosten fan werfolje: {RED}{CURRENCY_LONG} STR_REFIT_SELECT_VEHICLES_TOOLTIP :{BLACK}Selektearje in ferfiermiddel foar reparaasje. sleep mei de mûs om meardere ferfiermiddels te selekttearjen. Ctrl+klick sil in ferfiermiddel selektearje en de neikommende rige ###length VEHICLE_TYPES -STR_REFIT_TRAIN_LIST_TOOLTIP :{BLACK}selektearje soart fracht foar de trein om mei te nimmen +STR_REFIT_TRAIN_LIST_TOOLTIP :{BLACK}Selektearje soart fracht foar de trein om mei te nimmen STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Selektearje it soart fracht foar wein om mei te nimmen STR_REFIT_SHIP_LIST_TOOLTIP :{BLACK}Selektearje it soart fracht foar it skip om mei te nimmen STR_REFIT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Selektearje it soart fracht foar it fleantúch om mei te nimmen @@ -3592,6 +3632,7 @@ STR_REFIT_SHIP_REFIT_TOOLTIP :{BLACK}Skip omb STR_REFIT_AIRCRAFT_REFIT_TOOLTIP :{BLACK}Fleantúch ombouwe nei selektearre fracht # Order view +STR_ORDERS_CAPTION :{WHITE}{VEHICLE} (Oarders) STR_ORDERS_TIMETABLE_VIEW :{BLACK}Tjinstregeling STR_ORDER_INDEX :{COMMA}:{NBSP} @@ -3612,6 +3653,7 @@ STR_ORDER_DROP_FULL_LOAD_ANY :Samar in fracht STR_ORDER_DROP_NO_LOADING :Net laden STR_ORDER_TOGGLE_UNLOAD :{BLACK}Alles losse +STR_ORDER_DROP_UNLOAD_IF_ACCEPTED :Losse as it oannaam wurd STR_ORDER_DROP_UNLOAD :Alles losse STR_ORDER_DROP_TRANSFER :Oerlade STR_ORDER_DROP_NO_UNLOADING :Net losse @@ -3636,6 +3678,7 @@ STR_ORDER_CONDITIONAL_UNCONDITIONALLY :Altyd STR_ORDER_CONDITIONAL_MAX_RELIABILITY :Maksimale betrouberheid ###next-name-looks-similar +STR_ORDER_CONDITIONAL_COMPARATOR_NOT_EQUALS :is net gelyk oan STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE :is net wier @@ -3669,6 +3712,7 @@ STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT :{STRING} {STRIN STR_ORDER_GO_TO_DEPOT_FORMAT :{STRING} {DEPOT} STR_ORDER_REFIT_ORDER :(Ombouwe nij {STRING}) +STR_ORDER_REFIT_STOP_ORDER :(Ombouwe nei {STRING} en stopje) STR_ORDER_STOP_ORDER :(Stop) STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING} @@ -3678,8 +3722,8 @@ STR_ORDER_IMPLICIT :(Ymplisyt) STR_ORDER_FULL_LOAD :(Folle fracht) STR_ORDER_FULL_LOAD_ANY :(Samar in fracht folslein lade) STR_ORDER_NO_LOAD :(Gjin lading) -STR_ORDER_UNLOAD :(Afladen en nim lading -STR_ORDER_UNLOAD_FULL_LOAD :(Afladen en wacht foar folle fracht) +STR_ORDER_UNLOAD :(Losse en fracht meinimme) +STR_ORDER_UNLOAD_FULL_LOAD :(Losse en wacht foar folle fracht) STR_ORDER_UNLOAD_FULL_LOAD_ANY :(Losse en wachtsje foar ien folle fracht) STR_ORDER_UNLOAD_NO_LOAD :(Oflade en lit leech) STR_ORDER_TRANSFER :(Oerladen en fracht meinimme) @@ -3730,7 +3774,8 @@ STR_TIMETABLE_DAYS :{COMMA}{NBSP}{P STR_TIMETABLE_TICKS :{COMMA}{NBSP}tik{P "" ken} -STR_TIMETABLE_STATUS_ON_TIME :{BLACK}Dit fiertûg is op tiid +STR_TIMETABLE_STATUS_ON_TIME :{BLACK}Dit fiertûch is op tiid +STR_TIMETABLE_STATUS_EARLY :{BLACK}Dit fiertûch is {STRING} te betiid STR_TIMETABLE_STARTING_DATE :{BLACK}Begjin datum @@ -3858,6 +3903,7 @@ STR_MESSAGE_ESTIMATED_COST :{WHITE}Dit gjit STR_MESSAGE_ESTIMATED_INCOME :{WHITE}Dit gjit {CURRENCY_LONG} opbringen. # Saveload messages +STR_ERROR_SAVE_STILL_IN_PROGRESS :{WHITE}Spul noch an it bewarjen,{}graach nog efkes geduld! STR_ERROR_AUTOSAVE_FAILED :{WHITE}Automatysk opslaan net slagge STR_ERROR_UNABLE_TO_READ_DRIVE :{BLACK}Koe net fan 'e skiif lêze STR_ERROR_GAME_SAVE_FAILED :{WHITE}Opslaan Mislearre{}{STRING} @@ -3865,6 +3911,7 @@ STR_ERROR_UNABLE_TO_DELETE_FILE :{WHITE}Kin best STR_ERROR_GAME_LOAD_FAILED :{WHITE}Laden Mislearre{}{STRING} STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR :Interne flater: {STRING} STR_GAME_SAVELOAD_ERROR_BROKEN_SAVEGAME :Stikkene savegame - {STRING} +STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME :Spul is makke mei in neiere fersje STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE :Koe bestân net lêze STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE :Koe net nei bestân skriuwe STR_GAME_SAVELOAD_NOT_AVAILABLE : @@ -3882,7 +3929,7 @@ STR_ERROR_HEIGHTMAP_TOO_LARGE :{WHITE}... ôfb # Screenshot related messages STR_WARNING_SCREENSHOT_SIZE_CAPTION :{WHITE}Grutte skermôfbylding -STR_MESSAGE_SCREENSHOT_SUCCESSFULLY :{WHITE}Skermfoto opslein as '{STRING}' +STR_MESSAGE_SCREENSHOT_SUCCESSFULLY :{WHITE}Skermfoto bewarre as '{STRING}' STR_ERROR_SCREENSHOT_FAILED :{WHITE}Koe gjin skermfoto meitsje! # Error message titles From b0fd51a5ef271e0dcde266747062e0f19ef79534 Mon Sep 17 00:00:00 2001 From: translators Date: Thu, 27 Oct 2022 18:57:01 +0000 Subject: [PATCH 17/17] Update: Translations from eints korean: 1 change by telk5093 german: 5 changes by MagnumSociety --- src/lang/german.txt | 5 +++++ src/lang/korean.txt | 1 + 2 files changed, 6 insertions(+) diff --git a/src/lang/german.txt b/src/lang/german.txt index 0cff318dd7..e364d86898 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -2619,6 +2619,9 @@ STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLA STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}überlastet # Linkgraph tooltip +STR_LINKGRAPH_STATS_TOOLTIP :{BLACK}{CARGO_LONG} Zum Transport pro Monat votgesehen von {STATION} zu {STATION}({COMMA}% der Kapazitäten){STRING} +STR_LINKGRAPH_STATS_TOOLTIP_RETURN_EXTENSION :{}{CARGO_LONG} ZUM Rücktransport vorgesehen ({COMMA}% der Kapazitäten) +STR_LINKGRAPH_STATS_TOOLTIP_TIME_EXTENSION :{}Durchschnittliche Reisezeit: {NUM}{NBSP}Tag{P "" s} # Base for station construction window(s) STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Einzugsgebiet anzeigen @@ -2628,6 +2631,7 @@ STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}Einzugsg STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}Einzugsgebiet anzeigen STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}Nimmt an: {GOLD}{CARGO_LIST} STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}Liefert: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_INFRASTRUCTURE_COST :{BLACK}Wartungskosten: {GOLD}{CURRENCY_SHORT}/yr # Join station window STR_JOIN_STATION_CAPTION :{WHITE}Verbinde mit Station @@ -4928,6 +4932,7 @@ STR_ERROR_OBJECT_IN_THE_WAY :{WHITE}Objekt i STR_ERROR_COMPANY_HEADQUARTERS_IN :{WHITE}... Firmensitz ist im Weg STR_ERROR_CAN_T_PURCHASE_THIS_LAND :{WHITE}Das Land kann nicht erworben werden ... STR_ERROR_YOU_ALREADY_OWN_IT :{WHITE}... ist bereits im Besitz der eigenen Firma! +STR_ERROR_BUILD_OBJECT_LIMIT_REACHED :{WHITE}... Baulimit erreicht # Group related errors STR_ERROR_GROUP_CAN_T_CREATE :{WHITE}Gruppe kann nicht erstellt werden ... diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 388cb2fa94..2ac46f9816 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -2631,6 +2631,7 @@ STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP :{BLACK}역세 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP :{BLACK}역세권을 표시합니다 STR_STATION_BUILD_ACCEPTS_CARGO :{BLACK}받음: {GOLD}{CARGO_LIST} STR_STATION_BUILD_SUPPLIES_CARGO :{BLACK}공급: {GOLD}{CARGO_LIST} +STR_STATION_BUILD_INFRASTRUCTURE_COST :{BLACK}유지비: {GOLD}{CURRENCY_SHORT}/년 # Join station window STR_JOIN_STATION_CAPTION :{WHITE}같은 이름으로 정거장 만들기