Merge branch 'master' into jgrpp
# Conflicts: # .github/workflows/commit-checker.yml # src/industry_cmd.cpp # src/industry_gui.cpp # src/landscape.cpp # src/linkgraph/linkgraph_gui.cpp # src/order_base.h # src/order_cmd.cpp # src/order_gui.cpp # src/saveload/afterload.cpp # src/saveload/league_sl.cpp # src/saveload/saveload.h # src/script/api/script_object.hpp # src/script/squirrel_helper.hpp # src/settings_table.cpp # src/station_cmd.cpp # src/table/settings.h.preamble # src/tree_cmd.cpp # src/tree_map.h # src/vehicle.cpp # src/waypoint_cmd.cpp
This commit is contained in:
Jonathan G Rennison
@@ -1746,18 +1746,7 @@ STR_ERROR_DEPOT_HAS_WRONG_RAIL_TYPE :{WHITE}Depot ca
|
||||
|
||||
STR_ERROR_CANNOT_MODIFY_TRACK_TRAIN_APPROACHING :{WHITE}Moving train approaching...
|
||||
|
||||
STR_ERROR_NO_RAIL_STATION :{WHITE}There is no railway station...
|
||||
STR_ERROR_NO_BUS_STATION :{WHITE}There is no bus station...
|
||||
STR_ERROR_NO_TRUCK_STATION :{WHITE}There is no lorry station...
|
||||
STR_ERROR_NO_DOCK :{WHITE}There is no dock...
|
||||
STR_ERROR_NO_AIRPORT :{WHITE}There is no airport/heliport...
|
||||
STR_ERROR_NO_STOP_COMPATIBLE_ROAD_TYPE :{WHITE}There are no stops with a compatible road/tram type...
|
||||
STR_ERROR_NO_STOP_ARTIC_VEH :{WHITE}There are no stops which are suitable for articulated road vehicles.{}Articulated road vehicles require a drive-through stop, not a bay stop...
|
||||
STR_ERROR_AIRPORT_NO_PLANES :{WHITE}This plane cannot land at this heliport...
|
||||
STR_ERROR_AIRPORT_NO_HELIS :{WHITE}This helicopter cannot land at this airport...
|
||||
STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}There is no railway waypoint...
|
||||
STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}There is no road waypoint...
|
||||
STR_ERROR_NO_BUOY :{WHITE}There is no buoy...
|
||||
STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}There is no road waypoint
|
||||
|
||||
# Plan related errors
|
||||
STR_ERROR_TOO_MANY_PLANS :{WHITE}... too many plans
|
||||
|
||||
@@ -1705,9 +1705,9 @@ STR_ERROR_NO_TRUCK_STATION :{WHITE}Non hai
|
||||
STR_ERROR_NO_DOCK :{WHITE}Non hai porto...
|
||||
STR_ERROR_NO_AIRPORT :{WHITE}Non hai aeroporto/heliporto...
|
||||
STR_ERROR_NO_STOP_COMPATIBLE_ROAD_TYPE :{WHITE}Non hai paradas con un tipo de estrada/tranvía compatible...
|
||||
STR_ERROR_NO_STOP_ARTIC_VEH :{WHITE}Non hai paradas axeitadas para vehículos articulados de estrada.{}Os vehículos de estrada articulados requiren unha parada de vía, non unha estación terminal/baía.
|
||||
STR_ERROR_NO_STOP_ARTICULATED_VEHICLE :{WHITE}Non hai paradas axeitadas para vehículos articulados de estrada.{}Os vehículos de estrada articulados requiren unha parada de vía, non unha estación terminal/baía.
|
||||
STR_ERROR_AIRPORT_NO_PLANES :{WHITE}Este avión non pode aterrar neste heliporto...
|
||||
STR_ERROR_AIRPORT_NO_HELIS :{WHITE}Este helicóptero non pode aterrar neste aeroporto...
|
||||
STR_ERROR_AIRPORT_NO_HELICOPTERS :{WHITE}Este helicóptero non pode aterrar neste aeroporto...
|
||||
STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}Non hai punto de ruta de ferrocarril...
|
||||
STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}Non hai punto de ruta de estrada...
|
||||
STR_ERROR_NO_BUOY :{WHITE}Non hai boia...
|
||||
|
||||
@@ -1615,9 +1615,9 @@ STR_ERROR_NO_TRUCK_STATION :{WHITE}Da ist k
|
||||
STR_ERROR_NO_DOCK :{WHITE}Da ist kein dock ...
|
||||
STR_ERROR_NO_AIRPORT :{WHITE}Da ist kein Flughafen/Heliport ...
|
||||
STR_ERROR_NO_STOP_COMPATIBLE_ROAD_TYPE :{WHITE}Da ist kein Station eines kompatiblen Straßen- oder Straßenbahngleistyps ...
|
||||
STR_ERROR_NO_STOP_ARTIC_VEH :{WHITE}Da sind keine Stationsfelder, die für Gelenkfahrzeuge geeinget sind.{}Gelenkfahrzeuge benötigen eine Durchfahrtsstation, nicht solche mit einer Haltebucht ...
|
||||
STR_ERROR_NO_STOP_ARTICULATED_VEHICLE :{WHITE}Da sind keine Stationsfelder, die für Gelenkfahrzeuge geeinget sind.{}Gelenkfahrzeuge benötigen eine Durchfahrtsstation, nicht solche mit einer Haltebucht ...
|
||||
STR_ERROR_AIRPORT_NO_PLANES :{WHITE}Das Flugzeug kann auf diesem Heliport nicht landen ...
|
||||
STR_ERROR_AIRPORT_NO_HELIS :{WHITE}Der Hubschrauber kann auf diesem Flugplatz nicht landen ...
|
||||
STR_ERROR_AIRPORT_NO_HELICOPTERS :{WHITE}Der Hubschrauber kann auf diesem Flugplatz nicht landen ...
|
||||
STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}Da ist kein Wegpunkt ...
|
||||
STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}Da ist kein Wegpunkt ...
|
||||
STR_ERROR_NO_BUOY :{WHITE}Da ist keine Boye ...
|
||||
|
||||
@@ -1711,9 +1711,9 @@ STR_ERROR_NO_TRUCK_STATION :{WHITE}트럭
|
||||
STR_ERROR_NO_DOCK :{WHITE}항구가 없습니다...
|
||||
STR_ERROR_NO_AIRPORT :{WHITE}공항/헬리포트가 없습니다...
|
||||
STR_ERROR_NO_STOP_COMPATIBLE_ROAD_TYPE :{WHITE}도로/전차 종류에 맞는 정거장이 없습니다...
|
||||
STR_ERROR_NO_STOP_ARTIC_VEH :{WHITE}굴절 차량이 들어갈 수 있는 정거장이 없습니다.{}굴절 차량은 터미널식 정류장이 아니라 통과식 정류장을 써야 합니다...
|
||||
STR_ERROR_NO_STOP_ARTICULATED_VEHICLE :{WHITE}굴절 차량이 들어갈 수 있는 정거장이 없습니다.{}굴절 차량은 터미널식 정류장이 아니라 통과식 정류장을 써야 합니다...
|
||||
STR_ERROR_AIRPORT_NO_PLANES :{WHITE}이 항공기는 이 헬리포트에 착륙할 수 없습니다...
|
||||
STR_ERROR_AIRPORT_NO_HELIS :{WHITE}이 헬리콥터는 이 공항에 착륙할 수 없습니다...
|
||||
STR_ERROR_AIRPORT_NO_HELICOPTERS :{WHITE}이 헬리콥터는 이 공항에 착륙할 수 없습니다...
|
||||
STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}철도 경유지가 없습니다...
|
||||
STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}도로 경유지가 없습니다...
|
||||
STR_ERROR_NO_BUOY :{WHITE}부표가 없습니다...
|
||||
|
||||
@@ -1700,9 +1700,9 @@ STR_ERROR_NO_TRUCK_STATION :{WHITE}没有
|
||||
STR_ERROR_NO_DOCK :{WHITE}没有港口...
|
||||
STR_ERROR_NO_AIRPORT :{WHITE}没有机场或者直升机场...
|
||||
STR_ERROR_NO_STOP_COMPATIBLE_ROAD_TYPE :{WHITE}没有兼容的道路/电车道类型的站点...
|
||||
STR_ERROR_NO_STOP_ARTIC_VEH :{WHITE}这里没有适用于铰接式的道路车辆的站点。{}铰接式道路车辆需要一个直通式站点而不是港湾式站点...
|
||||
STR_ERROR_NO_STOP_ARTICULATED_VEHICLE :{WHITE}这里没有适用于铰接式的道路车辆的站点。{}铰接式道路车辆需要一个直通式站点而不是港湾式站点...
|
||||
STR_ERROR_AIRPORT_NO_PLANES :{WHITE}这架飞机不能在这个直升机场着陆...
|
||||
STR_ERROR_AIRPORT_NO_HELIS :{WHITE}这架直升机不能在这个机场着陆...
|
||||
STR_ERROR_AIRPORT_NO_HELICOPTERS :{WHITE}这架直升机不能在这个机场着陆...
|
||||
STR_ERROR_NO_RAIL_WAYPOINT :{WHITE}这里没有铁道路点...
|
||||
STR_ERROR_NO_ROAD_WAYPOINT :{WHITE}这里没有公路路点...
|
||||
STR_ERROR_NO_BUOY :{WHITE}这里没有浮漂...
|
||||
|
||||
Reference in New Issue
Block a user