diff --git a/cmake/CreateGrfCommand.cmake b/cmake/CreateGrfCommand.cmake index 107ec09b88..642fffb27f 100644 --- a/cmake/CreateGrfCommand.cmake +++ b/cmake/CreateGrfCommand.cmake @@ -28,12 +28,13 @@ function(create_grf_command) list(APPEND GRF_PNG_BINARY_FILES ${GRF_PNG_BINARY_FILE}) endforeach() - add_custom_command(OUTPUT ${GRF_BINARY_FILE} + add_custom_command(OUTPUT ${GRF_BINARY_FILE} ${GRF_BINARY_FILE}.hash COMMAND ${CMAKE_COMMAND} -DGRF_SOURCE_FOLDER=${CMAKE_CURRENT_SOURCE_DIR} -DGRF_BINARY_FILE=${GRF_BINARY_FILE} -DNFORENUM_EXECUTABLE=${NFORENUM_EXECUTABLE} -DGRFCODEC_EXECUTABLE=${GRFCODEC_EXECUTABLE} + -DGRFID_EXECUTABLE=${GRFID_EXECUTABLE} -P ${CMAKE_SOURCE_DIR}/cmake/scripts/CreateGRF.cmake MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/cmake/scripts/CreateGRF.cmake DEPENDS ${GRF_PNG_BINARY_FILES} diff --git a/cmake/FindGrfcodec.cmake b/cmake/FindGrfcodec.cmake index 089f956706..d4d8d91708 100644 --- a/cmake/FindGrfcodec.cmake +++ b/cmake/FindGrfcodec.cmake @@ -2,6 +2,7 @@ # find_program(GRFCODEC_EXECUTABLE grfcodec) +find_program(GRFID_EXECUTABLE grfid) find_program(NFORENUM_EXECUTABLE nforenum) include(FindPackageHandleStandardArgs) @@ -9,5 +10,6 @@ find_package_handle_standard_args(Grfcodec FOUND_VAR GRFCODEC_FOUND REQUIRED_VARS GRFCODEC_EXECUTABLE + GRFID_EXECUTABLE NFORENUM_EXECUTABLE ) diff --git a/cmake/scripts/Baseset.cmake b/cmake/scripts/Baseset.cmake index cb5fb5704d..c298aea484 100644 --- a/cmake/scripts/Baseset.cmake +++ b/cmake/scripts/Baseset.cmake @@ -58,6 +58,7 @@ list(SORT ${PLACE_HOLDER}) string(REPLACE ";" "\n" ${PLACE_HOLDER} "${${PLACE_HOLDER}}") # Get the grf md5 -file(MD5 ${BASESET_EXTRAGRF_FILE} ORIG_EXTRA_GRF_MD5) +file(READ ${BASESET_EXTRAGRF_FILE}.hash ORIG_EXTRA_GRF_MD5) +string(STRIP ${ORIG_EXTRA_GRF_MD5} ORIG_EXTRA_GRF_MD5) configure_file(${BASESET_SOURCE_FILE} ${BASESET_BINARY_FILE}) diff --git a/cmake/scripts/CreateGRF.cmake b/cmake/scripts/CreateGRF.cmake index d47e39aa0e..55e136ef4e 100644 --- a/cmake/scripts/CreateGRF.cmake +++ b/cmake/scripts/CreateGRF.cmake @@ -11,6 +11,9 @@ endif() if(NOT GRFCODEC_EXECUTABLE) message(FATAL_ERROR "Script needs GRFCODEC_EXECUTABLE defined") endif() +if(NOT GRFID_EXECUTABLE) + message(FATAL_ERROR "Script needs GRFID_EXECUTABLE defined") +endif() if(NOT GRF_SOURCE_FOLDER) message(FATAL_ERROR "Script needs GRF_SOURCE_FOLDER defined") endif() @@ -47,7 +50,7 @@ if(RESULT) message(FATAL_ERROR "NFORenum failed") endif() -execute_process(COMMAND ${GRFCODEC_EXECUTABLE} -n -s -e -p1 ${GRF_SOURCE_FOLDER_NAME}.grf RESULT_VARIABLE RESULT) +execute_process(COMMAND ${GRFCODEC_EXECUTABLE} -n -s -e -g2 -p1 ${GRF_SOURCE_FOLDER_NAME}.grf RESULT_VARIABLE RESULT) if(RESULT) if(NOT RESULT MATCHES "^[0-9]*$") message(FATAL_ERROR "Failed to run GRFCodec (${RESULT}), please check GRFCODEC_EXECUTABLE variable") @@ -55,4 +58,15 @@ if(RESULT) message(FATAL_ERROR "GRFCodec failed") endif() +execute_process(COMMAND ${GRFID_EXECUTABLE} -m ${GRF_SOURCE_FOLDER_NAME}.grf OUTPUT_VARIABLE GRFID_HASH RESULT_VARIABLE RESULT) +if(RESULT) + if(NOT RESULT MATCHES "^[0-9]*$") + message(FATAL_ERROR "Failed to run GRFID (${RESULT}), please check GRFID_EXECUTABLE variable") + endif() + message(FATAL_ERROR "GRFID failed") +endif() + +file(WRITE ${GRF_BINARY_FILE}.hash ${GRFID_HASH}) + +# Copy build files back to the source directory. execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${GRF_SOURCE_FOLDER_NAME}.grf ${GRF_BINARY_FILE}) diff --git a/media/baseset/CMakeLists.txt b/media/baseset/CMakeLists.txt index e6c1538222..c01f080349 100644 --- a/media/baseset/CMakeLists.txt +++ b/media/baseset/CMakeLists.txt @@ -59,6 +59,7 @@ foreach(BASESET_SOURCE_FILE IN LISTS BASESET_SOURCE_FILES) MAIN_DEPENDENCY ${BASESET_SOURCE_FILE} DEPENDS ${LANG_SOURCE_FILES} ${BASESET_EXTRAGRF_FILE} + ${BASESET_EXTRAGRF_FILE}.hash ${CMAKE_SOURCE_DIR}/cmake/scripts/Baseset.cmake WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating ${BASESET_SOURCE_FILE_NAME} baseset metadata file" diff --git a/media/baseset/openttd.grf b/media/baseset/openttd.grf index dd8acf3e82..7f4f6cbc49 100644 Binary files a/media/baseset/openttd.grf and b/media/baseset/openttd.grf differ diff --git a/media/baseset/openttd.grf.hash b/media/baseset/openttd.grf.hash new file mode 100644 index 0000000000..25a50247f5 --- /dev/null +++ b/media/baseset/openttd.grf.hash @@ -0,0 +1 @@ +4f03553f614a06d86dc06376db3353c7 diff --git a/media/baseset/orig_extra.grf b/media/baseset/orig_extra.grf index 881c4631ce..9adc6e04f8 100644 Binary files a/media/baseset/orig_extra.grf and b/media/baseset/orig_extra.grf differ diff --git a/media/baseset/orig_extra.grf.hash b/media/baseset/orig_extra.grf.hash new file mode 100644 index 0000000000..3d6fe3d451 --- /dev/null +++ b/media/baseset/orig_extra.grf.hash @@ -0,0 +1 @@ +3e860a0e880e3dc90615facf5f455fc6 diff --git a/media/baseset/orig_extra/rivers/rapids.nfo b/media/baseset/orig_extra/rivers/rapids.nfo index e03d96ca17..b4ed88cd9e 100644 --- a/media/baseset/orig_extra/rivers/rapids.nfo +++ b/media/baseset/orig_extra/rivers/rapids.nfo @@ -5,115 +5,243 @@ // -1 * 0 0C "Rapid graphics" -1 * 4 01 05 01 04 - -1 sprites/rapids.png 8bpp 10 10 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 90 10 64 39 -31 -8 normal - -1 sprites/rapids.png 8bpp 170 10 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 250 10 64 39 -31 -8 normal + -1 sprites/rapids.png 8bpp 10 10 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 10 10 64 23 -31 0 normal + | sprites/rapids.png mask 10 10 + -1 sprites/rapids.png 8bpp 90 10 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 90 10 64 39 -31 -8 normal + | sprites/rapids.png mask 90 10 + -1 sprites/rapids.png 8bpp 170 10 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 170 10 64 23 -31 0 normal + | sprites/rapids.png mask 170 10 + -1 sprites/rapids.png 8bpp 250 10 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 250 10 64 39 -31 -8 normal + | sprites/rapids.png mask 250 10 -1 * 7 02 05 00 01 00 00 00 -1 * 4 01 05 01 04 - -1 sprites/rapids.png 8bpp 10 60 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 90 60 64 39 -31 -8 normal - -1 sprites/rapids.png 8bpp 170 60 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 250 60 64 39 -31 -8 normal + -1 sprites/rapids.png 8bpp 10 60 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 10 60 64 23 -31 0 normal + | sprites/rapids.png mask 10 60 + -1 sprites/rapids.png 8bpp 90 60 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 90 60 64 39 -31 -8 normal + | sprites/rapids.png mask 90 60 + -1 sprites/rapids.png 8bpp 170 60 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 170 60 64 23 -31 0 normal + | sprites/rapids.png mask 170 60 + -1 sprites/rapids.png 8bpp 250 60 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 250 60 64 39 -31 -8 normal + | sprites/rapids.png mask 250 60 -1 * 7 02 05 01 01 00 00 00 -1 * 4 01 05 01 04 - -1 sprites/rapids.png 8bpp 10 110 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 90 110 64 39 -31 -8 normal - -1 sprites/rapids.png 8bpp 170 110 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 250 110 64 39 -31 -8 normal + -1 sprites/rapids.png 8bpp 10 110 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 10 110 64 23 -31 0 normal + | sprites/rapids.png mask 10 110 + -1 sprites/rapids.png 8bpp 90 110 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 90 110 64 39 -31 -8 normal + | sprites/rapids.png mask 90 110 + -1 sprites/rapids.png 8bpp 170 110 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 170 110 64 23 -31 0 normal + | sprites/rapids.png mask 170 110 + -1 sprites/rapids.png 8bpp 250 110 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 250 110 64 39 -31 -8 normal + | sprites/rapids.png mask 250 110 -1 * 7 02 05 02 01 00 00 00 -1 * 4 01 05 01 04 - -1 sprites/rapids.png 8bpp 10 160 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 90 160 64 39 -31 -8 normal - -1 sprites/rapids.png 8bpp 170 160 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 250 160 64 39 -31 -8 normal + -1 sprites/rapids.png 8bpp 10 160 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 10 160 64 23 -31 0 normal + | sprites/rapids.png mask 10 160 + -1 sprites/rapids.png 8bpp 90 160 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 90 160 64 39 -31 -8 normal + | sprites/rapids.png mask 90 160 + -1 sprites/rapids.png 8bpp 170 160 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 170 160 64 23 -31 0 normal + | sprites/rapids.png mask 170 160 + -1 sprites/rapids.png 8bpp 250 160 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 250 160 64 39 -31 -8 normal + | sprites/rapids.png mask 250 160 -1 * 7 02 05 03 01 00 00 00 -1 * 4 01 05 01 04 - -1 sprites/rapids.png 8bpp 10 210 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 90 210 64 39 -31 -8 normal - -1 sprites/rapids.png 8bpp 170 210 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 250 210 64 39 -31 -8 normal + -1 sprites/rapids.png 8bpp 10 210 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 10 210 64 23 -31 0 normal + | sprites/rapids.png mask 10 210 + -1 sprites/rapids.png 8bpp 90 210 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 90 210 64 39 -31 -8 normal + | sprites/rapids.png mask 90 210 + -1 sprites/rapids.png 8bpp 170 210 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 170 210 64 23 -31 0 normal + | sprites/rapids.png mask 170 210 + -1 sprites/rapids.png 8bpp 250 210 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 250 210 64 39 -31 -8 normal + | sprites/rapids.png mask 250 210 -1 * 7 02 05 04 01 00 00 00 -1 * 4 01 05 01 04 - -1 sprites/rapids.png 8bpp 10 260 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 90 260 64 39 -31 -8 normal - -1 sprites/rapids.png 8bpp 170 260 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 250 260 64 39 -31 -8 normal + -1 sprites/rapids.png 8bpp 10 260 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 10 260 64 23 -31 0 normal + | sprites/rapids.png mask 10 260 + -1 sprites/rapids.png 8bpp 90 260 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 90 260 64 39 -31 -8 normal + | sprites/rapids.png mask 90 260 + -1 sprites/rapids.png 8bpp 170 260 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 170 260 64 23 -31 0 normal + | sprites/rapids.png mask 170 260 + -1 sprites/rapids.png 8bpp 250 260 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 250 260 64 39 -31 -8 normal + | sprites/rapids.png mask 250 260 -1 * 7 02 05 05 01 00 00 00 -1 * 4 01 05 01 04 - -1 sprites/rapids.png 8bpp 10 310 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 90 310 64 39 -31 -8 normal - -1 sprites/rapids.png 8bpp 170 310 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 250 310 64 39 -31 -8 normal + -1 sprites/rapids.png 8bpp 10 310 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 10 310 64 23 -31 0 normal + | sprites/rapids.png mask 10 310 + -1 sprites/rapids.png 8bpp 90 310 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 90 310 64 39 -31 -8 normal + | sprites/rapids.png mask 90 310 + -1 sprites/rapids.png 8bpp 170 310 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 170 310 64 23 -31 0 normal + | sprites/rapids.png mask 170 310 + -1 sprites/rapids.png 8bpp 250 310 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 250 310 64 39 -31 -8 normal + | sprites/rapids.png mask 250 310 -1 * 7 02 05 06 01 00 00 00 -1 * 4 01 05 01 04 - -1 sprites/rapids.png 8bpp 10 360 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 90 360 64 39 -31 -8 normal - -1 sprites/rapids.png 8bpp 170 360 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 250 360 64 39 -31 -8 normal + -1 sprites/rapids.png 8bpp 10 360 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 10 360 64 23 -31 0 normal + | sprites/rapids.png mask 10 360 + -1 sprites/rapids.png 8bpp 90 360 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 90 360 64 39 -31 -8 normal + | sprites/rapids.png mask 90 360 + -1 sprites/rapids.png 8bpp 170 360 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 170 360 64 23 -31 0 normal + | sprites/rapids.png mask 170 360 + -1 sprites/rapids.png 8bpp 250 360 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 250 360 64 39 -31 -8 normal + | sprites/rapids.png mask 250 360 -1 * 7 02 05 07 01 00 00 00 -1 * 4 01 05 01 04 - -1 sprites/rapids.png 8bpp 10 410 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 90 410 64 39 -31 -8 normal - -1 sprites/rapids.png 8bpp 170 410 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 250 410 64 39 -31 -8 normal + -1 sprites/rapids.png 8bpp 10 410 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 10 410 64 23 -31 0 normal + | sprites/rapids.png mask 10 410 + -1 sprites/rapids.png 8bpp 90 410 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 90 410 64 39 -31 -8 normal + | sprites/rapids.png mask 90 410 + -1 sprites/rapids.png 8bpp 170 410 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 170 410 64 23 -31 0 normal + | sprites/rapids.png mask 170 410 + -1 sprites/rapids.png 8bpp 250 410 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 250 410 64 39 -31 -8 normal + | sprites/rapids.png mask 250 410 -1 * 7 02 05 08 01 00 00 00 -1 * 4 01 05 01 04 - -1 sprites/rapids.png 8bpp 10 460 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 90 460 64 39 -31 -8 normal - -1 sprites/rapids.png 8bpp 170 460 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 250 460 64 39 -31 -8 normal + -1 sprites/rapids.png 8bpp 10 460 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 10 460 64 23 -31 0 normal + | sprites/rapids.png mask 10 460 + -1 sprites/rapids.png 8bpp 90 460 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 90 460 64 39 -31 -8 normal + | sprites/rapids.png mask 90 460 + -1 sprites/rapids.png 8bpp 170 460 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 170 460 64 23 -31 0 normal + | sprites/rapids.png mask 170 460 + -1 sprites/rapids.png 8bpp 250 460 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 250 460 64 39 -31 -8 normal + | sprites/rapids.png mask 250 460 -1 * 7 02 05 09 01 00 00 00 -1 * 4 01 05 01 04 - -1 sprites/rapids.png 8bpp 10 510 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 90 510 64 39 -31 -8 normal - -1 sprites/rapids.png 8bpp 170 510 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 250 510 64 39 -31 -8 normal + -1 sprites/rapids.png 8bpp 10 510 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 10 510 64 23 -31 0 normal + | sprites/rapids.png mask 10 510 + -1 sprites/rapids.png 8bpp 90 510 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 90 510 64 39 -31 -8 normal + | sprites/rapids.png mask 90 510 + -1 sprites/rapids.png 8bpp 170 510 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 170 510 64 23 -31 0 normal + | sprites/rapids.png mask 170 510 + -1 sprites/rapids.png 8bpp 250 510 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 250 510 64 39 -31 -8 normal + | sprites/rapids.png mask 250 510 -1 * 7 02 05 0A 01 00 00 00 -1 * 4 01 05 01 04 - -1 sprites/rapids.png 8bpp 10 560 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 90 560 64 39 -31 -8 normal - -1 sprites/rapids.png 8bpp 170 560 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 250 560 64 39 -31 -8 normal + -1 sprites/rapids.png 8bpp 10 560 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 10 560 64 23 -31 0 normal + | sprites/rapids.png mask 10 560 + -1 sprites/rapids.png 8bpp 90 560 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 90 560 64 39 -31 -8 normal + | sprites/rapids.png mask 90 560 + -1 sprites/rapids.png 8bpp 170 560 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 170 560 64 23 -31 0 normal + | sprites/rapids.png mask 170 560 + -1 sprites/rapids.png 8bpp 250 560 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 250 560 64 39 -31 -8 normal + | sprites/rapids.png mask 250 560 -1 * 7 02 05 0B 01 00 00 00 -1 * 4 01 05 01 04 - -1 sprites/rapids.png 8bpp 10 610 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 90 610 64 39 -31 -8 normal - -1 sprites/rapids.png 8bpp 170 610 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 250 610 64 39 -31 -8 normal + -1 sprites/rapids.png 8bpp 10 610 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 10 610 64 23 -31 0 normal + | sprites/rapids.png mask 10 610 + -1 sprites/rapids.png 8bpp 90 610 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 90 610 64 39 -31 -8 normal + | sprites/rapids.png mask 90 610 + -1 sprites/rapids.png 8bpp 170 610 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 170 610 64 23 -31 0 normal + | sprites/rapids.png mask 170 610 + -1 sprites/rapids.png 8bpp 250 610 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 250 610 64 39 -31 -8 normal + | sprites/rapids.png mask 250 610 -1 * 7 02 05 0C 01 00 00 00 -1 * 4 01 05 01 04 - -1 sprites/rapids.png 8bpp 10 660 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 90 660 64 39 -31 -8 normal - -1 sprites/rapids.png 8bpp 170 660 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 250 660 64 39 -31 -8 normal + -1 sprites/rapids.png 8bpp 10 660 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 10 660 64 23 -31 0 normal + | sprites/rapids.png mask 10 660 + -1 sprites/rapids.png 8bpp 90 660 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 90 660 64 39 -31 -8 normal + | sprites/rapids.png mask 90 660 + -1 sprites/rapids.png 8bpp 170 660 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 170 660 64 23 -31 0 normal + | sprites/rapids.png mask 170 660 + -1 sprites/rapids.png 8bpp 250 660 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 250 660 64 39 -31 -8 normal + | sprites/rapids.png mask 250 660 -1 * 7 02 05 0D 01 00 00 00 -1 * 4 01 05 01 04 - -1 sprites/rapids.png 8bpp 10 710 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 90 710 64 39 -31 -8 normal - -1 sprites/rapids.png 8bpp 170 710 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 250 710 64 39 -31 -8 normal + -1 sprites/rapids.png 8bpp 10 710 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 10 710 64 23 -31 0 normal + | sprites/rapids.png mask 10 710 + -1 sprites/rapids.png 8bpp 90 710 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 90 710 64 39 -31 -8 normal + | sprites/rapids.png mask 90 710 + -1 sprites/rapids.png 8bpp 170 710 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 170 710 64 23 -31 0 normal + | sprites/rapids.png mask 170 710 + -1 sprites/rapids.png 8bpp 250 710 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 250 710 64 39 -31 -8 normal + | sprites/rapids.png mask 250 710 -1 * 7 02 05 0E 01 00 00 00 -1 * 4 01 05 01 04 - -1 sprites/rapids.png 8bpp 10 760 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 90 760 64 39 -31 -8 normal - -1 sprites/rapids.png 8bpp 170 760 64 23 -31 0 normal - -1 sprites/rapids.png 8bpp 250 760 64 39 -31 -8 normal + -1 sprites/rapids.png 8bpp 10 760 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 10 760 64 23 -31 0 normal + | sprites/rapids.png mask 10 760 + -1 sprites/rapids.png 8bpp 90 760 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 90 760 64 39 -31 -8 normal + | sprites/rapids.png mask 90 760 + -1 sprites/rapids.png 8bpp 170 760 64 23 -31 0 normal + | sprites/rapids_shading.png 32bpp 170 760 64 23 -31 0 normal + | sprites/rapids.png mask 170 760 + -1 sprites/rapids.png 8bpp 250 760 64 39 -31 -8 normal + | sprites/rapids_shading.png 32bpp 250 760 64 39 -31 -8 normal + | sprites/rapids.png mask 250 760 -1 * 7 02 05 0F 01 00 00 00 -1 * 39 02 05 10 80 00 01 10 diff --git a/media/baseset/orig_extra/rivers/rapids_shading.png b/media/baseset/orig_extra/rivers/rapids_shading.png new file mode 100644 index 0000000000..2606f9d565 Binary files /dev/null and b/media/baseset/orig_extra/rivers/rapids_shading.png differ diff --git a/src/articulated_vehicles.cpp b/src/articulated_vehicles.cpp index 00aa611dc0..a2d06f83e7 100644 --- a/src/articulated_vehicles.cpp +++ b/src/articulated_vehicles.cpp @@ -539,6 +539,7 @@ void AddArticulatedParts(Vehicle *first) if (flip_image) v->spritenum++; + if (v->type == VEH_TRAIN && TestVehicleBuildProbability(v, v->engine_type, BuildProbabilityType::Reversed)) SetBit(Train::From(v)->flags, VRF_REVERSE_DIRECTION); v->UpdatePosition(); } } diff --git a/src/depot_gui.cpp b/src/depot_gui.cpp index f503f14e17..fdc90f5794 100644 --- a/src/depot_gui.cpp +++ b/src/depot_gui.cpp @@ -462,11 +462,9 @@ struct DepotWindow : Window { ym = (y - matrix_widget->pos_y) % this->resize.step_height; int row = this->vscroll->GetScrolledRowFromWidget(y, this, WID_D_MATRIX); - if (row == INT_MAX) return MODE_ERROR; - uint pos = (row * this->num_columns) + xt; - if (this->vehicle_list.size() + this->wagon_list.size() <= pos) { + if (row == INT_MAX || this->vehicle_list.size() + this->wagon_list.size() <= pos) { /* Clicking on 'line' / 'block' without a vehicle */ if (this->type == VEH_TRAIN) { /* End the dragging */ diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp index 3327ee2a07..70b99052d8 100644 --- a/src/genworld_gui.cpp +++ b/src/genworld_gui.cpp @@ -196,13 +196,13 @@ static const NWidgetPart _nested_generate_landscape_widgets[] = { /* AI, GS, and NewGRF settings */ NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), - NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_GL_AI_BUTTON), SetMinimalSize(0, 24), SetDataTip(STR_MAPGEN_AI_SETTINGS, STR_MAPGEN_AI_SETTINGS_TOOLTIP), SetFill(1, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_GL_GS_BUTTON), SetMinimalSize(0, 24), SetDataTip(STR_MAPGEN_GS_SETTINGS, STR_MAPGEN_GS_SETTINGS_TOOLTIP), SetFill(1, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_GL_NEWGRF_BUTTON), SetMinimalSize(0, 24), SetDataTip(STR_MAPGEN_NEWGRF_SETTINGS, STR_MAPGEN_NEWGRF_SETTINGS_TOOLTIP), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_GL_AI_BUTTON), SetMinimalTextLines(2, 0), SetDataTip(STR_MAPGEN_AI_SETTINGS, STR_MAPGEN_AI_SETTINGS_TOOLTIP), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_GL_GS_BUTTON), SetMinimalTextLines(2, 0), SetDataTip(STR_MAPGEN_GS_SETTINGS, STR_MAPGEN_GS_SETTINGS_TOOLTIP), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_GL_NEWGRF_BUTTON), SetMinimalTextLines(2, 0), SetDataTip(STR_MAPGEN_NEWGRF_SETTINGS, STR_MAPGEN_NEWGRF_SETTINGS_TOOLTIP), SetFill(1, 0), EndContainer(), /* Generate */ - NWidget(WWT_PUSHTXTBTN, COLOUR_GREEN, WID_GL_GENERATE_BUTTON), SetMinimalSize(84, 36), SetDataTip(STR_MAPGEN_GENERATE, STR_NULL), SetFill(1, 1), + NWidget(WWT_PUSHTXTBTN, COLOUR_GREEN, WID_GL_GENERATE_BUTTON), SetMinimalTextLines(3, 0), SetDataTip(STR_MAPGEN_GENERATE, STR_NULL), SetFill(1, 1), EndContainer(), EndContainer(), }; @@ -327,13 +327,13 @@ static const NWidgetPart _nested_heightmap_load_widgets[] = { /* AI, GS, and NewGRF settings */ NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), - NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_GL_AI_BUTTON), SetMinimalSize(0, 24), SetDataTip(STR_MAPGEN_AI_SETTINGS, STR_MAPGEN_AI_SETTINGS_TOOLTIP), SetFill(1, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_GL_GS_BUTTON), SetMinimalSize(0, 24), SetDataTip(STR_MAPGEN_GS_SETTINGS, STR_MAPGEN_GS_SETTINGS_TOOLTIP), SetFill(1, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_GL_NEWGRF_BUTTON), SetMinimalSize(0, 24), SetDataTip(STR_MAPGEN_NEWGRF_SETTINGS, STR_MAPGEN_NEWGRF_SETTINGS_TOOLTIP), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_GL_AI_BUTTON), SetMinimalTextLines(2, 0), SetDataTip(STR_MAPGEN_AI_SETTINGS, STR_MAPGEN_AI_SETTINGS_TOOLTIP), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_GL_GS_BUTTON), SetMinimalTextLines(2, 0), SetDataTip(STR_MAPGEN_GS_SETTINGS, STR_MAPGEN_GS_SETTINGS_TOOLTIP), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_GL_NEWGRF_BUTTON), SetMinimalTextLines(2, 0), SetDataTip(STR_MAPGEN_NEWGRF_SETTINGS, STR_MAPGEN_NEWGRF_SETTINGS_TOOLTIP), SetFill(1, 0), EndContainer(), /* Generate */ - NWidget(WWT_PUSHTXTBTN, COLOUR_GREEN, WID_GL_GENERATE_BUTTON), SetMinimalSize(84, 36), SetDataTip(STR_MAPGEN_GENERATE, STR_NULL), SetFill(1, 1), + NWidget(WWT_PUSHTXTBTN, COLOUR_GREEN, WID_GL_GENERATE_BUTTON), SetMinimalTextLines(3, 0), SetDataTip(STR_MAPGEN_GENERATE, STR_NULL), SetFill(1, 1), EndContainer(), EndContainer(), }; @@ -648,6 +648,12 @@ struct GenerateLandscapeWindow : public Window { Dimension d{0, (uint)GetCharacterHeight(FS_NORMAL)}; const StringID *strs = nullptr; switch (widget) { + case WID_GL_TEMPERATE: case WID_GL_ARCTIC: + case WID_GL_TROPICAL: case WID_GL_TOYLAND: + size->width += WidgetDimensions::scaled.fullbevel.Horizontal(); + size->height += WidgetDimensions::scaled.fullbevel.Vertical(); + break; + case WID_GL_HEIGHTMAP_HEIGHT_TEXT: SetDParam(0, MAX_TILE_HEIGHT); d = GetStringBoundingBox(STR_JUST_INT); @@ -1268,6 +1274,12 @@ struct CreateScenarioWindow : public Window { StringID str = STR_JUST_INT; switch (widget) { + case WID_CS_TEMPERATE: case WID_CS_ARCTIC: + case WID_CS_TROPICAL: case WID_CS_TOYLAND: + size->width += WidgetDimensions::scaled.fullbevel.Horizontal(); + size->height += WidgetDimensions::scaled.fullbevel.Vertical(); + break; + case WID_CS_START_DATE_TEXT: SetDParam(0, ConvertYMDToDate(MAX_YEAR, 0, 1)); str = STR_JUST_DATE_LONG; diff --git a/src/gfx.cpp b/src/gfx.cpp index 8cabb1c6a6..795e6ee7fc 100644 --- a/src/gfx.cpp +++ b/src/gfx.cpp @@ -486,6 +486,21 @@ void DrawBox(const DrawPixelInfo *dpi, int x, int y, int dx1, int dy1, int dx2, GfxDrawLineUnscaled(dpi, x + dx3, y + dy3, x + dx3 + dx2, y + dy3 + dy2, colour); } +/** + * Draw the outline of a Rect + * @param r Rect to draw. + * @param colour Colour of the outline. + * @param width Width of the outline. + * @param dash Length of dashes for dashed lines. 0 means solid lines. + */ +void DrawRectOutline(const Rect &r, int colour, int width, int dash) +{ + GfxDrawLine(r.left, r.top, r.right, r.top, colour, width, dash); + GfxDrawLine(r.left, r.top, r.left, r.bottom, colour, width, dash); + GfxDrawLine(r.right, r.top, r.right, r.bottom, colour, width, dash); + GfxDrawLine(r.left, r.bottom, r.right, r.bottom, colour, width, dash); +} + /** * Set the colour remap to be for the given colour. * @param colour the new colour of the remap. diff --git a/src/gfx_func.h b/src/gfx_func.h index 293a9a2af8..a6d275378e 100644 --- a/src/gfx_func.h +++ b/src/gfx_func.h @@ -123,6 +123,7 @@ void GfxFillPolygon(const std::vector &shape, int colour, FillRectMode mo void GfxDrawLine(const DrawPixelInfo *dpi, int left, int top, int right, int bottom, int colour, int width = 1, int dash = 0); inline void GfxDrawLine(int left, int top, int right, int bottom, int colour, int width = 1, int dash = 0) { GfxDrawLine(_cur_dpi, left, top, right, bottom, colour, width, dash); } void DrawBox(const DrawPixelInfo *dpi, int x, int y, int dx1, int dy1, int dx2, int dy2, int dx3, int dy3); +void DrawRectOutline(const Rect &r, int colour, int width = 1, int dash = 0); /* Versions of DrawString/DrawStringMultiLine that accept a Rect instead of separate left, right, top and bottom parameters. */ static inline int DrawString(const Rect &r, std::string_view str, TextColour colour = TC_FROMSTRING, StringAlignment align = SA_LEFT, bool underline = false, FontSize fontsize = FS_NORMAL) diff --git a/src/help_gui.cpp b/src/help_gui.cpp index 4ee33529d0..ea318dbda7 100644 --- a/src/help_gui.cpp +++ b/src/help_gui.cpp @@ -145,16 +145,16 @@ struct HelpWindow : public Window { new GameManualTextfileWindow(LICENSE_FILENAME); break; case WID_HW_WEBSITE: - OpenBrowser(WEBSITE_LINK.c_str()); + OpenBrowser(WEBSITE_LINK); break; case WID_HW_WIKI: - OpenBrowser(WIKI_LINK.c_str()); + OpenBrowser(WIKI_LINK); break; case WID_HW_BUGTRACKER: - OpenBrowser(BUGTRACKER_LINK.c_str()); + OpenBrowser(BUGTRACKER_LINK); break; case WID_HW_COMMUNITY: - OpenBrowser(COMMUNITY_LINK.c_str()); + OpenBrowser(COMMUNITY_LINK); break; } } diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index 3408f473f4..5307703139 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -415,22 +415,20 @@ static void AddAcceptedCargo_Industry(TileIndex tile, CargoArray &acceptance, Ca const Industry *ind = Industry::GetByTile(tile); /* Starting point for acceptance */ - CargoID accepts_cargo[lengthof(itspec->accepts_cargo)]; - int8 cargo_acceptance[lengthof(itspec->acceptance)]; - MemCpyT(accepts_cargo, itspec->accepts_cargo, lengthof(accepts_cargo)); - MemCpyT(cargo_acceptance, itspec->acceptance, lengthof(cargo_acceptance)); + auto accepts_cargo = itspec->accepts_cargo; + auto cargo_acceptance = itspec->acceptance; if (itspec->special_flags & INDTILE_SPECIAL_ACCEPTS_ALL_CARGO) { /* Copy all accepted cargoes from industry itself */ for (uint i = 0; i < lengthof(ind->accepts_cargo); i++) { - CargoID *pos = std::find(accepts_cargo, endof(accepts_cargo), ind->accepts_cargo[i]); - if (pos == endof(accepts_cargo)) { + auto pos = std::find(std::begin(accepts_cargo), std::end(accepts_cargo), ind->accepts_cargo[i]); + if (pos == std::end(accepts_cargo)) { /* Not found, insert */ - pos = std::find(accepts_cargo, endof(accepts_cargo), CT_INVALID); - if (pos == endof(accepts_cargo)) continue; // nowhere to place, give up on this one + pos = std::find(std::begin(accepts_cargo), std::end(accepts_cargo), CT_INVALID); + if (pos == std::end(accepts_cargo)) continue; // nowhere to place, give up on this one *pos = ind->accepts_cargo[i]; } - cargo_acceptance[pos - accepts_cargo] += 8; + cargo_acceptance[std::distance(std::begin(accepts_cargo), pos)] += 8; } } @@ -438,7 +436,7 @@ static void AddAcceptedCargo_Industry(TileIndex tile, CargoArray &acceptance, Ca /* Try callback for accepts list, if success override all existing accepts */ uint16 res = GetIndustryTileCallback(CBID_INDTILE_ACCEPT_CARGO, 0, 0, gfx, Industry::GetByTile(tile), tile); if (res != CALLBACK_FAILED) { - MemSetT(accepts_cargo, CT_INVALID, lengthof(accepts_cargo)); + accepts_cargo.fill(CT_INVALID); for (uint i = 0; i < 3; i++) accepts_cargo[i] = GetCargoTranslation(GB(res, i * 5, 5), itspec->grf_prop.grffile); } } @@ -447,12 +445,12 @@ static void AddAcceptedCargo_Industry(TileIndex tile, CargoArray &acceptance, Ca /* Try callback for acceptance list, if success override all existing acceptance */ uint16 res = GetIndustryTileCallback(CBID_INDTILE_CARGO_ACCEPTANCE, 0, 0, gfx, Industry::GetByTile(tile), tile); if (res != CALLBACK_FAILED) { - MemSetT(cargo_acceptance, 0, lengthof(cargo_acceptance)); + cargo_acceptance.fill(0); for (uint i = 0; i < 3; i++) cargo_acceptance[i] = GB(res, i * 4, 4); } } - for (byte i = 0; i < lengthof(itspec->accepts_cargo); i++) { + for (byte i = 0; i < std::size(itspec->accepts_cargo); i++) { CargoID a = accepts_cargo[i]; if (a == CT_INVALID || cargo_acceptance[i] <= 0) continue; // work only with valid cargoes diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index 4c5969736c..50c44778fd 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -2156,10 +2156,7 @@ struct CargoesField { int ypos1 = ypos + vert_inter_industry_space / 2; int ypos2 = ypos + normal_height - 1 - vert_inter_industry_space / 2; int xpos2 = xpos + industry_width - 1; - GfxDrawLine(xpos, ypos1, xpos2, ypos1, INDUSTRY_LINE_COLOUR); - GfxDrawLine(xpos, ypos1, xpos, ypos2, INDUSTRY_LINE_COLOUR); - GfxDrawLine(xpos, ypos2, xpos2, ypos2, INDUSTRY_LINE_COLOUR); - GfxDrawLine(xpos2, ypos1, xpos2, ypos2, INDUSTRY_LINE_COLOUR); + DrawRectOutline({xpos, ypos1, xpos2, ypos2}, INDUSTRY_LINE_COLOUR); ypos += (normal_height - GetCharacterHeight(FS_NORMAL)) / 2; if (this->u.industry.ind_type < NUM_INDUSTRYTYPES) { const IndustrySpec *indsp = GetIndustrySpec(this->u.industry.ind_type); diff --git a/src/industrytype.h b/src/industrytype.h index f4cf60249a..ca6272c97d 100644 --- a/src/industrytype.h +++ b/src/industrytype.h @@ -155,8 +155,8 @@ struct IndustrySpec { * @note A tile can at most accept 3 types of cargo, even if an industry as a whole can accept more types. */ struct IndustryTileSpec { - CargoID accepts_cargo[INDUSTRY_NUM_INPUTS]; ///< Cargo accepted by this tile - int8 acceptance[INDUSTRY_NUM_INPUTS]; ///< Level of acceptance per cargo type (signed, may be negative!) + std::array accepts_cargo; ///< Cargo accepted by this tile + std::array acceptance; ///< Level of acceptance per cargo type (signed, may be negative!) Slope slopes_refused; ///< slope pattern on which this tile cannot be built byte anim_production; ///< Animation frame to start when goods are produced byte anim_next; ///< Next frame in an animation diff --git a/src/infrastructure.cpp b/src/infrastructure.cpp index 297b25f536..fe7306bc46 100644 --- a/src/infrastructure.cpp +++ b/src/infrastructure.cpp @@ -110,7 +110,7 @@ static bool VehiclePositionIsAllowed(const Vehicle *v, Owner owner = INVALID_OWN case VEH_ROAD: for (const Vehicle *u = v; u != nullptr; u = u->Next()) { if (!IsValidTile(u->tile)) continue; - if (IsRoadDepotTile(u->tile) || IsStandardRoadStopTile(u->tile)) { + if (IsRoadDepotTile(u->tile) || IsBayRoadStopTile(u->tile)) { if (!IsInfraTileUsageAllowed(VEH_ROAD, v->owner, u->tile) || GetTileOwner(u->tile) == owner) return false; } } diff --git a/src/intro_gui.cpp b/src/intro_gui.cpp index 814e2d7a6f..c23fdaf7c9 100644 --- a/src/intro_gui.cpp +++ b/src/intro_gui.cpp @@ -298,6 +298,17 @@ struct SelectGameWindow : public Window { } } + void UpdateWidgetSize(int widget, Dimension *size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension *fill, [[maybe_unused]] Dimension *resize) override + { + switch (widget) { + case WID_SGI_TEMPERATE_LANDSCAPE: case WID_SGI_ARCTIC_LANDSCAPE: + case WID_SGI_TROPIC_LANDSCAPE: case WID_SGI_TOYLAND_LANDSCAPE: + size->width += WidgetDimensions::scaled.fullbevel.Horizontal(); + size->height += WidgetDimensions::scaled.fullbevel.Vertical(); + break; + } + } + void OnResize() override { bool changed = false; diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 8cfc326ac7..cce78a8e5d 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -402,31 +402,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Deurskynende ge STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Deurskynende stasie tekens # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Stoor spel STR_FILE_MENU_LOAD_GAME :Laai spel STR_FILE_MENU_QUIT_GAME :Verlaat spel -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Verlaat # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Kaart van wêreld STR_MAP_MENU_EXTRA_VIEWPORT :Ekstra toonvenster STR_MAP_MENU_LINGRAPH_LEGEND :Vragverspreidingsleutel STR_MAP_MENU_SIGN_LIST :Teken lys # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Dorp gids STR_TOWN_MENU_FOUND_TOWN :Stig dorp # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subsidies # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Bedryfswins grafiek STR_GRAPH_MENU_INCOME_GRAPH :Inkomste grafiek STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Gelewerde vrag grafiek @@ -435,57 +429,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Maatskappy waar STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Vragbetalingstariewe # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Maatskappy verbond tabel STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Omstandig prestasie gradering STR_GRAPH_MENU_HIGHSCORE :Hoogste tellings tafel # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Nywerheid Gids STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Nywerheidsskakels STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Konsolideer nuwe nywerheid # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Spoorwegkonstruksie STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Elekriese spoorwegkonstruksie STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Monospoor konstruksie STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Magneetsweeftrein konstruksie # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Pad konstruksie STR_ROAD_MENU_TRAM_CONSTRUCTION :Tremweg konstruksie # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Waterweg konstruksie # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Lughawe konstruksie # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Landargitektuur STR_LANDSCAPING_MENU_PLANT_TREES :Plant bome STR_LANDSCAPING_MENU_PLACE_SIGN :Plaas teken # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Klank/musiek # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Laaste boodskap/nuus verslag STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Boodskapgeskiedenis STR_NEWS_MENU_DELETE_ALL_MESSAGES :Vee alle boodskappe uit # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Terreininligting -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Skakel terminaal STR_ABOUT_MENU_AI_DEBUG :AI/Spel skript ontfout STR_ABOUT_MENU_SCREENSHOT :Skermskoot diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 49750bc89c..f3ba25e5a2 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -402,31 +402,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :مباني شف STR_SETTINGS_MENU_TRANSPARENT_SIGNS :اسماء المحطات شفافة # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :حفظ STR_FILE_MENU_LOAD_GAME :تحميل STR_FILE_MENU_QUIT_GAME :اغلاق اللعبة -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :خروج # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :خريطة العالم STR_MAP_MENU_EXTRA_VIEWPORT :شاشة عرض اضافية STR_MAP_MENU_LINGRAPH_LEGEND :مفتاح تدفق البضائع STR_MAP_MENU_SIGN_LIST :قائمة العلامات # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :دليل المدن STR_TOWN_MENU_FOUND_TOWN :جد المدينة # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :العروض # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :مخطط التشغيل STR_GRAPH_MENU_INCOME_GRAPH :مخطط الارباح STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :مخطط البضاعة المشحونة @@ -435,57 +429,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :مخطط قيم STR_GRAPH_MENU_CARGO_PAYMENT_RATES :معدل تكلفة النقل # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :ترتيب الشركات STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :تقييم أداء مفصل STR_GRAPH_MENU_HIGHSCORE :قائمه المتفوقين # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :دليل المصانع STR_INDUSTRY_MENU_INDUSTRY_CHAIN :سلاسل الصناعة STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :مول بناء مصنع # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :بناء سكة قطار حديدية STR_RAIL_MENU_ELRAIL_CONSTRUCTION :بناء سكة الحديد الكهربائية STR_RAIL_MENU_MONORAIL_CONSTRUCTION :بناء سكة قطار احادية STR_RAIL_MENU_MAGLEV_CONSTRUCTION :بناء سكة قطار ممغنطة # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :بناء الطرق STR_ROAD_MENU_TRAM_CONSTRUCTION :بناء الترام # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :بناء ممرات مائيه # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :بناء المطار # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :تصميم الخريطة STR_LANDSCAPING_MENU_PLANT_TREES :زراعة اشجار STR_LANDSCAPING_MENU_PLACE_SIGN :وضع علامات # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :الموسيقى/الصوت # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :الرسالة الأخيرة/التقرير الجديد STR_NEWS_MENU_MESSAGE_HISTORY_MENU :الرسائل السابقة STR_NEWS_MENU_DELETE_ALL_MESSAGES :احذف كل الرسائل # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :معلومات مربع في الخريطة -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :توقل كونسول STR_ABOUT_MENU_AI_DEBUG :مكتشف اخطاء الذكاء الصناعي STR_ABOUT_MENU_SCREENSHOT :صورة من الشاشة - Ctrl-S - diff --git a/src/lang/basque.txt b/src/lang/basque.txt index 1a1905c70a..998d533fe3 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -391,30 +391,24 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Eraikin transpa STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Geltoki errotulu transparenteak # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Jokoa gorde STR_FILE_MENU_LOAD_GAME :Jokoa kargatu STR_FILE_MENU_QUIT_GAME :Jokoa utzi -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Irten # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Munduko mapa STR_MAP_MENU_EXTRA_VIEWPORT :lehio extra STR_MAP_MENU_SIGN_LIST :Seinale zerrenda # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Herri direktorioa STR_TOWN_MENU_FOUND_TOWN :Herria eraiki # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subsidioak # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Operazio benefizioen grafikoa STR_GRAPH_MENU_INCOME_GRAPH :Irabazien grafikoa STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Entregatutako zama grafikoa @@ -423,56 +417,45 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Konpaniako bali STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Zama salneurriak # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Konpanien ligaren tabloia STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Errendimentu xehetuaren tasa STR_GRAPH_MENU_HIGHSCORE :Puntuazio taula # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Industria direktorioa STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Industri katea STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Industria berri bat eraiki # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Trenbidea eraiki STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Trenbide elektrikoa eraiki STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Monorail trenbidea eraiki STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Trenbide magnetikoa eraiki # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Errepidea eraiki STR_ROAD_MENU_TRAM_CONSTRUCTION :Tranbia eraiki # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Urbideak eraiki # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Aireportua eraiki # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Paisai editorea STR_LANDSCAPING_MENU_PLANT_TREES :Zuhaitzak landatu STR_LANDSCAPING_MENU_PLACE_SIGN :Kartela jarri # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Soinua/musika # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Azken mezua/albiste erreportaia STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Mezuen historia # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Lur arearen informazioa -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Konsola aktibatu STR_ABOUT_MENU_AI_DEBUG :IA/Joko script-aren garbitzailea STR_ABOUT_MENU_SCREENSHOT :Pantailan dagoenaren argazkia hartu (Ctrl+S) diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index c3522b3588..2b9c774d93 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -711,31 +711,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Празрыс STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Празрыстыя надпісы # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Захаваць гульню STR_FILE_MENU_LOAD_GAME :Загрузіць гульню STR_FILE_MENU_QUIT_GAME :Да галоўнага мэню -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Выхад # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Мапа сусьвету STR_MAP_MENU_EXTRA_VIEWPORT :Дадатковае вакно прагляду STR_MAP_MENU_LINGRAPH_LEGEND :Леґенда грузаперавозак STR_MAP_MENU_SIGN_LIST :Сьпіс таблічак # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Сьпіс гарадоў STR_TOWN_MENU_FOUND_TOWN :Заснаваць горад # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Субсыдыі # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Ґрафік прыбытку STR_GRAPH_MENU_INCOME_GRAPH :Ґрафік даходу STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Ґрафік дастаўленага грузу @@ -744,57 +738,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Ґрафік в STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Ґрафік аплаты перавозак # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Табліца фірмаў STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Дэталізаваны рэйтынґ кампаніі STR_GRAPH_MENU_HIGHSCORE :Табліца рэкордаў # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Пералік прамысловасьці STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Вытворчыя ланцужкі STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Заснаваць новае прадпрыемства # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Будаўніцтва чыгункі STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Будаўніцтва электрыфікаванай чыгункі STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Будаўніцтва монарэйкавай дарогі STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Будаўніцтва маґлева # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Будаўніцтва дарогаў STR_ROAD_MENU_TRAM_CONSTRUCTION :Будаўніцтва трамвайных каляiнаў # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Будаўніцтва водных камунікацыяў # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Будаўніцтва аэрапортаў # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Ляндшафт STR_LANDSCAPING_MENU_PLANT_TREES :Пасадзіць дрэвы STR_LANDSCAPING_MENU_PLACE_SIGN :Паставіць метку # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Гукі/музыка # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Апошняе паведамленьне STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Гісторыя паведамленьняў STR_NEWS_MENU_DELETE_ALL_MESSAGES :Выдаліць усе паведамленьні # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Зьвесткі аб зямлі -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Кансоль STR_ABOUT_MENU_AI_DEBUG :Наладка штучнага інтэлекту (ШІ/AI) / скрыптоў STR_ABOUT_MENU_SCREENSHOT :Здымак экрана (Ctrl+S) diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 17523c4126..a6f8caa1d1 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -441,31 +441,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Edifícios tran STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Placas de estações transparentes # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Salvar jogo STR_FILE_MENU_LOAD_GAME :Carregar jogo STR_FILE_MENU_QUIT_GAME :Abandonar jogo -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Sair # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Mapa do mundo STR_MAP_MENU_EXTRA_VIEWPORT :Janela extra STR_MAP_MENU_LINGRAPH_LEGEND :Legenda do fluxo de carga STR_MAP_MENU_SIGN_LIST :Lista de sinais # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Lista de cidades STR_TOWN_MENU_FOUND_TOWN :Fundar cidade # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subsídios # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Gráfico de lucro operacional STR_GRAPH_MENU_INCOME_GRAPH :Gráfico de renda STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Gráfico de carga entregue @@ -474,58 +468,47 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Gráfico de ava STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Taxa de pagamento de carga # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Tabela da liga de empresa STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Avaliação detalhada de performance STR_GRAPH_MENU_HIGHSCORE :Tabela de Pontuações # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Catálogo de indústrias STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Cadeias de indústrias STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Financiar nova indústria # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Construção de ferrovia STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Construção de ferrovia elétrificada STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Construção de monotrilho STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Construção de Maglev # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Construção de rodovia STR_ROAD_MENU_TRAM_CONSTRUCTION :Construção de Bonde # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Construção de canais # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Construção de aeroporto # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Paisagismo STR_LANDSCAPING_MENU_PLANT_TREES :Plantar árvores STR_LANDSCAPING_MENU_PLACE_SIGN :Colocar sinal # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Som/música # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Última mensagem/notícia STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Histórico de Mensagens STR_NEWS_MENU_DELETE_ALL_MESSAGES :Apagar todas as mensagens # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informação da área do terreno STR_ABOUT_MENU_HELP :Ajuda & manuais -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Alternar console STR_ABOUT_MENU_AI_DEBUG :Depurar IA/Script do jogo STR_ABOUT_MENU_SCREENSHOT :Captura de tela diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 2e442359cb..bbd2c1ba98 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -395,30 +395,24 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Прозрач STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Прозрачни табели # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Запази игра STR_FILE_MENU_LOAD_GAME :Отваряне на игра STR_FILE_MENU_QUIT_GAME :Прекъсване на играта -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Изход # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Карта на света STR_MAP_MENU_EXTRA_VIEWPORT :Допълнителна камера STR_MAP_MENU_SIGN_LIST :Списък с табели # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Списък с градовете STR_TOWN_MENU_FOUND_TOWN :Основи град # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Субсидии # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Графика на капитала STR_GRAPH_MENU_INCOME_GRAPH :Графика на приходите STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Графика на доставките @@ -427,57 +421,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Стойнос STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Тарифи за доставка на стоки # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Класиране на компаниите STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Рейтинг на представянето в детайли STR_GRAPH_MENU_HIGHSCORE :Таблица с най-добрите резултати # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Списък на индустриите STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Индустриални вериги STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Инвестирай в нова индустрия # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Конструиране на Двурелсов път STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Строене на електрифицирана ЖП мрежа STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Конструиране на Еднорелсов път STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Конструиране на Магниторелсов път # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Пътно строителство STR_ROAD_MENU_TRAM_CONSTRUCTION :Трамвайно строителство # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Воднопътен строеж # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Строене на летище # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Тераформиране STR_LANDSCAPING_MENU_PLANT_TREES :Засаждане на дървета STR_LANDSCAPING_MENU_PLACE_SIGN :Поставяне на знак # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Звук/музика # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Последно съобщение/новини STR_NEWS_MENU_MESSAGE_HISTORY_MENU :История на съобщенията STR_NEWS_MENU_DELETE_ALL_MESSAGES :Изтрий всички съобщения # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Информация за терена -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Показване/скриване на конзола STR_ABOUT_MENU_AI_DEBUG :ИИ дебъг STR_ABOUT_MENU_SCREENSHOT :Screenshot diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 881be8c9e7..b0818882d1 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -441,31 +441,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Edificis transp STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Senyals transparents # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Desa la partida STR_FILE_MENU_LOAD_GAME :Carrega una partida STR_FILE_MENU_QUIT_GAME :Abandona la partida -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Surt # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Mapa del món STR_MAP_MENU_EXTRA_VIEWPORT :Vista extra STR_MAP_MENU_LINGRAPH_LEGEND :Llegenda del flux de càrrega STR_MAP_MENU_SIGN_LIST :Llista de senyals # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Llista de poblacions STR_TOWN_MENU_FOUND_TOWN :Funda una població # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subvencions # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Gràfic de beneficis operatius STR_GRAPH_MENU_INCOME_GRAPH :Gràfic d'ingressos STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Gràfic d'entrega de càrrega @@ -474,58 +468,47 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Gràfic del val STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Tarifes de pagament per càrrega # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Taula de la lliga de companyies STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Detall de ratis de rendiment STR_GRAPH_MENU_HIGHSCORE :Taula de puntuacions # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Llista d'indústries STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Cadenes industrials STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Finança una nova indústria # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Construcció de ferrocarril STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Construcció de ferrocarril elèctric STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Construcció de monorail STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Construcció de maglev # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Construcció de carreteres STR_ROAD_MENU_TRAM_CONSTRUCTION :Construcció de tramvies # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Construcció de canals # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Construcció d'aeroports # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Modificació del paisatge STR_LANDSCAPING_MENU_PLANT_TREES :Planta arbres STR_LANDSCAPING_MENU_PLACE_SIGN :Situa un senyal # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :So/música # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Darrer missatge/notícia STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Historial de missatges STR_NEWS_MENU_DELETE_ALL_MESSAGES :Esborra tots els missatges # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informació de la casella STR_ABOUT_MENU_HELP :Ajuda i manuals -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Commuta la consola STR_ABOUT_MENU_AI_DEBUG :Depuració de les IA i l'script de partida STR_ABOUT_MENU_SCREENSHOT :Captura de pantalla diff --git a/src/lang/chuvash.txt b/src/lang/chuvash.txt index 4a97f5217a..3d107a16da 100644 --- a/src/lang/chuvash.txt +++ b/src/lang/chuvash.txt @@ -234,55 +234,38 @@ STR_SETTINGS_MENU_GAME_OPTIONS :Вӑййи ма STR_SETTINGS_MENU_NEWGRF_SETTINGS :NewGRF майлаштару # File menu -###length 5 -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Тух # Map menu -###length 4 # Town menu -###length 2 # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Грантсем # Graph menu -###length 6 # Company league menu -###length 3 # Industry menu -###length 3 # URailway construction menu -###length 4 # Road construction menu -###length 2 # Waterways construction menu -###length 1 # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Аэропорт ҫурт # Landscaping menu -###length 3 # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Сасӑ/Юрӑ-кӗвӗ # Message menu -###length 3 # About menu -###length 12 -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_SCREENSHOT :Экран сӑнӗ STR_ABOUT_MENU_ABOUT_OPENTTD :'OpenTTD' çинчен diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 6b55a490ca..4db0d4b144 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -500,31 +500,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Prozirne građe STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Prozirni znakovi # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Spremi igru STR_FILE_MENU_LOAD_GAME :Učitaj igru STR_FILE_MENU_QUIT_GAME :Napusti igru -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Izlaz # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Karta svijeta STR_MAP_MENU_EXTRA_VIEWPORT :Dodatni pogled STR_MAP_MENU_LINGRAPH_LEGEND :Legenda protoka tereta STR_MAP_MENU_SIGN_LIST :Popis znakova # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Popis gradova STR_TOWN_MENU_FOUND_TOWN :Osnuj grad # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subvencije # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Grafikon operativne dobiti STR_GRAPH_MENU_INCOME_GRAPH :Grafikon prihoda STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Grafikon isporučenog tereta @@ -533,57 +527,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Grafikon vrijed STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Iznosi plaćanja tereta # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Tablica lige tvrtki STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Detaljna ocjena učinka STR_GRAPH_MENU_HIGHSCORE :Tablica najboljih rezultata # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Popis industrija STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Industrijski lanci STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Financiraj novu industriju # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Izgradnja željeznice STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Izgradnja elektrificirane željeznice STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Izgradnja jednotračne željeznice STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Izgradnja Magleva # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Izgradnja ceste STR_ROAD_MENU_TRAM_CONSTRUCTION :Izgradnja tramvaja # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Izgradnja plovnih kanala # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Izgradnja zračne luke # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Uređivanje krajolika STR_LANDSCAPING_MENU_PLANT_TREES :Posadi drveće STR_LANDSCAPING_MENU_PLACE_SIGN :Postavi znak # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Zvuk/glazba # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Poslijednja poruka/vijest STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Povijest poruka STR_NEWS_MENU_DELETE_ALL_MESSAGES :Obriši sve poruke # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Podaci o zemljištu -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Otvori konzolu STR_ABOUT_MENU_AI_DEBUG :Debugiranje UI-ja/Skripte igre STR_ABOUT_MENU_SCREENSHOT :Slika zaslona diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 51dcb5f12f..3d757a6f5a 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -501,31 +501,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Průhledné bud STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Průhledné popisky # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Uložit hru STR_FILE_MENU_LOAD_GAME :Načíst hru STR_FILE_MENU_QUIT_GAME :Ukončit hru -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Ukončit program # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Mapa světa STR_MAP_MENU_EXTRA_VIEWPORT :Další pohled STR_MAP_MENU_LINGRAPH_LEGEND :Legenda toku nákladu STR_MAP_MENU_SIGN_LIST :Seznam popisků # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Seznam měst STR_TOWN_MENU_FOUND_TOWN :Založit město # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Dotace # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Graf provozního zisku STR_GRAPH_MENU_INCOME_GRAPH :Graf příjmů STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Graf doručeného zboží @@ -534,57 +528,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Graf hodnoty sp STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Graf přepravních sazeb # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Tabulka společností STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Podrobné hodnocení výkonu STR_GRAPH_MENU_HIGHSCORE :Nejlepší výsledky # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Seznam průmyslu STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Průmyslové řetězce STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Investovat do průmyslu # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Výstavba železnice STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Výstavba elektrifikované železnice STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Výstavba monorailu STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Výstavba maglevu # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Výstavba silnic STR_ROAD_MENU_TRAM_CONSTRUCTION :Výstavba tramvajové tratě # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Výstavba vodních cest # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Stavba letiště # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Úpravy krajiny STR_LANDSCAPING_MENU_PLANT_TREES :Vysadit stromy STR_LANDSCAPING_MENU_PLACE_SIGN :Umístit nápis # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Zvuk/Hudba # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Poslední zpráva nebo článek STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Historie zpráv STR_NEWS_MENU_DELETE_ALL_MESSAGES :Smazat všechny zprávy # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informace o zemi -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Zobrazit nebo skrýt konzoli STR_ABOUT_MENU_AI_DEBUG :Ladění AI / herních skriptů STR_ABOUT_MENU_SCREENSHOT :Screenshot diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 45d139e198..f7d676bbd2 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -440,31 +440,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Gennemsigtige b STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Gennemsigtige skilte # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Gem spil STR_FILE_MENU_LOAD_GAME :Fortsæt spil STR_FILE_MENU_QUIT_GAME :Forlad spillet -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Afslut # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Kort over verden STR_MAP_MENU_EXTRA_VIEWPORT :Nyt lokalitetsvindue STR_MAP_MENU_LINGRAPH_LEGEND :Laststrømforklaring STR_MAP_MENU_SIGN_LIST :Liste over skilte # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Byoversigt STR_TOWN_MENU_FOUND_TOWN :Stift by # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Tilskudsordninger # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Graf over afkast STR_GRAPH_MENU_INCOME_GRAPH :Graf over indkomster STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Graf over leveret last @@ -473,58 +467,47 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Graf over selsk STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Graf over lastudbetalingsrater # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Selskabsoversigt STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Detaljeret præstationsoversigt STR_GRAPH_MENU_HIGHSCORE :Topresultater # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Industrioversigt STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Industrikæder STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Finansiér ny industri # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Jernbanekonstruktion STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Elektrisk jernbanekonstruktion STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Monorailkonstruktion STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Magnetskinnekonstruktion # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Vejkonstruktion STR_ROAD_MENU_TRAM_CONSTRUCTION :Sporvejskonstruktion # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Bygning af vandveje # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Lufthavnskonstruktion # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Landskabsværktøjer STR_LANDSCAPING_MENU_PLANT_TREES :Plant træer STR_LANDSCAPING_MENU_PLACE_SIGN :Placer skilt # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Lyd/Musik # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Seneste besked/nyhedsrapport STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Tidligere beskeder STR_NEWS_MENU_DELETE_ALL_MESSAGES :Slet alle beskeder # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Landområde information STR_ABOUT_MENU_HELP :Hjælp & manualer -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Tænd/Sluk konsol STR_ABOUT_MENU_AI_DEBUG :Computerspiller/spilscript debug STR_ABOUT_MENU_SCREENSHOT :Skærmbillede (Ctrl-S) diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 65169ea683..34644eac9f 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -440,31 +440,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Transparante ge STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Transparante bordjes # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Spel opslaan STR_FILE_MENU_LOAD_GAME :Spel laden STR_FILE_MENU_QUIT_GAME :Spel sluiten -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Afsluiten # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Wereldkaart STR_MAP_MENU_EXTRA_VIEWPORT :Extra kijkvenster STR_MAP_MENU_LINGRAPH_LEGEND :Legenda vrachtstroom STR_MAP_MENU_SIGN_LIST :Bordjeslijst # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Stedenlijst STR_TOWN_MENU_FOUND_TOWN :Stad stichten # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subsidies # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Grafiek van operationele winst STR_GRAPH_MENU_INCOME_GRAPH :Grafiek van inkomsten STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Grafiek van afgeleverde vracht @@ -473,58 +467,47 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Grafiek van bed STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Vrachtprijzen # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Bedrijfsscoretabel STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Gedetailleerde prestatiescore STR_GRAPH_MENU_HIGHSCORE :Scoretabel # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Industrielijst STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Industrieketens STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Betaal nieuwe industrie # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Spoorwegen bouwen STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Geëlektrificeerde spoorwegen bouwen STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Monorailspoorwegen bouwen STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Zweeftreinspoorwegen bouwen # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Wegen bouwen STR_ROAD_MENU_TRAM_CONSTRUCTION :Tramsporen bouwen # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Waterwegen bouwen # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Vliegvelden bouwen # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Terreinaanpassing STR_LANDSCAPING_MENU_PLANT_TREES :Bomen planten STR_LANDSCAPING_MENU_PLACE_SIGN :Bord plaatsen # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Geluid/muziek # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Laatste (nieuws)bericht STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Berichtengeschiedenis STR_NEWS_MENU_DELETE_ALL_MESSAGES :Alle berichten verwijderen # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Landinformatie STR_ABOUT_MENU_HELP :Help en handleidingen -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Console in-uitschakelen STR_ABOUT_MENU_AI_DEBUG :Probleemoplossing AI/spelscript STR_ABOUT_MENU_SCREENSHOT :Schermfoto diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index eb72d13859..a00ba4f135 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -440,31 +440,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Transparent bui STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Transparent signs # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Save game STR_FILE_MENU_LOAD_GAME :Load game STR_FILE_MENU_QUIT_GAME :Abandon game -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Exit # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Map of world STR_MAP_MENU_EXTRA_VIEWPORT :Extra viewport STR_MAP_MENU_LINGRAPH_LEGEND :Cargo flow legend STR_MAP_MENU_SIGN_LIST :Sign list # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Town directory STR_TOWN_MENU_FOUND_TOWN :Found town # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subsidies # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Operating profit graph STR_GRAPH_MENU_INCOME_GRAPH :Income graph STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Delivered cargo graph @@ -473,58 +467,47 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Company value g STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Cargo payment rates # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Company league table STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Detailed performance rating STR_GRAPH_MENU_HIGHSCORE :Highscore table # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Industry directory STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Industry chains STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Fund new industry # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Railway construction STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Electrified railway construction STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Monorail construction STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Maglev construction # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Road construction STR_ROAD_MENU_TRAM_CONSTRUCTION :Tramway construction # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Waterways construction # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Airport construction # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Landscaping STR_LANDSCAPING_MENU_PLANT_TREES :Plant trees STR_LANDSCAPING_MENU_PLACE_SIGN :Place sign # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Sound/music # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Last message/news report STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Message history STR_NEWS_MENU_DELETE_ALL_MESSAGES :Delete all messages # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Land area information STR_ABOUT_MENU_HELP :Help & manuals -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Toggle console STR_ABOUT_MENU_AI_DEBUG :AI/Game script debug STR_ABOUT_MENU_SCREENSHOT :Screenshot diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 258e12f94e..315e851f3b 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -440,31 +440,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Transparent bui STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Transparent signs # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Save game STR_FILE_MENU_LOAD_GAME :Load game STR_FILE_MENU_QUIT_GAME :Abandon game -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Quit # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Map of world STR_MAP_MENU_EXTRA_VIEWPORT :Extra viewport STR_MAP_MENU_LINGRAPH_LEGEND :Cargo flow legend STR_MAP_MENU_SIGN_LIST :Sign list # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Town directory STR_TOWN_MENU_FOUND_TOWN :Found town # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subsidies # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Operating profit graph STR_GRAPH_MENU_INCOME_GRAPH :Income graph STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Delivered cargo graph @@ -473,58 +467,47 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Company value g STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Cargo payment rates # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Company league table STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Detailed performance rating STR_GRAPH_MENU_HIGHSCORE :Highscore table # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Industry directory STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Industry chains STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Fund new industry # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Railroad construction STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Electrified railroad construction STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Monorail construction STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Maglev construction # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Road construction STR_ROAD_MENU_TRAM_CONSTRUCTION :Streetcar construction # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Waterways construction # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Airport construction # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Landscaping STR_LANDSCAPING_MENU_PLANT_TREES :Plant trees STR_LANDSCAPING_MENU_PLACE_SIGN :Place sign # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Sound/music # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Last message/news report STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Message history STR_NEWS_MENU_DELETE_ALL_MESSAGES :Delete all messages # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Land area information STR_ABOUT_MENU_HELP :Help & manuals -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Toggle console STR_ABOUT_MENU_AI_DEBUG :AI/Game script debug STR_ABOUT_MENU_SCREENSHOT :Screenshot @@ -1090,6 +1073,7 @@ STR_GAME_OPTIONS_BASE_MUSIC :{BLACK}Base mus STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP :{BLACK}Select the base music set to use STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP :{BLACK}Additional information about the base music set +STR_BASESET_STATUS :{STRING} {RED}({NUM} missing/corrupted file{P "" s}) STR_ERROR_RESOLUTION_LIST_FAILED :{WHITE}Failed to retrieve a list of supported resolutions STR_ERROR_FULLSCREEN_FAILED :{WHITE}Fullscreen mode failed diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index ed74133028..44e658c324 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -503,31 +503,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Travideblaj kon STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Travideblaj signoj # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Konservu ludon STR_FILE_MENU_LOAD_GAME :Ŝarĝu ludon STR_FILE_MENU_QUIT_GAME :Foriru de la ludo -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Fermu # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Mondomapo STR_MAP_MENU_EXTRA_VIEWPORT :Plia vidujo STR_MAP_MENU_LINGRAPH_LEGEND :Klarigeto de ŝarĝfluo STR_MAP_MENU_SIGN_LIST :Listo de ŝildoj # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Urba katalogo STR_TOWN_MENU_FOUND_TOWN :Urbo troviĝas. # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subvencioj # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Gajna grafiko STR_GRAPH_MENU_INCOME_GRAPH :Enspeza grafiko STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Liveriteca grafiko @@ -536,57 +530,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Kompanivalora g STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Ŝarĝpaga grafiko # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Kompaniara tabelo STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Detala rendimento STR_GRAPH_MENU_HIGHSCORE :Altpoentara tabelo # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Industria katalogo STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Industriaj ĉenoj STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Fondu novan industrion # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Fervoja Konstruado STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Elektrofervoja konstruado STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Unurelfervoja konstruado STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Maglevfervoja konstruado # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Vojkonstruado STR_ROAD_MENU_TRAM_CONSTRUCTION :Konstruado de tramvojo # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Konstruado de akvovojoj # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Flughavena konstruado # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Landaspektigi STR_LANDSCAPING_MENU_PLANT_TREES :Plantu arbojn STR_LANDSCAPING_MENU_PLACE_SIGN :Metu signon # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Sono/muziko # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Lasta mesaĝo/novaĵo STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Mesaĝa Historio STR_NEWS_MENU_DELETE_ALL_MESSAGES :Forigu ĉiujn mesaĝojn # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Landkvadrataj informoj -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Baskuligi Konzolon STR_ABOUT_MENU_AI_DEBUG :AI/Ludoskripta sencimigo STR_ABOUT_MENU_SCREENSHOT :Ekranfoto diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 6773e4acee..e68b1144b4 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -479,31 +479,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Läbipaistvad h STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Läbipaistvad sildid # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Mängu salvestamine STR_FILE_MENU_LOAD_GAME :Mängu jätkamine STR_FILE_MENU_QUIT_GAME :Lahku mängust -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Välju # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Maailmakaart STR_MAP_MENU_EXTRA_VIEWPORT :Lisa vaateaken STR_MAP_MENU_LINGRAPH_LEGEND :Kaubavoo legend STR_MAP_MENU_SIGN_LIST :Siltide register # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Asustuste register STR_TOWN_MENU_FOUND_TOWN :Raja asustus # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Toetused # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Opereerimiskasumi graafik STR_GRAPH_MENU_INCOME_GRAPH :Tulugraafik STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Äraveetud kauba graafik @@ -512,57 +506,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Firmaväärtust STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Veotasude määrad # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Ettevõtete edetabel STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Täpsustatud tulemushinnang STR_GRAPH_MENU_HIGHSCORE :Edetabel # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Tööstuste register STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Tööstuste ahel STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Uue tööstuse rahastamine # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Rööbastee ehitamine STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Elektriraudtee ehitamine STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Monorelsi ehitamine STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Magnethõljuktee ehitamine # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Maanteede ehitamine STR_ROAD_MENU_TRAM_CONSTRUCTION :Trammiteede ehitamine # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Veeteede ehitamine # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Lennuväljade ehitamine # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Maapinna kujundamine STR_LANDSCAPING_MENU_PLANT_TREES :Puude istutamine STR_LANDSCAPING_MENU_PLACE_SIGN :Paigalda silt # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Heli/muusika # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Viimane teade STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Teadete ajalugu STR_NEWS_MENU_DELETE_ALL_MESSAGES :Kustuta kõik teated # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Maa-ala andmed -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Lülita konsool sisse/välja STR_ABOUT_MENU_AI_DEBUG :AI/GameScripti debugimine STR_ABOUT_MENU_SCREENSHOT :Ekraanipilt diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt index 072ed31c9c..19271e3574 100644 --- a/src/lang/faroese.txt +++ b/src/lang/faroese.txt @@ -373,30 +373,24 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Gjøgnumskygdir STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Gjøgnumskygd statións skelti # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Goym spæl STR_FILE_MENU_LOAD_GAME :Heinta spæl STR_FILE_MENU_QUIT_GAME :Far frá spæli -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Gevst # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Heimskort STR_MAP_MENU_EXTRA_VIEWPORT :Eyka synisgluggi STR_MAP_MENU_SIGN_LIST :Listi yvur tekin # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Bygdar yvirlit STR_TOWN_MENU_FOUND_TOWN :Funnar bygdir # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Stuðulsflutningur # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Grafur fyri rakstrar vinning STR_GRAPH_MENU_INCOME_GRAPH :Inntøku grafur STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Grafur fyri útflýggjaðan farm @@ -405,56 +399,45 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Grafur fyri vir STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Farma gjald takstur # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Yvirlit fyri Fyritøku Deildina STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Avriks meting í smálutum STR_GRAPH_MENU_HIGHSCORE :Hástigs yvirlit # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Ídnaðar yvirlit STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Ídnaðar ketur STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Fíggja nýggjan ídnað # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Jarnbreyta bygging STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Ravmagns jarnbreyta bygging STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Einsporað jarnbreyta bygging STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Maglev bygging # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Vegagerð STR_ROAD_MENU_TRAM_CONSTRUCTION :Sporvega bygging # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Siglingarrennu bygging # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Floghavns bygging # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Landslags broyting STR_LANDSCAPING_MENU_PLANT_TREES :Planta trø STR_LANDSCAPING_MENU_PLACE_SIGN :Set tekin # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Ljóð/ tónleik # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Seinastu boð/tíðinda frásøgn STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Boð søga # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Landa økis kunning -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Console opið ella lukka STR_ABOUT_MENU_AI_DEBUG :AI/Spæl script debug STR_ABOUT_MENU_SCREENSHOT :Skermmynd diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 991dc1b987..0b13d27a4c 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -440,31 +440,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Läpinäkyvät STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Läpinäkyvät kyltit # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Tallenna peli STR_FILE_MENU_LOAD_GAME :Lataa peli STR_FILE_MENU_QUIT_GAME :Lopeta peli -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Sulje # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Maailmankartta STR_MAP_MENU_EXTRA_VIEWPORT :Lisänäkymä STR_MAP_MENU_LINGRAPH_LEGEND :Rahtivirran selitys STR_MAP_MENU_SIGN_LIST :Kylttilista # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Kuntahakemisto STR_TOWN_MENU_FOUND_TOWN :Perusta kunta # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Tuet # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Liikevoitto STR_GRAPH_MENU_INCOME_GRAPH :Tulot STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Kuljetettu rahti @@ -473,58 +467,47 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Yhtiön arvo STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Rahtitaksat # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Yhtiökilpataulukko STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Suoritearviointi STR_GRAPH_MENU_HIGHSCORE :Pistetaulukko # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Teollisuushakemisto STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Teollisuusketjut STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Rakenna uutta teollisuutta # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Rautatien rakentaminen STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Sähköradan rakentaminen STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Yksiraiteisen rakentaminen STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Maglevin rakentaminen # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Tien rakentaminen STR_ROAD_MENU_TRAM_CONSTRUCTION :Raitiotien rakentaminen # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Vesireittien rakentaminen # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Lentokentän rakentaminen # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Maastonmuokkaus STR_LANDSCAPING_MENU_PLANT_TREES :Istuta puita STR_LANDSCAPING_MENU_PLACE_SIGN :Aseta kyltti # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Ääni/musiikki # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Viimeisin viesti/uutisraportti STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Viestihistoria STR_NEWS_MENU_DELETE_ALL_MESSAGES :Poista kaikki viestit # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Maa-alueen tiedot STR_ABOUT_MENU_HELP :Ohjeet ja oppaat -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Konsoli STR_ABOUT_MENU_AI_DEBUG :Tekoälyn/peliskriptin virheenjäljitys STR_ABOUT_MENU_SCREENSHOT :Kuvakaappaus diff --git a/src/lang/french.txt b/src/lang/french.txt index 36c9ea69e8..4bb33af182 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -441,31 +441,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Édifices trans STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Panneaux transparents # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Sauvegarder la partie STR_FILE_MENU_LOAD_GAME :Charger une partie STR_FILE_MENU_QUIT_GAME :Abandonner la partie -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Quitter le jeu # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Carte du monde STR_MAP_MENU_EXTRA_VIEWPORT :Vue supplémentaire STR_MAP_MENU_LINGRAPH_LEGEND :Légende du flux de marchandises STR_MAP_MENU_SIGN_LIST :Liste des panneaux # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Annuaire des villes STR_TOWN_MENU_FOUND_TOWN :Fonder une ville # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subventions # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Profit d'opération STR_GRAPH_MENU_INCOME_GRAPH :Revenu STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Cargaison livrée @@ -474,58 +468,47 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Valeur de la co STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Valeur des marchandises # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Classement des compagnies STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Détail des performances STR_GRAPH_MENU_HIGHSCORE :Meilleurs scores # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Annuaire des industries STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Chaînes des industries STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Financer une nouvelle industrie # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Construction de voie ferrée STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Construction de voie ferrée électrifiée STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Construction de Monorail STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Construction de Maglev # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Construction routière STR_ROAD_MENU_TRAM_CONSTRUCTION :Construction de tramway # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Construction de voies navigables # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Construction d'aéroports # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Modification du paysage STR_LANDSCAPING_MENU_PLANT_TREES :Planter des arbres STR_LANDSCAPING_MENU_PLACE_SIGN :Placer un panneau # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Son/Musique # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Message/Bulletin précédent STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Historique des messages STR_NEWS_MENU_DELETE_ALL_MESSAGES :Effacer tous les messages # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Outil d'inspection du paysage STR_ABOUT_MENU_HELP :Aide et manuels -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Afficher/Cacher la console STR_ABOUT_MENU_AI_DEBUG :Débogage de scripts STR_ABOUT_MENU_SCREENSHOT :Copie d'écran diff --git a/src/lang/frisian.txt b/src/lang/frisian.txt index 722d0507cf..6bc3958d5c 100644 --- a/src/lang/frisian.txt +++ b/src/lang/frisian.txt @@ -395,31 +395,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Trochsichtige g STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Trochsichtige nammen # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Spul opslaan STR_FILE_MENU_LOAD_GAME :Spul lade STR_FILE_MENU_QUIT_GAME :Spul ferlitte -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Ôfslute # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Wrâldkaart STR_MAP_MENU_EXTRA_VIEWPORT :Ekstra finster STR_MAP_MENU_LINGRAPH_LEGEND :Frachtstreamleginda STR_MAP_MENU_SIGN_LIST :Buordsjeslist # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Stêdlist STR_TOWN_MENU_FOUND_TOWN :In stêd stichte # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subsydzjes # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Fertsjinstengrafyk STR_GRAPH_MENU_INCOME_GRAPH :Ynkomstengrafyk STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Oflevere frachtgrafyk @@ -428,56 +422,45 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Bedriuwsweardeg STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Frachtprizengrafyk # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Bedriuwskompetysjetabel STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Wiidweidiche prestaasjewurdearring STR_GRAPH_MENU_HIGHSCORE :Topskoretabel # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Yndustrylist STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Yndustrykeatlings STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Nije yndustry finansierje # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Spoarwei bouwe STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Elektifisearre spoarwei bouwe STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Monorail bouwe STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Maglev bouwe # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Wegen bouwe STR_ROAD_MENU_TRAM_CONSTRUCTION :Tramwei bouwe # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Wetterwei bouwe # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Fleanfjild bouwe # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Lânskipsfoarming STR_LANDSCAPING_MENU_PLANT_TREES :Plantsje beammen STR_LANDSCAPING_MENU_PLACE_SIGN :Buordsje delsette # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Lûd/musyk # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Lêtste (nijs)berjocht STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Berjochtenskiednis # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Gebietsynformaasje -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 diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index e673f71cf4..c3e772aac9 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -582,31 +582,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Togalaichean tr STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Sanasan trìd-sholleir # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Sàbhail an geama STR_FILE_MENU_LOAD_GAME :Luchdaich geama STR_FILE_MENU_QUIT_GAME :Fàg an geama -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Fàg an-seo # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Mapa an t-saoghail STR_MAP_MENU_EXTRA_VIEWPORT :Port-seallaidh a bharrachd STR_MAP_MENU_LINGRAPH_LEGEND :Clàr-mìneachaidh an t-srutha carago STR_MAP_MENU_SIGN_LIST :Liosta nan sanas # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Eòlaire nam bailtean STR_TOWN_MENU_FOUND_TOWN :Baile air a lorg # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Tarrailean # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Graf air prothaid-obrachaidh STR_GRAPH_MENU_INCOME_GRAPH :Graf air teachd a-steach STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Graf air carago air a lìbhrigeadh @@ -615,56 +609,45 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Graf air luach STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Reataichean pàighidh carago # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Clàr co-bhann nan companaidh STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Mion-rangachadh dèanadais STR_GRAPH_MENU_HIGHSCORE :Liosta nan sgòran àrda # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Eòlaire nan gnìomhachas STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Sreathan nan gnìomhachas STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Maoinich gnìomhachas ùr # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Togail rathaid-iarainn STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Togail rathaid-iarainn dealain STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Togail rathaid-iarainn aona-rèile STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Togail rathaid-iarainn magnaiteach # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Togail rathaidean STR_ROAD_MENU_TRAM_CONSTRUCTION :Togail slighe-trama # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Togail slighe-uisge # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Togail puirt-adhair # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Cruth-tìre STR_LANDSCAPING_MENU_PLANT_TREES :Cuir craobhan STR_LANDSCAPING_MENU_PLACE_SIGN :Cuir sanas # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Fuaim/ceòl # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Am brath/aithris naidheachd mu dheireadh STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Eachdraidh nam brath # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Fiosrachadh raon tìre -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Toglaich a' chonsoil STR_ABOUT_MENU_AI_DEBUG :Dì-bhugaich IF/sgriobt geama STR_ABOUT_MENU_SCREENSHOT :Glacadh-sgrìn diff --git a/src/lang/galician.txt b/src/lang/galician.txt index b2d105c665..b9ba1b95f9 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -424,31 +424,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Construccións STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Rótulos transparentes # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Gravar partida STR_FILE_MENU_LOAD_GAME :Cargar partida STR_FILE_MENU_QUIT_GAME :Abandonar partida -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Saír # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Mapa do mundo STR_MAP_MENU_EXTRA_VIEWPORT :Xanela extra STR_MAP_MENU_LINGRAPH_LEGEND :Lenda de tomar carga STR_MAP_MENU_SIGN_LIST :Lista de rótulos # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Directorio de cidades STR_TOWN_MENU_FOUND_TOWN :Fundar poboación # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subvencións # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Gráfica de beneficio operativo STR_GRAPH_MENU_INCOME_GRAPH :Gráfica de ingresos STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Gráfica de carga entregada @@ -457,57 +451,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Gráfica de val STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Taxas de pago por carga # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Cadro da liga de compañías STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Puntuación de rendemento detallada STR_GRAPH_MENU_HIGHSCORE :Táboa de máximas puntuacións # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Directorio de industrias STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Cadeas industriais STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Financiar nova industria # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Construción de ferrocarrís STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Construción de ferrocarrís eléctricos STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Construción de monorraíl STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Construción de Maglev # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Construción de estradas STR_ROAD_MENU_TRAM_CONSTRUCTION :Construción de vías de tranvía # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Construción de canles # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Construción de aeroportos # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Paisaxe STR_LANDSCAPING_MENU_PLANT_TREES :Plantar árbores STR_LANDSCAPING_MENU_PLACE_SIGN :Colocar rótulo # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Son/música # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Última mensaxe/nova STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Historial de mensaxes STR_NEWS_MENU_DELETE_ALL_MESSAGES :Borrar tódalas mensaxes # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Información de área de terreo -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :(Des)Activar consola STR_ABOUT_MENU_AI_DEBUG :Depuración IA/script do xogo STR_ABOUT_MENU_SCREENSHOT :Captura de pantalla diff --git a/src/lang/german.txt b/src/lang/german.txt index ad88809dc9..3684132d09 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -441,31 +441,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Transparenz fü STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Transparenz für Schilder # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Spiel speichern STR_FILE_MENU_LOAD_GAME :Spiel laden STR_FILE_MENU_QUIT_GAME :Spiel beenden -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :OpenTTD beenden # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Weltkarte STR_MAP_MENU_EXTRA_VIEWPORT :Zusatzansicht STR_MAP_MENU_LINGRAPH_LEGEND :Frachtverbindungen STR_MAP_MENU_SIGN_LIST :Schilderliste # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Städteverzeichnis STR_TOWN_MENU_FOUND_TOWN :Stadt gründen # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subventionen # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Betriebsgewinndiagramm STR_GRAPH_MENU_INCOME_GRAPH :Einkommensdiagramm STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Frachtlieferungsdiagramm @@ -474,58 +468,47 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Firmenwertdiagr STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Frachtratendiagramm # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Firmentabelle STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Leistungsaufschlüsselung STR_GRAPH_MENU_HIGHSCORE :Bestenliste # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Industrieverzeichnis STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Wirtschaftsketten STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Neue Industrie finanzieren # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Gleisbau STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Bau elektrifizierter Strecken STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Einschienenbahnbau STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Magnetschwebebahnbau # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Straßenbau STR_ROAD_MENU_TRAM_CONSTRUCTION :Straßenbahnbau # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Wasserstraßenbau # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Flughafenbau # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Landschaftsbau STR_LANDSCAPING_MENU_PLANT_TREES :Bäume pflanzen STR_LANDSCAPING_MENU_PLACE_SIGN :Schild aufstellen # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Sound/Musik # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Letzte Mitteilung/Nachricht STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Vergangene Nachrichten STR_NEWS_MENU_DELETE_ALL_MESSAGES :Alle Nachrichten löschen # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Gebietsinformationen STR_ABOUT_MENU_HELP :Hilfe u. Anleitungen -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Konsole öffnen/schließen STR_ABOUT_MENU_AI_DEBUG :KI-/Skript-Debug STR_ABOUT_MENU_SCREENSHOT :Screenshot (Standard: Strg+S) diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 5432f984b0..5a13ce0e9a 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -482,31 +482,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Διαφανέ STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Διάφανες ταμπέλες # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Αποθήκευση παιχνιδιού STR_FILE_MENU_LOAD_GAME :Φόρτωση παιχνιδιού STR_FILE_MENU_QUIT_GAME :Έξοδος από το παιχνίδι -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Έξοδος # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Χάρτης του κόσμου STR_MAP_MENU_EXTRA_VIEWPORT :Πρόσθετη εμφάνιση STR_MAP_MENU_LINGRAPH_LEGEND :Υπόμνημα Ροής Φορτίου STR_MAP_MENU_SIGN_LIST :Λίστα πινακίδων # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Καταλογος πόλεων STR_TOWN_MENU_FOUND_TOWN :Ιδρύση πόλης # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Χρηματοδοτήσεις # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Γράφημα λειτουργικού κέρδους STR_GRAPH_MENU_INCOME_GRAPH :Γράφημα εισοδήματος STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Γράφημα παραδοθέντος φορτίου @@ -515,57 +509,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Γράφημα STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Ποσοστά πληρωμής φορτίου # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Πίνακας κατάταξης επιχειρήσεων STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Λεπτομερής εκτίμηση απόδοσης STR_GRAPH_MENU_HIGHSCORE :Πίνακας βαθμολογίας # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Κατάλογος Βιομηχανιών STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Αλυσίδες βιομηχανιών STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Χρηματοδότηση νέας βιομηχανίας # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Κατασκευή σιδηρόδρομου STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Κατασκευή ηλεκτροδοτουμένου σιδηρόδρομου STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Κατασκευή μονοτρόχιου STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Κατασκευή Maglev # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Κατασκευή δρόμου STR_ROAD_MENU_TRAM_CONSTRUCTION :Κατασκευή τροχιόδρομου # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Κατασκευή καναλιού νερού # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Κατασκευή αεροδρομίου # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Μορφοποίηση εδάφους STR_LANDSCAPING_MENU_PLANT_TREES :Φύτευση δέντρων STR_LANDSCAPING_MENU_PLACE_SIGN :Τοποθέτηση πινακίδας # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Ήχος/Μουσική # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Τελευταίο μήνυμα/αναφορά ειδήσεων STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Ιστορικό μηνυμάτων STR_NEWS_MENU_DELETE_ALL_MESSAGES :Διαγραφή όλων των μηνυμάτων # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Πληροφορίες περιοχής εδάφους -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Εναλλαγή κονσόλας STR_ABOUT_MENU_AI_DEBUG :Αποσφαλμάτωση AI και δέσμης ενεργειών παιχνιδιού STR_ABOUT_MENU_SCREENSHOT :Στιγμιότυπο οθόνης diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 31e35e322e..57ff59d2e6 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -411,31 +411,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :בניינים STR_SETTINGS_MENU_TRANSPARENT_SIGNS :שלטים שקופים # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :שמור משחק STR_FILE_MENU_LOAD_GAME :טען משחק STR_FILE_MENU_QUIT_GAME :עזוב משחק -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :יציאה # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :מפת העולם STR_MAP_MENU_EXTRA_VIEWPORT :השקפה נוספת STR_MAP_MENU_LINGRAPH_LEGEND :מקרא זרימת מטענים STR_MAP_MENU_SIGN_LIST :רשימת שלטים # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :מדריך הערים STR_TOWN_MENU_FOUND_TOWN :ייסד עיר # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :סובסידיות # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :גרף רווח תפעולי STR_GRAPH_MENU_INCOME_GRAPH :גרף הכנסות STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :גרף שינוע מטענים @@ -444,56 +438,45 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :גרף שווי STR_GRAPH_MENU_CARGO_PAYMENT_RATES :שערי תשלום עבור שירותי הובלה # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :טבלת ליגת החברות STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :דירוג ביצועים מפורט STR_GRAPH_MENU_HIGHSCORE :טבלת ניקוד מירבי # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :ספריית תעשיות STR_INDUSTRY_MENU_INDUSTRY_CHAIN :שרשראות תעשיה STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :ממן תעשיה חדשה # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :בניית מסילות STR_RAIL_MENU_ELRAIL_CONSTRUCTION :בניית מסילות רכבת מחושמלות STR_RAIL_MENU_MONORAIL_CONSTRUCTION :בניית מסילות חד פסיות STR_RAIL_MENU_MAGLEV_CONSTRUCTION :בניית מסילות מגנטיות # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :סלילת כבישים STR_ROAD_MENU_TRAM_CONSTRUCTION :בניית מסילה חשמלית # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :בניית נתיבי מים # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :בניית שדה תעופה # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :עיצוב פני השטח STR_LANDSCAPING_MENU_PLANT_TREES :נטע עצים STR_LANDSCAPING_MENU_PLACE_SIGN :מקם סימניות # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :צלילים/מנגינה # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :הודעה אחרונה/מבזק חדשות אחרון STR_NEWS_MENU_MESSAGE_HISTORY_MENU :היסטורית הודעות # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :מידע על שטח קרקע -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :פתח/סגור קונסולה STR_ABOUT_MENU_AI_DEBUG :דיבאג של סקריפטים של בינה מלאכותית או של המשחק STR_ABOUT_MENU_SCREENSHOT :צילום מסך diff --git a/src/lang/hindi.txt b/src/lang/hindi.txt index 07ed1715c0..25765efc16 100644 --- a/src/lang/hindi.txt +++ b/src/lang/hindi.txt @@ -133,53 +133,36 @@ STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED :पथ-सं STR_SETTINGS_MENU_TRANSPARENT_SIGNS :पारदर्शी संकेत # File menu -###length 5 -STR_FILE_MENU_SEPARATOR : # Map menu -###length 4 # Town menu -###length 2 # Subsidies menu -###length 1 # Graph menu -###length 6 # Company league menu -###length 3 # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_CHAIN :औद्योगिक शृंखला # URailway construction menu -###length 4 STR_RAIL_MENU_ELRAIL_CONSTRUCTION :विद्युतिकृत रेलवे निर्माण # Road construction menu -###length 2 # Waterways construction menu -###length 1 # Aairport construction menu -###length 1 # Landscaping menu -###length 3 # Music menu -###length 1 # Message menu -###length 3 # About menu -###length 12 -STR_ABOUT_MENU_SEPARATOR : # Place in highscore window ###length 15 diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 76ecc7c290..38b585d9dd 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -503,31 +503,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Átlátszó ép STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Átlátszó feliratok # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Játék mentése STR_FILE_MENU_LOAD_GAME :Játék betöltése STR_FILE_MENU_QUIT_GAME :Kilépés a játékból -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Kilépés # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Világtérkép STR_MAP_MENU_EXTRA_VIEWPORT :Extra látkép STR_MAP_MENU_LINGRAPH_LEGEND :Rakományáramlási jelmagyarázat STR_MAP_MENU_SIGN_LIST :Feliratok listája # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Városlista STR_TOWN_MENU_FOUND_TOWN :Új város alapítása # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Támogatások # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Működési nyereség grafikon STR_GRAPH_MENU_INCOME_GRAPH :Bevétel grafikon STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Elszállított rakomány grafikon @@ -536,58 +530,47 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Vállalat ért STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Rakományok szállítási díja # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Vállalatok helyezései STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Teljesítményértékelések részletezése STR_GRAPH_MENU_HIGHSCORE :Rekord Tábla # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Gazdasági épületek listája STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Ipari lánc STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Új gazdasági épület építése # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Normál vasút építése STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Villamosított vasút építése STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Egysínű vasút építése STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Maglev vasút építése # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Út építése STR_ROAD_MENU_TRAM_CONSTRUCTION :Villamospálya építése # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Vízi út építése # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Repülőtér építése # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Tájrendezés STR_LANDSCAPING_MENU_PLANT_TREES :Faültetés STR_LANDSCAPING_MENU_PLACE_SIGN :Felirat lerakása # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Hang/zene # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Legutóbbi üzenet/újsághír STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Előző üzenetek STR_NEWS_MENU_DELETE_ALL_MESSAGES :Az összes üzenet törlése # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Terület-információ STR_ABOUT_MENU_HELP :Súgó és útmutatók -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Átváltás konzolra STR_ABOUT_MENU_AI_DEBUG :MI / Játékszkript nyomkövetés STR_ABOUT_MENU_SCREENSHOT :Képmentés diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index a75123cd0b..cf406dc2c1 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -373,30 +373,24 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Gegnsæjar bygg STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Gegnsæ skilti # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Vista leik STR_FILE_MENU_LOAD_GAME :Opna leik STR_FILE_MENU_QUIT_GAME :Hætta leik -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Hætta # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Heimskort STR_MAP_MENU_EXTRA_VIEWPORT :Auka sjónarhorn STR_MAP_MENU_SIGN_LIST :Skiltalisti # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Listi yfir bæi STR_TOWN_MENU_FOUND_TOWN :Fann bæ # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Samstarfssamningar # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Línurit: Rekstrarhagnaður STR_GRAPH_MENU_INCOME_GRAPH :Línurit: Tekjur STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Línurit: Fluttur farmur @@ -405,56 +399,45 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Línurit: Verð STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Línurit: Flutningsgróði # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Stigatafla fyrirtækja STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Nákvæm frammistöðumæling STR_GRAPH_MENU_HIGHSCORE :Stigatafla # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Fyrirtækjaskrá STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Tengdur iðnaður STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Fjármagna nýjan iðnað # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Járnbrautarspors framkvæmdir STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Rafmagnsspora framkvæmdir STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Einteinungsframkvæmdir STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Segulsvifvagna framkvæmdir # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Vegagerð STR_ROAD_MENU_TRAM_CONSTRUCTION :Sporvagnaframkvæmdir # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Vatnaframkvæmdir # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Flugvallarframkvæmdir # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Mótun lands STR_LANDSCAPING_MENU_PLANT_TREES :Gróðursetja tré STR_LANDSCAPING_MENU_PLACE_SIGN :Setja skilti # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Hljóð/tónlist # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Síðustu skilaboð/frétt STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Saga skilaboða # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Landssvæðisupplýsingar -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Kveikja á stýriskjá STR_ABOUT_MENU_AI_DEBUG :Aflúsun gervigreindar/forskrifta STR_ABOUT_MENU_SCREENSHOT :Skjámynd diff --git a/src/lang/ido.txt b/src/lang/ido.txt index fcf9653fdf..e208ff94d6 100644 --- a/src/lang/ido.txt +++ b/src/lang/ido.txt @@ -295,58 +295,42 @@ STR_SETTINGS_MENU_FULL_DETAIL :Plene detaloza STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Diafana konstrukturi # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Salvas ludo STR_FILE_MENU_LOAD_GAME :Kargas ludo STR_FILE_MENU_QUIT_GAME :Abandonas ludo -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Ekiras # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Mapo di mondo STR_MAP_MENU_SIGN_LIST :Listo di signi # Town menu -###length 2 # Subsidies menu -###length 1 # Graph menu -###length 6 STR_GRAPH_MENU_INCOME_GRAPH :Revenuo grafiko STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Livrita kargajo grafiko # Company league menu -###length 3 # Industry menu -###length 3 # URailway construction menu -###length 4 # Road construction menu -###length 2 # Waterways construction menu -###length 1 # Aairport construction menu -###length 1 # Landscaping menu -###length 3 # Music menu -###length 1 # Message menu -###length 3 # About menu -###length 12 # Place in highscore window ###length 15 diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index c9bdd7e8e1..17167745ad 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -440,31 +440,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Transparankan b STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Transparankan tanda-tanda # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Simpan permainan STR_FILE_MENU_LOAD_GAME :Buka Permainan STR_FILE_MENU_QUIT_GAME :Batalkan permainan -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Keluar # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Peta Dunia STR_MAP_MENU_EXTRA_VIEWPORT :Viewport ekstra STR_MAP_MENU_LINGRAPH_LEGEND :Legenda aliran kargo STR_MAP_MENU_SIGN_LIST :Daftar Tanda # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Daftar kota STR_TOWN_MENU_FOUND_TOWN :Bangun Kota # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subsidi # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Grafik keuntungan operasional STR_GRAPH_MENU_INCOME_GRAPH :Grafik Pendapatan STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Grafik kargo terkirim @@ -473,58 +467,47 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Grafik Aset Per STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Daftar biaya kargo # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Tabel Perusahaan STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Penilaian terperinci kinerja STR_GRAPH_MENU_HIGHSCORE :Tabel Skor # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Daftar Industri STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Rantai industri STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Danai industri baru # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Pembangunan Rel STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Pembangunan Rel Kereta Listrik STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Pembangunan Monorel STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Pembangunan Maglev # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Pembangunan jalan STR_ROAD_MENU_TRAM_CONSTRUCTION :Pembangunan Jalur Tram # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Konstruksi Perairan. # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Konstruksi Bandara # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Proses Landsekap STR_LANDSCAPING_MENU_PLANT_TREES :Menanam pohon STR_LANDSCAPING_MENU_PLACE_SIGN :Memasang pengenal # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Suara/musik # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Pesan/Berita terakhir STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Berita Lampau STR_NEWS_MENU_DELETE_ALL_MESSAGES :Hapus semua pesan # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informasi area daratan STR_ABOUT_MENU_HELP :Bantuan & panduan -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Hidup/matikan Layar Konsol STR_ABOUT_MENU_AI_DEBUG :Debug skrip AI/Permainan STR_ABOUT_MENU_SCREENSHOT :Ambil gambar diff --git a/src/lang/irish.txt b/src/lang/irish.txt index 7437cee17c..a446fc7715 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -411,31 +411,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Foignimh trédh STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Comharthaí trédhearcacha # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Sábháil an cluiche STR_FILE_MENU_LOAD_GAME :Lódáil cluiche STR_FILE_MENU_QUIT_GAME :Fág an cluiche -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Scoir # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Léarscáil den domhan STR_MAP_MENU_EXTRA_VIEWPORT :Fuinneog amhairc bhreise STR_MAP_MENU_LINGRAPH_LEGEND :Eochair an tSreafa Lastais STR_MAP_MENU_SIGN_LIST :Liosta na gcomharthaí # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Liosta bailte STR_TOWN_MENU_FOUND_TOWN :Aimsíodh baile # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Fóirdheontais # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Graf den bhrabús oibriúcháin STR_GRAPH_MENU_INCOME_GRAPH :Graf den ioncam STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Graf den lastas a seachadadh @@ -444,57 +438,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Graf de luach n STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Rátaí íocaíochta do lastas # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Tábla sraithe na gcuideachtaí STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Rátáil feidhmíochta mionsonraithe STR_GRAPH_MENU_HIGHSCORE :Tábla na n-ardscór # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Liosta de na tionscail STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Slabhraí na dtionscal STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Déan maoiniú ar thionscal nua # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Tógáil iarnróid STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Tógáil iarnróid leictrithe STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Tógáil iarnród aonráille STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Tógáil maglev # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Tógáil bóithre STR_ROAD_MENU_TRAM_CONSTRUCTION :Tógáil trambhealaigh # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Tógáil uiscebhealaí # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Tógáil aerfoirt # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Tírdhreachú STR_LANDSCAPING_MENU_PLANT_TREES :Crainnte a chur STR_LANDSCAPING_MENU_PLACE_SIGN :Comhartha a chur # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Fuaim/ceol # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Teachtaireacht/tuairisc nuachta deiridh STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Stair na dteachtaireachtaí STR_NEWS_MENU_DELETE_ALL_MESSAGES :Scrios gach teachtaireacht # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Faisnéis faoin limistéar talún -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Scoránaigh consól STR_ABOUT_MENU_AI_DEBUG :Dífhabhtú AI/Scripteanna Cluiche STR_ABOUT_MENU_SCREENSHOT :Seat scáileáin diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 9fb8d3058b..88b6fd5a7b 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -442,31 +442,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Edifici traspar STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Cartelli trasparenti # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Salva partita STR_FILE_MENU_LOAD_GAME :Carica partita STR_FILE_MENU_QUIT_GAME :Abbandona partita -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Esci # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Mappa del mondo STR_MAP_MENU_EXTRA_VIEWPORT :Mini visuale extra STR_MAP_MENU_LINGRAPH_LEGEND :Legenda del flusso di merci STR_MAP_MENU_SIGN_LIST :Elenco cartelli # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Elenco città STR_TOWN_MENU_FOUND_TOWN :Fonda città # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Sussidi # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Grafico margine operativo STR_GRAPH_MENU_INCOME_GRAPH :Grafico ricavi STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Grafico carichi consegnati @@ -475,58 +469,47 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Grafico valore STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Grafico tariffe carichi # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Classifica compagnie STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Valutazione dettagliata prestazioni STR_GRAPH_MENU_HIGHSCORE :Punteggi migliori # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Elenco industrie STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Catene di distribuzione STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Finanzia nuova industria # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Costruzione ferrovie STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Costruzione ferrovie elettrificate STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Costruzione monorotaia STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Costruzione maglev # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Costruzione strade STR_ROAD_MENU_TRAM_CONSTRUCTION :Costruzione tranvie # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Costruzione trasporti su acqua # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Costruzione aeroporto # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Modellazione terreno STR_LANDSCAPING_MENU_PLANT_TREES :Pianta alberi STR_LANDSCAPING_MENU_PLACE_SIGN :Posiziona cartello # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Suoni/musica # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Ultimo messaggio/notizia STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Cronologia messaggi STR_NEWS_MENU_DELETE_ALL_MESSAGES :Elimina tutti i messaggi # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informazioni sull'area di terreno STR_ABOUT_MENU_HELP :Aiuto e manuali -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Apri/chiudi console STR_ABOUT_MENU_AI_DEBUG :Debug IA/Script STR_ABOUT_MENU_SCREENSHOT :Screenshot diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 8b2d7dbc76..baae5c689c 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -423,31 +423,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :建物を透過 STR_SETTINGS_MENU_TRANSPARENT_SIGNS :標識を透過表示 # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :セーブ STR_FILE_MENU_LOAD_GAME :ロード STR_FILE_MENU_QUIT_GAME :タイトルに戻る -STR_FILE_MENU_SEPARATOR :――――――― STR_FILE_MENU_EXIT :OpenTTDを終了 # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :地図 STR_MAP_MENU_EXTRA_VIEWPORT :ビューポートを開く STR_MAP_MENU_LINGRAPH_LEGEND :貨物流通履歴 STR_MAP_MENU_SIGN_LIST :標識リスト # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :街一覧 STR_TOWN_MENU_FOUND_TOWN :街の新設に出資 # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :助成金 # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :営業利益 推移 STR_GRAPH_MENU_INCOME_GRAPH :売上高 推移 STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :貨物運送量 推移 @@ -456,57 +450,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :総資産 推 STR_GRAPH_MENU_CARGO_PAYMENT_RATES :運送報酬相場 # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :格付順位 STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :格付詳細情報 STR_GRAPH_MENU_HIGHSCORE :ハイスコア # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :産業リスト STR_INDUSTRY_MENU_INDUSTRY_CHAIN :産業チェイン STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :産業の新設に出資 # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :鉄道敷設 STR_RAIL_MENU_ELRAIL_CONSTRUCTION :電気鉄道の敷設 STR_RAIL_MENU_MONORAIL_CONSTRUCTION :モノレール敷設 STR_RAIL_MENU_MAGLEV_CONSTRUCTION :リニア線路を敷設 # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :道路敷設 STR_ROAD_MENU_TRAM_CONSTRUCTION :軌道敷設 # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :水運設備建設 # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :空港建設 # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :地形ツール STR_LANDSCAPING_MENU_PLANT_TREES :植林 STR_LANDSCAPING_MENU_PLACE_SIGN :標識設置 # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :効果音/音楽 # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :最新メッセージ/ニュース STR_NEWS_MENU_MESSAGE_HISTORY_MENU :メッセージ履歴 STR_NEWS_MENU_DELETE_ALL_MESSAGES :メッセージをすべて削除 # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :地域情報 -STR_ABOUT_MENU_SEPARATOR :――――――――――――――――― STR_ABOUT_MENU_TOGGLE_CONSOLE :コンソールの表示切替 STR_ABOUT_MENU_AI_DEBUG :AI/ゲームスクリプトのデバッグ STR_ABOUT_MENU_SCREENSHOT :スクリーンショット diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 49a694e6c8..0e72bc8a6d 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -441,31 +441,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :건물 감추 STR_SETTINGS_MENU_TRANSPARENT_SIGNS :역명판 감추기 # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :게임 저장하기 STR_FILE_MENU_LOAD_GAME :게임 불러오기 STR_FILE_MENU_QUIT_GAME :게임 그만두기 -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :종료 # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :전체 지도 보기 STR_MAP_MENU_EXTRA_VIEWPORT :외부 화면 STR_MAP_MENU_LINGRAPH_LEGEND :화물 흐름 범례 STR_MAP_MENU_SIGN_LIST :팻말 목록 # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :도시 목록 STR_TOWN_MENU_FOUND_TOWN :도시 건설 # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :보조금 # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :경영 수익 그래프 STR_GRAPH_MENU_INCOME_GRAPH :수익 그래프 STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :수송 화물량 그래프 @@ -474,58 +468,47 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :회사가치 STR_GRAPH_MENU_CARGO_PAYMENT_RATES :화물 운송단가 그래프 # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :회사 성취도 순위 STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :상세 성취도 STR_GRAPH_MENU_HIGHSCORE :고득점 순위표 # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :산업시설 목록 STR_INDUSTRY_MENU_INDUSTRY_CHAIN :산업시설 연계도 STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :새 산업시설 건설 # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :선로 건설 STR_RAIL_MENU_ELRAIL_CONSTRUCTION :전기선로 건설 STR_RAIL_MENU_MONORAIL_CONSTRUCTION :모노레일 건설 STR_RAIL_MENU_MAGLEV_CONSTRUCTION :자기부상열차 건설 # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :도로 건설 STR_ROAD_MENU_TRAM_CONSTRUCTION :전찻길 건설 # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :항만 건설 # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :공항 건설 # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :지형 편집 STR_LANDSCAPING_MENU_PLANT_TREES :나무 심기 STR_LANDSCAPING_MENU_PLACE_SIGN :팻말 달기 # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :효과음/배경 음악 # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :최근 메시지/뉴스 기록 STR_NEWS_MENU_MESSAGE_HISTORY_MENU :과거 메시지 목록 STR_NEWS_MENU_DELETE_ALL_MESSAGES :모든 뉴스 메시지 삭제 # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :지형 정보 STR_ABOUT_MENU_HELP :도움말 & 매뉴얼 -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :콘솔 켜기/끄기 STR_ABOUT_MENU_AI_DEBUG :인공지능/게임 스크립트 디버그 STR_ABOUT_MENU_SCREENSHOT :스크린샷 찍기 diff --git a/src/lang/latin.txt b/src/lang/latin.txt index a75f1bb61e..6538c6b495 100644 --- a/src/lang/latin.txt +++ b/src/lang/latin.txt @@ -584,31 +584,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Aedificia perlu STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Signa perlucida # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Servare ludum STR_FILE_MENU_LOAD_GAME :Legere ludum STR_FILE_MENU_QUIT_GAME :Relinquere ludum -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Exire # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Orbis tabula STR_MAP_MENU_EXTRA_VIEWPORT :Fenestra conspectus additicia STR_MAP_MENU_LINGRAPH_LEGEND :Formula graphica onerum cursus STR_MAP_MENU_SIGN_LIST :Index signorum # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Index oppidorum STR_TOWN_MENU_FOUND_TOWN :Condere oppidum # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subsidia # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Formula lucri operationis graphica STR_GRAPH_MENU_INCOME_GRAPH :Formula reditus graphica STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Formula oneris traditi graphica @@ -617,57 +611,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Formula aestima STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Tabula mercedum onerum # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Album foederis societatum STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Censio effectus descripta STR_GRAPH_MENU_HIGHSCORE :Album punctorum supremorum # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Index industriarum STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Catenae industriarum STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Condere novam industriam # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Constructio ferriviarum STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Constructio electricarum ferriviarum STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Constructio monoorbitarum STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Constructio maglev # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Constructio viarum STR_ROAD_MENU_TRAM_CONSTRUCTION :Constructio ferriviarum stratarium # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Constructio viarum aquariarum # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Constructio aeroportuum # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Plasmatio terrae STR_LANDSCAPING_MENU_PLANT_TREES :Serere arbores STR_LANDSCAPING_MENU_PLACE_SIGN :Ponere signum # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Sonus musicave # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Monstrare nuntium novissimum STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Historia nuntiorum STR_NEWS_MENU_DELETE_ALL_MESSAGES :Delere omnia nuntia # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Terrae regionis indicia -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Monstrare celareve consolam STR_ABOUT_MENU_AI_DEBUG :Emendatio IA/Ludi scriptorum STR_ABOUT_MENU_SCREENSHOT :Imago conspectus diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 6aa336e8fe..91ce8250e1 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -424,31 +424,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Caurspīdīgas STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Caurspīdīgas zīmes # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Saglabāt spēli STR_FILE_MENU_LOAD_GAME :Ielādēt spēli STR_FILE_MENU_QUIT_GAME :Pamest spēli -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Iziet # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Pasaules karte STR_MAP_MENU_EXTRA_VIEWPORT :Papildu skatvieta STR_MAP_MENU_LINGRAPH_LEGEND :Kravu plūsmas apzīmējumi STR_MAP_MENU_SIGN_LIST :Zīmju saraksts # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Pilsētu saraksts STR_TOWN_MENU_FOUND_TOWN :Dibināt pilsētu # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subsīdijas # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Darbības peļņas diagramma STR_GRAPH_MENU_INCOME_GRAPH :Ienākumu diagramma STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Piegādāto kravu diagramma @@ -457,57 +451,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Uzņēmuma vēr STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Kravas apmaksas cenas # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Uzņēmumu rangu saraksts STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Detalizēts uzņēmējdarbības vērtējums STR_GRAPH_MENU_HIGHSCORE :Sasniegumu tabula # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Ražotņu saraksts STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Ražotņu ķēdes STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Finansēt jaunu ražotni # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Dzelzceļa būvniecība STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Elektrificētā dzelzceļa būvniecība STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Viensliedes būvniecība STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Magleva būvniecība # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Ceļu būvēšana STR_ROAD_MENU_TRAM_CONSTRUCTION :Tramvaju ceļa būvniecība # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Ūdensceļu būvniecība # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Lidostas būvniecība # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Ainavas veidošana STR_LANDSCAPING_MENU_PLANT_TREES :Stādīt kokus STR_LANDSCAPING_MENU_PLACE_SIGN :Novietot zīmi # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Skaņa/mūzika # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Pēdējais ziņojums/avīzes raksts STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Ziņojumu vēsture STR_NEWS_MENU_DELETE_ALL_MESSAGES :Dzēst visus ziņojumus # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Zemes platības informācija -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Atvērt/aizvērt konsoli STR_ABOUT_MENU_AI_DEBUG :MI/spēles skriptu atkļūdošana STR_ABOUT_MENU_SCREENSHOT :Ekrānuzņēmums diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 8befc1ba53..39e8ed7a56 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -613,31 +613,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Skaidrūs pasta STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Skaidrūs ženklai # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Išsaugoti žaidimą STR_FILE_MENU_LOAD_GAME :Įkelti žaidimą STR_FILE_MENU_QUIT_GAME :Palikti žaidimą -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Išeiti # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Žemėlapis STR_MAP_MENU_EXTRA_VIEWPORT :Papildomas peržiūros langas STR_MAP_MENU_LINGRAPH_LEGEND :Krovinių srautų legenda STR_MAP_MENU_SIGN_LIST :Ženklų sąrašas # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Miestų sąrašas STR_TOWN_MENU_FOUND_TOWN :Įkurti miestą # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subsidijos # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Įprastinės veiklos pelno diagrama STR_GRAPH_MENU_INCOME_GRAPH :Pajamų diagrama STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Krovinių pristatymo diagrama @@ -646,57 +640,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Kompanijos vert STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Krovinių apmokėjimo lygis # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Kompanijos užimama vieta STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Išsamus veiklos įvertinimas STR_GRAPH_MENU_HIGHSCORE :Nugalėtojų lentelė # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Pramonės katalogas STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Gamybos grandinės STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Įsteigti naują pramonės įmonę # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Tiesti geležinkelius STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Tiesti elektrifikuotus geležinkelius STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Tiesti vienbėgius geležinkelius STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Tiesti „Maglev“ geležinkelius # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Tiesti kelius STR_ROAD_MENU_TRAM_CONSTRUCTION :Tiesti tramvajaus linijas # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Tiesti vandens kelius # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Statyti oro uostus # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Formuoti kraštovaizdį STR_LANDSCAPING_MENU_PLANT_TREES :Sodinti medžius STR_LANDSCAPING_MENU_PLACE_SIGN :Statyti ženklus # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Garsas/muzika # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Paskutinė žinutė/naujiena STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Žinučių istorija STR_NEWS_MENU_DELETE_ALL_MESSAGES :Pašalinti visas žinutes # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Žemės ploto informacija -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Perjungti konsolę STR_ABOUT_MENU_AI_DEBUG :AI / GameScript derinimas STR_ABOUT_MENU_SCREENSHOT :Ekrano nuotrauka diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 64ef069ced..e348c1b941 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -422,31 +422,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Transparent Geb STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Transparent Schëlder # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Spill späicheren STR_FILE_MENU_LOAD_GAME :Spill lueden STR_FILE_MENU_QUIT_GAME :Spill ophalen -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Eraus # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Weltkaart STR_MAP_MENU_EXTRA_VIEWPORT :Extra Usiicht STR_MAP_MENU_LINGRAPH_LEGEND :Cargo Flow Legend STR_MAP_MENU_SIGN_LIST :Schëlderlëscht # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Stiedverzeeschnëss STR_TOWN_MENU_FOUND_TOWN :Stad grënnen # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subside # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Grafik: Operative Gewënn STR_GRAPH_MENU_INCOME_GRAPH :Grafik: Akommes STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Grafik: Geliwwert Luedungen @@ -455,57 +449,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Grafik: Betribs STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Luedungs Bezuelraten # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Betribsranglëscht STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Detailléiert Leeschtungsbewäertung STR_GRAPH_MENU_HIGHSCORE :Beschtelëscht # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Industrielëscht STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Industrieketten STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Finanzéiert eng nei Industrie # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Schinnebau STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Elektrësche Schinnebau STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Monorailbau STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Magnéitbunnbau # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Stroossebau STR_ROAD_MENU_TRAM_CONSTRUCTION :Trambau # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Waasserstroosse bauen # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Fluchhafebau # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Landschaftsbau STR_LANDSCAPING_MENU_PLANT_TREES :Beem planzen STR_LANDSCAPING_MENU_PLACE_SIGN :Schëld opstellen # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Sound/Musik # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Lescht Meldung/Neiegkeet STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Meldungshistorie STR_NEWS_MENU_DELETE_ALL_MESSAGES :All Message läschen # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Landinformatiounen -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Konsole un/aus STR_ABOUT_MENU_AI_DEBUG :KI / Spill-Script Debug STR_ABOUT_MENU_SCREENSHOT :Screenshot (Ctrl+S) diff --git a/src/lang/macedonian.txt b/src/lang/macedonian.txt index 71bee74913..1ac4e9b624 100644 --- a/src/lang/macedonian.txt +++ b/src/lang/macedonian.txt @@ -371,30 +371,24 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Транспа STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Транспарентна станица знаци # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Зачувај ја играта STR_FILE_MENU_LOAD_GAME :Вчитај игра STR_FILE_MENU_QUIT_GAME :Напушти ја играта -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Излез # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Мапа на светот STR_MAP_MENU_EXTRA_VIEWPORT :екстра прозорец STR_MAP_MENU_SIGN_LIST :Си листа # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Место STR_TOWN_MENU_FOUND_TOWN :Резултати градот # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :субвенции # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :График на оперативен профит STR_GRAPH_MENU_INCOME_GRAPH :График на добивка STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :График на испорачан товар @@ -403,54 +397,43 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :График н STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Курс на исплата за товар # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Табела на вредност на компании STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Детален перформанси рејтинг # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :индустрија директориум STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Фонд за нова индустрија # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Железничка изградба STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Електрифицирани железнички изградба STR_RAIL_MENU_MONORAIL_CONSTRUCTION :монорелса изградба STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Maglev изградба # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :изградба на патишта STR_ROAD_MENU_TRAM_CONSTRUCTION :трамвај изградба # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :патишта изградба # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Изградба на аеродром # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :уредување STR_LANDSCAPING_MENU_PLANT_TREES :насадат дрвја STR_LANDSCAPING_MENU_PLACE_SIGN :место знак # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Звук/музика # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Последната порака/вест STR_NEWS_MENU_MESSAGE_HISTORY_MENU :порака историјата # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Земјиште во областа -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Вклучи конзола STR_ABOUT_MENU_AI_DEBUG :АИ / игри сценарио де-бубачки STR_ABOUT_MENU_SCREENSHOT :Слика од екранот diff --git a/src/lang/malay.txt b/src/lang/malay.txt index 461a62f75a..e26f26da16 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -377,30 +377,24 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Bangunan-bangun STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Teluskan tanda arah # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Simpan Permainan STR_FILE_MENU_LOAD_GAME :Buka Permainan STR_FILE_MENU_QUIT_GAME :Tinggalkan Permainan -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Keluar # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Peta Dunia STR_MAP_MENU_EXTRA_VIEWPORT :Tetingkap pemandangan tambahan STR_MAP_MENU_SIGN_LIST :Senarai papan tanda # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Senarai Nama Bandar STR_TOWN_MENU_FOUND_TOWN :Binakan bandar # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subsidi # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Graf keuntungan operasi STR_GRAPH_MENU_INCOME_GRAPH :Graf Pendapatan STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Graf Penghantaran Kargo @@ -409,56 +403,45 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Graf nilai syar STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Kadar bayaran kargo # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Jadual liga syarikat STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Penarafan prestasi secara terperinci STR_GRAPH_MENU_HIGHSCORE :Carta mata tertinggi # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Direktori Industri STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Rantaian industri STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Biaya industri baru # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Pembinaan landasan keretapi STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Pembinaan landasan keretapi berelektrik STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Pembinaan landasan monorel STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Pembinaan landasan maglev # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Pembinaan jalanraya STR_ROAD_MENU_TRAM_CONSTRUCTION :Pembinaan laluan trem # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Pembinaan tali air # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Pembinaan lapangan terbang # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Pemindaan lanskap STR_LANDSCAPING_MENU_PLANT_TREES :Tanam pokok-pokok STR_LANDSCAPING_MENU_PLACE_SIGN :Letakkan papan tanda # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Bunyi/muzik # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Pesanan/laporan berita terkini STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Pesanan sebelumnya # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Maklumat kawasan tanah -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Papar atau padamkan konsol STR_ABOUT_MENU_AI_DEBUG :Al/Skrip pepijat permainan STR_ABOUT_MENU_SCREENSHOT :Tangkapan skrin (Ctrl+S) diff --git a/src/lang/maltese.txt b/src/lang/maltese.txt index 0beb12735e..8ead54ff11 100644 --- a/src/lang/maltese.txt +++ b/src/lang/maltese.txt @@ -272,50 +272,34 @@ STR_SCENEDIT_FILE_MENU_SEPARATOR : ###length 15 # File menu -###length 5 -STR_FILE_MENU_SEPARATOR : # Map menu -###length 4 # Town menu -###length 2 # Subsidies menu -###length 1 # Graph menu -###length 6 # Company league menu -###length 3 # Industry menu -###length 3 # URailway construction menu -###length 4 # Road construction menu -###length 2 # Waterways construction menu -###length 1 # Aairport construction menu -###length 1 # Landscaping menu -###length 3 # Music menu -###length 1 # Message menu -###length 3 # About menu -###length 12 # Place in highscore window ###length 15 diff --git a/src/lang/marathi.txt b/src/lang/marathi.txt index daa1680c83..941d8dbd2c 100644 --- a/src/lang/marathi.txt +++ b/src/lang/marathi.txt @@ -365,29 +365,23 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :इमारत STR_SETTINGS_MENU_TRANSPARENT_SIGNS :स्थानकांची नावे पारदर्शक # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :खेळ वाचवणे STR_FILE_MENU_LOAD_GAME :खेळ उघडा STR_FILE_MENU_QUIT_GAME :खेळ सोडून द्या -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :बाहेर पडा # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :वैश्विक नकाशा STR_MAP_MENU_SIGN_LIST :चिन्हांची यादी # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :शहरांची यादी STR_TOWN_MENU_FOUND_TOWN :सापडलेलं शहर # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :अनुदान # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :चालू असले नफा आलेख STR_GRAPH_MENU_INCOME_GRAPH :आवक आलेख STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :वितरित मालवाहू आलेख @@ -396,55 +390,44 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :कंपनी STR_GRAPH_MENU_CARGO_PAYMENT_RATES :मालवाहू देयक दर # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :कंपनी लीग तक्ता STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :तपशीलावर कामगिरी रेटिंग STR_GRAPH_MENU_HIGHSCORE :उच्च स्कोअर तक्ता # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :उद्योग निर्देशिका STR_INDUSTRY_MENU_INDUSTRY_CHAIN :इंडस्ट्री बंदिवासात STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :नवीन उद्योग फंड # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :लोहमार्ग बांधणी STR_RAIL_MENU_ELRAIL_CONSTRUCTION :विद्युत लोहमार्ग बांधणी STR_RAIL_MENU_MONORAIL_CONSTRUCTION :मोनोरेल बांधणी STR_RAIL_MENU_MAGLEV_CONSTRUCTION :मॅग्लेव बांधणी # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :रस्तेबांधणी STR_ROAD_MENU_TRAM_CONSTRUCTION :ट्रामगाडी बांधणी # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :जलमार्ग बांधणी # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :विमानतळ बांधणी # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_PLANT_TREES :झाडे लावा STR_LANDSCAPING_MENU_PLACE_SIGN :चिन्ह लावा # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :ध्वनी/संगीत # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :शेवटचा संदेश/बातम्या अहवाल STR_NEWS_MENU_MESSAGE_HISTORY_MENU :निरोपांचा इतिहास # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :जागाची माहिती -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_SCREENSHOT :द्श्य STR_ABOUT_MENU_ABOUT_OPENTTD :ओपेन टीटीडी बद्दल diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index d2b54e2345..fb2c08cb1e 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -415,31 +415,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Gjennomsiktige STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Gjennomsiktige skilt # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Lagre spill STR_FILE_MENU_LOAD_GAME :Last inn spill STR_FILE_MENU_QUIT_GAME :Avslutt gjeldende spill -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Avslutt OpenTTD # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Verdenskart STR_MAP_MENU_EXTRA_VIEWPORT :Ekstra tilleggsvindu STR_MAP_MENU_LINGRAPH_LEGEND :Symbolforklaring for vareflyt STR_MAP_MENU_SIGN_LIST :Skiltliste # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Byoversikt STR_TOWN_MENU_FOUND_TOWN :Grunnlegg by # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subsidier # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Graf over fortjeneste STR_GRAPH_MENU_INCOME_GRAPH :Graf over Inntekter STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Graf over leverte varer @@ -448,57 +442,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Graf over firma STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Varetakster # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Firmarangeringstabell STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Detaljert prestasjonrating STR_GRAPH_MENU_HIGHSCORE :Tavle med høyeste poengsummer # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Liste over industrier STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Industrikjeder STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Finansier ny industri # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Bygg jernbane STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Bygg elektrisk jernbane STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Bygg monorail STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Bygg maglev # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Bygg vei STR_ROAD_MENU_TRAM_CONSTRUCTION :Bygg trikkespor # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Bygg vannveier # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Bygg flyplass # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Landskapsverktøy STR_LANDSCAPING_MENU_PLANT_TREES :Plant trær STR_LANDSCAPING_MENU_PLACE_SIGN :Plasser skilt # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Lyd/musikk # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Siste melding/nyhet STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Tidligere meldinger STR_NEWS_MENU_DELETE_ALL_MESSAGES :Slett alle meldinger # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informasjon om landområde -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Vis/skjul konsoll STR_ABOUT_MENU_AI_DEBUG :AI/Spillskript-feilsøking STR_ABOUT_MENU_SCREENSHOT :Skjermbilde diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index aa358c6f0f..7605587d49 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -396,31 +396,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Gjennomsiktige STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Gjennomsiktige skilt # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Lagre spel STR_FILE_MENU_LOAD_GAME :Last inn spel STR_FILE_MENU_QUIT_GAME :Avslutt noverande spel -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Avslutt OpenTTD # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Verdskart STR_MAP_MENU_EXTRA_VIEWPORT :Ekstra tilleggsvindauge STR_MAP_MENU_LINGRAPH_LEGEND :Symbolforklaring for vareflyt STR_MAP_MENU_SIGN_LIST :Skiltliste # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Byoversikt STR_TOWN_MENU_FOUND_TOWN :Grunnlegg by # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subsidiar # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Fortenestegraf STR_GRAPH_MENU_INCOME_GRAPH :Inntektsgraf STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Graf over leverte varer @@ -429,56 +423,45 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Graf over firma STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Varetakster # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Firmarangeringstabell STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Detaljert prestasjonsnivå STR_GRAPH_MENU_HIGHSCORE :Poengtavle # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Oversikt over industriar STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Næringskjeder STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Finansier ny industri # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Bygg jernbane STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Bygg elektrisk jernbane STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Bygg monorail STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Bygg maglev # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Bygg veg STR_ROAD_MENU_TRAM_CONSTRUCTION :Bygg trikkespor # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Bygg vannvegar # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Bygg flyplass # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Landskapsverktøy STR_LANDSCAPING_MENU_PLANT_TREES :Plant tre STR_LANDSCAPING_MENU_PLACE_SIGN :Plasser skilt # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Lyd/musikk # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Siste melding/nyheit STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Tidlegare meldingar # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informasjon om landområde -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Syne/gøym konsoll STR_ABOUT_MENU_AI_DEBUG :AI- / Spelscriptfeilsøking STR_ABOUT_MENU_SCREENSHOT :Skjermdump diff --git a/src/lang/persian.txt b/src/lang/persian.txt index 263c10a303..9a651fcdd1 100644 --- a/src/lang/persian.txt +++ b/src/lang/persian.txt @@ -385,31 +385,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :ساختمان STR_SETTINGS_MENU_TRANSPARENT_SIGNS :شفاف کردن نشان های ایستگاه ها # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :ذخیره بازی STR_FILE_MENU_LOAD_GAME :فراخوانی بازی STR_FILE_MENU_QUIT_GAME :رها کردن بازی -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :خروج # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :نقشه ی دنیا STR_MAP_MENU_EXTRA_VIEWPORT :نمای اضافه STR_MAP_MENU_LINGRAPH_LEGEND :میزان حمل بار STR_MAP_MENU_SIGN_LIST :لیست نشانه # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :لیست شهر ها STR_TOWN_MENU_FOUND_TOWN :ساخت شهر # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :یارانه ها # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :نمودار سود خالص STR_GRAPH_MENU_INCOME_GRAPH :نمودار درآمد STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :نمودار محموله های رسانده شده @@ -418,56 +412,45 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :نمودار ا STR_GRAPH_MENU_CARGO_PAYMENT_RATES :نمودار قیمت پرداختی محموله ها # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :جدول اتحادیه شرکتها STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :جزییات امتیازهای کارایی STR_GRAPH_MENU_HIGHSCORE :جدول بالاترین امتیازها # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :فهرست صنایع STR_INDUSTRY_MENU_INDUSTRY_CHAIN :زنجیره تولید STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :ساخت کارخانه جدید # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :ساخت راه آهن STR_RAIL_MENU_ELRAIL_CONSTRUCTION :ساخت و ساز ریل برقی STR_RAIL_MENU_MONORAIL_CONSTRUCTION :ساخت مونوریل STR_RAIL_MENU_MAGLEV_CONSTRUCTION :ساخت ریل مغناطیسی # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :ساخت جاده STR_ROAD_MENU_TRAM_CONSTRUCTION :ساخت ساز تراموا # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :ساخت ساز آبراهه # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :ساختمان فرودگاه # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :محوطه سازی STR_LANDSCAPING_MENU_PLANT_TREES :کاشتن درخت STR_LANDSCAPING_MENU_PLACE_SIGN :قرار دادن علامت # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :صدا/موسیقی # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :گزارش آخرین پیام/خبر STR_NEWS_MENU_MESSAGE_HISTORY_MENU :تاریخچه پیام ها # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :اطلاعات زمین ها -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :باز و بسته کردن کنسول STR_ABOUT_MENU_AI_DEBUG :خطایابی هوش مصنوعی STR_ABOUT_MENU_SCREENSHOT :تصویر از بازی diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 7392866582..53b10fb415 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -819,31 +819,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Przeźroczyste STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Przeźroczyste znaki # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Zapisz grę STR_FILE_MENU_LOAD_GAME :Wczytaj grę STR_FILE_MENU_QUIT_GAME :Opuść grę -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Wyjście # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Mapa świata STR_MAP_MENU_EXTRA_VIEWPORT :Dodatkowy podgląd STR_MAP_MENU_LINGRAPH_LEGEND :Legenda przepływu ładunków STR_MAP_MENU_SIGN_LIST :Lista napisów # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Lista miast STR_TOWN_MENU_FOUND_TOWN :Załóż miasto # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Dotacje # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Wykres zysku operacyjnego STR_GRAPH_MENU_INCOME_GRAPH :Wykres przychodów STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Wykres dostarczonego ładunku @@ -852,58 +846,47 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Wykres wartośc STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Stawki płatności za ładunek # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Ranking firm STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Szczegóły oceny wydajności STR_GRAPH_MENU_HIGHSCORE :Tabela wyników # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Spis przedsiębiorstw STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Łańcuchy produkcji STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Ufunduj nowe przedsiębiorstwo # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Konstrukcja linii kolejowej STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Konstrukcja linii zelektryfikowanej STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Konstrukcja linii jednoszynowej STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Konstrukcja linii Maglev # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Budowa drogi STR_ROAD_MENU_TRAM_CONSTRUCTION :Budowa linii tramwajowej # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Konstrukcja kanału wodnego # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Konstrukcje lotnicze # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Krajobraz STR_LANDSCAPING_MENU_PLANT_TREES :Posadź drzewa STR_LANDSCAPING_MENU_PLACE_SIGN :Umieść napis # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Dźwięk/muzyka # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Ostatnia wiadomość/ogłoszenie STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Poprzednie wiadomości STR_NEWS_MENU_DELETE_ALL_MESSAGES :Usuń wszystkie wiadomości # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informacje o terenie STR_ABOUT_MENU_HELP :Pomoc i instrukcje -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Włącz/wyłącz konsolę STR_ABOUT_MENU_AI_DEBUG :Debugowanie SI / Game Script STR_ABOUT_MENU_SCREENSHOT :Zrzut ekranu diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 4f7f90fdb6..9adc82c7dc 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -441,31 +441,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Edifícios tran STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Sinais Transparentes # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Guardar jogo STR_FILE_MENU_LOAD_GAME :Abrir jogo STR_FILE_MENU_QUIT_GAME :Abandonar jogo -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Sair # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Mapa do mundo STR_MAP_MENU_EXTRA_VIEWPORT :Visualizador extra STR_MAP_MENU_LINGRAPH_LEGEND :Legenda do fluxo de carga STR_MAP_MENU_SIGN_LIST :Lista de sinais # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Lista de localidades STR_TOWN_MENU_FOUND_TOWN :Fundar localidade # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subsídios # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Gráfico do lucro operacional STR_GRAPH_MENU_INCOME_GRAPH :Rendimentos STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Carga entregue @@ -474,58 +468,47 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Valor da empres STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Tarifas por carga # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Classificação de empresas STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Classificação detalhada de desempenho STR_GRAPH_MENU_HIGHSCORE :Tabela de classificações # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Lista de indústrias STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Cadeias de indústria STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Financiar nova indústria # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Construção de caminhos-de-ferro STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Construção de caminhos-de-ferro eletrificados STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Construir monocarril STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Construir Maglev # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Construir estradas STR_ROAD_MENU_TRAM_CONSTRUCTION :Construção de carris para eléctricos # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Construção de hidrovia # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Construção de aeroportos # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Paisagem STR_LANDSCAPING_MENU_PLANT_TREES :Plantar árvores STR_LANDSCAPING_MENU_PLACE_SIGN :Colocar sinal # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Som/música # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Última mensagem/notícia STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Histórico de mensagens STR_NEWS_MENU_DELETE_ALL_MESSAGES :Apagar todas as mensagens # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informações do terreno STR_ABOUT_MENU_HELP :Ajuda & manuais -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Mostrar/Ocultar consola STR_ABOUT_MENU_AI_DEBUG :Depuração da IA/Scripts de jogo STR_ABOUT_MENU_SCREENSHOT :Captura de ecrã diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 9483e89ed5..dcca6dc1f5 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -440,31 +440,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Peisaj transpar STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Nume staţii/semne transparente # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Salvează jocul STR_FILE_MENU_LOAD_GAME :Încarcă joc STR_FILE_MENU_QUIT_GAME :Ieșire în meniul principal -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Ieşire din joc # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Harta lumii STR_MAP_MENU_EXTRA_VIEWPORT :Ecran suplimentar STR_MAP_MENU_LINGRAPH_LEGEND :Legenda flux încărcătură STR_MAP_MENU_SIGN_LIST :Lista de semne # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Lista oraşelor STR_TOWN_MENU_FOUND_TOWN :Fondează oraş # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subvenţii # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Profitul operaţional STR_GRAPH_MENU_INCOME_GRAPH :Venituri STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Număr încărcături livrate @@ -473,58 +467,47 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Valoarea compan STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Valorile plăților pe mărfuri # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Clasamentul companiilor STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Rating de performanţă detaliat STR_GRAPH_MENU_HIGHSCORE :Tabela cu scoruri maxime # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Lista industriilor STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Lanțuri industriale STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Obiectiv industrial nou # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Construcţie cale ferată STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Construcţie cale ferată electrificată STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Construcţie monoşină STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Construcţie pernă magnetică # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Construcţii rutiere STR_ROAD_MENU_TRAM_CONSTRUCTION :Construcție tramvai # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Construcţie rute acvatice # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Construire aeroport # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Modificare peisaj STR_LANDSCAPING_MENU_PLANT_TREES :Plantează arbori STR_LANDSCAPING_MENU_PLACE_SIGN :Plasează semn # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Sunet/muzică # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Ultimul mesaj/ultima știre STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Lista ultimelor mesaje STR_NEWS_MENU_DELETE_ALL_MESSAGES :Șterge toate mesajele # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informaţii despre teren STR_ABOUT_MENU_HELP :Ajutor și manuale -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Consolă pornit/oprit STR_ABOUT_MENU_AI_DEBUG :Depanare Inteligenţă Artificială / Script Joc STR_ABOUT_MENU_SCREENSHOT :Capturează ecranul diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 4d0c3637d7..1eb347f757 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -566,31 +566,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Прозрач STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Прозрачные надписи # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Сохранить игру STR_FILE_MENU_LOAD_GAME :Загрузить игру STR_FILE_MENU_QUIT_GAME :В главное меню -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Выход # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Карта мира STR_MAP_MENU_EXTRA_VIEWPORT :Доп. окно просмотра STR_MAP_MENU_LINGRAPH_LEGEND :Схема грузопотоков STR_MAP_MENU_SIGN_LIST :Список табличек # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Список городов STR_TOWN_MENU_FOUND_TOWN :Основать город # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Субсидии # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :График прибыли STR_GRAPH_MENU_INCOME_GRAPH :График дохода STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :График доставленного груза @@ -599,58 +593,47 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :График с STR_GRAPH_MENU_CARGO_PAYMENT_RATES :График оплаты перевозок # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Табель о рангах STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Рейтинг в деталях STR_GRAPH_MENU_HIGHSCORE :Таблица рекордов # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Список предприятий STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Производственные цепочки STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Создать новое предприятие # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Строительство неэлектрифицированной ж/д STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Строительство электрифицированной ж/д STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Строительство монорельсовой ж/д STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Строительство магнитной ж/д # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Строительство автомобильной инфраструктуры STR_ROAD_MENU_TRAM_CONSTRUCTION :Строительство трамвайной инфраструктуры # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Строительство инфраструктуры водного транспорта # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Строительство аэропортов # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Ландшафт STR_LANDSCAPING_MENU_PLANT_TREES :Высадка деревьев STR_LANDSCAPING_MENU_PLACE_SIGN :Поставить метку # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Звук/музыка # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Последняя новость STR_NEWS_MENU_MESSAGE_HISTORY_MENU :История сообщений STR_NEWS_MENU_DELETE_ALL_MESSAGES :Удалить все сообщения # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Информация об участке земли STR_ABOUT_MENU_HELP :Помощь и документация -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Консоль STR_ABOUT_MENU_AI_DEBUG :Отладка ИИ / скриптов STR_ABOUT_MENU_SCREENSHOT :Снимок экрана diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index a5dd4b3327..d318688421 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -610,31 +610,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Transparentne z STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Transparentni znakovi # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Sačuvaj igru STR_FILE_MENU_LOAD_GAME :Učitaj igru STR_FILE_MENU_QUIT_GAME :Napusti igru -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Izađi # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Karta sveta STR_MAP_MENU_EXTRA_VIEWPORT :Dodatno gledište STR_MAP_MENU_LINGRAPH_LEGEND :Legenda protoka tereta STR_MAP_MENU_SIGN_LIST :Lista Znakova # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Popis naselja STR_TOWN_MENU_FOUND_TOWN :Osnivanje naselja # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subvencije # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Grafikon operativnog profita STR_GRAPH_MENU_INCOME_GRAPH :Grafikon prihoda STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Grafikon dostavljenog tereta @@ -643,57 +637,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Grafikon vredno STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Stope naplate tereta # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Tabela lige preduzeća STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Detaljan pregled poslovanja STR_GRAPH_MENU_HIGHSCORE :Tabela najboljih rezultata # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Spisak fabrika STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Lanci fabrika STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Finansiranje nove fabrike # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Izgradnja železnice STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Izgradnja elektrifikovane železnice STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Izgradnja jednošinske železnice STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Izgradnja magnetne železnice # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Izgradnja drumskog sistema STR_ROAD_MENU_TRAM_CONSTRUCTION :Izgradnja tramvajskog sistema # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Izgradnja plovnog sistema # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Izgradnja aerodroma # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Oblikovanje terena STR_LANDSCAPING_MENU_PLANT_TREES :Posadi drvo STR_LANDSCAPING_MENU_PLACE_SIGN :Postavi znak # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Zvuk/muzika # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Poslednja poruka/izveštaj STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Istorija Obaveštenja STR_NEWS_MENU_DELETE_ALL_MESSAGES :Obriši sve poruke # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Podaci o zemljištu -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Uključi/isključi konzolu STR_ABOUT_MENU_AI_DEBUG :Korekcija VI / skripte igre STR_ABOUT_MENU_SCREENSHOT :Sačuvaj sliku diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index a3d367230e..7cf9b1410a 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -440,31 +440,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :透明建筑 STR_SETTINGS_MENU_TRANSPARENT_SIGNS :透明车站标志 # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :保存游戏 STR_FILE_MENU_LOAD_GAME :读取存档 STR_FILE_MENU_QUIT_GAME :放弃游戏 -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :退出 # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :缩略地图 STR_MAP_MENU_EXTRA_VIEWPORT :额外视点 STR_MAP_MENU_LINGRAPH_LEGEND :客货流图标 STR_MAP_MENU_SIGN_LIST :标志列表 # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :城镇列表 STR_TOWN_MENU_FOUND_TOWN :建立城镇 # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :财政补贴 # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :利润图表 STR_GRAPH_MENU_INCOME_GRAPH :收入图表 STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :运输货物图表 @@ -473,58 +467,47 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :公司市值图 STR_GRAPH_MENU_CARGO_PAYMENT_RATES :货物运费图表 # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :公司评价排名 STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :公司评价明细 STR_GRAPH_MENU_HIGHSCORE :高分榜 # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :工业列表 STR_INDUSTRY_MENU_INDUSTRY_CHAIN :产业链 STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :新建工业设施 # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :铁路建设 STR_RAIL_MENU_ELRAIL_CONSTRUCTION :电气化铁路建设 STR_RAIL_MENU_MONORAIL_CONSTRUCTION :单轨铁路建设 STR_RAIL_MENU_MAGLEV_CONSTRUCTION :磁悬浮铁路建设 # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :道路建设 STR_ROAD_MENU_TRAM_CONSTRUCTION :电车建设 # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :水运建设 # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :机场建设 # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :景观美化 STR_LANDSCAPING_MENU_PLANT_TREES :植树 STR_LANDSCAPING_MENU_PLACE_SIGN :放置标志 # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :声音/音乐 # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :最新消息/新闻 STR_NEWS_MENU_MESSAGE_HISTORY_MENU :消息历史 STR_NEWS_MENU_DELETE_ALL_MESSAGES :删除全部消息 # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :查询地块信息 STR_ABOUT_MENU_HELP :帮助和指南 -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :切换到控制台模式 STR_ABOUT_MENU_AI_DEBUG :AI /游戏脚本调试 STR_ABOUT_MENU_SCREENSHOT :屏幕截图 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 254858c0af..e04ca99626 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -503,31 +503,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Priehľadné bu STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Priehľadné nápisy # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Uložiť hru STR_FILE_MENU_LOAD_GAME :Nahrať hru STR_FILE_MENU_QUIT_GAME :Opustiť hru -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Ukončiť # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Mapa sveta STR_MAP_MENU_EXTRA_VIEWPORT :Ďalší pohľad STR_MAP_MENU_LINGRAPH_LEGEND :Legenda k smerovaniu nákladu STR_MAP_MENU_SIGN_LIST :Zoznam popisov # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Zoznam miest STR_TOWN_MENU_FOUND_TOWN :Založiť mesto # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Dotácie # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Graf prevádzkového zisku STR_GRAPH_MENU_INCOME_GRAPH :Graf tržieb STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Graf prepraveného nákladu @@ -536,57 +530,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Graf hodnoty sp STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Ceny prepravy # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Hodnotenie spoločností STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Detailné hodnotenie výkonu STR_GRAPH_MENU_HIGHSCORE :Najvyššie skóre # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Zoznam priemyslu STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Priemyselné reťaze STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Financovať nový priemysel # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Výstavba železnice STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Výstavba elektrifikovanej železnice STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Výstavba jednokoľajky (Monorail) STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Výstavba magnetickej dráhy (Maglev) # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Výstavba cesty STR_ROAD_MENU_TRAM_CONSTRUCTION :Výstavba električkovej trate # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Stavba vodnej cesty # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Výstavba letiska # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Úprava terénu STR_LANDSCAPING_MENU_PLANT_TREES :Sadenie stromov STR_LANDSCAPING_MENU_PLACE_SIGN :Umiestnenie popisu # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Zvuk/Hudba # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Zobraziť poslednú správu/novinku STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Archív správ STR_NEWS_MENU_DELETE_ALL_MESSAGES :Vymazať všetky správy # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informácie o pozemku -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Zobraziť / skryť konzolu STR_ABOUT_MENU_AI_DEBUG :Ladenie AI/skriptu STR_ABOUT_MENU_SCREENSHOT :Snímka obrazovky diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index c38ab55490..4425bcc73b 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -548,31 +548,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Prosojne stavbe STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Prosojni napisi postaj # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Shrani igro STR_FILE_MENU_LOAD_GAME :Naloži igro STR_FILE_MENU_QUIT_GAME :Zapusti igro -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Izhod # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Zemljevid sveta STR_MAP_MENU_EXTRA_VIEWPORT :Dodaten pogled STR_MAP_MENU_LINGRAPH_LEGEND :Legenda pretoka tovora STR_MAP_MENU_SIGN_LIST :Seznam napisov # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Imenik mest STR_TOWN_MENU_FOUND_TOWN :Ustanovi mesto # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subvencije # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Graf dobička STR_GRAPH_MENU_INCOME_GRAPH :Graf prihodkov STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Graf dostavljenega tovora @@ -581,56 +575,45 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Graf vrednosti STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Graf plačila za tovore # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Tabela lige podjetij STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Podrobna ocena uspeha STR_GRAPH_MENU_HIGHSCORE :Tabela najboljših rezultatov # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Imenik industrij STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Industrijske verige STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Financiraj novo industrijo # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Gradnja železnice STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Gradnja elektrificirane železnice STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Enotirna železnica STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Magnetna železnica # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Gradnja ceste STR_ROAD_MENU_TRAM_CONSTRUCTION :Gradnja tramvaj proge # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Gradnja vodnih poti # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Gradnja letališča # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Oblikovanje terena STR_LANDSCAPING_MENU_PLANT_TREES :Posadi drevesa STR_LANDSCAPING_MENU_PLACE_SIGN :Postavi znak # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Zvok/glasba # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Zadnje sporočilo/novica STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Zgodovina sporočil # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Informacije o terenu -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Vklopi/Izklopi konzolo STR_ABOUT_MENU_AI_DEBUG :Razhročevanje UI / skript STR_ABOUT_MENU_SCREENSHOT :Zajemi sliko diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 8550adf5c8..6450180b39 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -423,31 +423,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Edificios trans STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Letreros transparentes # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Guardar partida STR_FILE_MENU_LOAD_GAME :Cargar partida STR_FILE_MENU_QUIT_GAME :Abandonar partida -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Salir # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Mapa del mundo STR_MAP_MENU_EXTRA_VIEWPORT :Punto de vista extra STR_MAP_MENU_LINGRAPH_LEGEND :Leyenda de Flujos de Carga STR_MAP_MENU_SIGN_LIST :Lista de letreros # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Lista de municipios STR_TOWN_MENU_FOUND_TOWN :Fundar municipio # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subvenciones # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Gráfica de beneficio operativo STR_GRAPH_MENU_INCOME_GRAPH :Gráfica de ingresos STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Gráfica de carga entregada @@ -456,57 +450,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Gráfica del va STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Tarifas de pago de cargas # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Tabla de clasificación de empresas STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Calificación detallada de desempeño STR_GRAPH_MENU_HIGHSCORE :Tabla de puntuaciones # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Lista de industrias STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Cadenas de industria STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Fundar nueva industria # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Construcción de ferrocarril STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Construcción de ferrocarril eléctrico STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Construcción de monorraíl STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Construcción de maglev # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Construcción de carretera STR_ROAD_MENU_TRAM_CONSTRUCTION :Construcción de tranvía # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Construcción de canales # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Construir aeropuerto # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Terreno STR_LANDSCAPING_MENU_PLANT_TREES :Plantar árboles STR_LANDSCAPING_MENU_PLACE_SIGN :Colocar letrero # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Sonido/música # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Último mensaje/noticia STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Historial de mensajes STR_NEWS_MENU_DELETE_ALL_MESSAGES :Borrar todos los mensajes # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Información del terreno -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Activar consola STR_ABOUT_MENU_AI_DEBUG :Depuración de script de juego/IA STR_ABOUT_MENU_SCREENSHOT :Captura de pantalla diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 4c764257f3..6233052156 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -423,31 +423,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Edificios trans STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Carteles transparentes # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Guardar partida STR_FILE_MENU_LOAD_GAME :Cargar partida STR_FILE_MENU_QUIT_GAME :Salir de la partida -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Salir # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Minimapa completo STR_MAP_MENU_EXTRA_VIEWPORT :Ventana de vista adicional STR_MAP_MENU_LINGRAPH_LEGEND :Leyenda de flujo de carga STR_MAP_MENU_SIGN_LIST :Lista de carteles # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Guía de localidades STR_TOWN_MENU_FOUND_TOWN :Fundar localidad # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subsidios # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Gráfica de utilidades operativas STR_GRAPH_MENU_INCOME_GRAPH :Gráfica de ingresos STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Gráfica de carga entregada @@ -456,57 +450,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Gráfica del va STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Tasas de pago por carga # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Tabla de evaluación de empresas STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Detalles de desempeño STR_GRAPH_MENU_HIGHSCORE :Tabla de puntuaciones # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Guía de industrias STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Cadenas de industrias STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Fundar nueva industria # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Construcción de ferrocarril STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Construcción de ferrocarril eléctrico STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Construcción de monorriel STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Construcción de maglev # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Construcción de carretera STR_ROAD_MENU_TRAM_CONSTRUCTION :Construcción de tranvía # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Construcción de canales # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Construcción de aeropuerto # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Alteración de terreno STR_LANDSCAPING_MENU_PLANT_TREES :Plantar árboles STR_LANDSCAPING_MENU_PLACE_SIGN :Poner letrero # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Sonido y música # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Último mensaje o noticia STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Historial de mensajes STR_NEWS_MENU_DELETE_ALL_MESSAGES :Eliminar todos los mensajes # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Información sobre área de terreno -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Activar consola STR_ABOUT_MENU_AI_DEBUG :Depuración de scripts de IA o juego STR_ABOUT_MENU_SCREENSHOT :Captura de pantalla diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 6e9086445e..914b670c1d 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -440,31 +440,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Genomskinliga b STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Genomskinliga skyltar # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Spara spelet STR_FILE_MENU_LOAD_GAME :Ladda ett spel STR_FILE_MENU_QUIT_GAME :Avsluta spelet -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Avsluta # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Världskarta STR_MAP_MENU_EXTRA_VIEWPORT :Nytt vyfönster STR_MAP_MENU_LINGRAPH_LEGEND :Legend för godsflöden STR_MAP_MENU_SIGN_LIST :Skyltlista # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Lista med städer STR_TOWN_MENU_FOUND_TOWN :Grunda stad # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Subventioner # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Graf över gångbar inkomst STR_GRAPH_MENU_INCOME_GRAPH :Graf över inkomster STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Graf över levererat gods @@ -473,57 +467,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Graf över för STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Fraktförtjänster # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Tabell över ledande företag STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Detaljerad prestationsvärdering STR_GRAPH_MENU_HIGHSCORE :Bästa spelresultat # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Industriförteckning STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Industrikedjor STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Bekosta ny industri # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Bygg järnväg STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Bygg elektrifierad järnväg STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Bygg monorail STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Bygg maglev # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Bygg väg STR_ROAD_MENU_TRAM_CONSTRUCTION :Bygg spårväg # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Bygg kanal # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Bygg flygplats # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Landskapsarkitektur STR_LANDSCAPING_MENU_PLANT_TREES :Plantera träd STR_LANDSCAPING_MENU_PLACE_SIGN :Placera skylt # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Ljud/musik # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Senaste meddelandet/nyheten STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Meddelandehistorik STR_NEWS_MENU_DELETE_ALL_MESSAGES :Ta bort alla meddelanden # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Information om mark -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Visa/dölj konsolen STR_ABOUT_MENU_AI_DEBUG :Felsökning av datorspelare/spelskript STR_ABOUT_MENU_SCREENSHOT :Skärmdump diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt index c9d9ed34d3..1d164e49ee 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -404,31 +404,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :கட்டட STR_SETTINGS_MENU_TRANSPARENT_SIGNS :ஒளிபுகும் குறிகள் # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :விளையாட்டை பதி STR_FILE_MENU_LOAD_GAME :விளையாட்டை ஏற்று STR_FILE_MENU_QUIT_GAME :விளையாட்டை கைவிடு -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :வெளியேறு # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :உலகப் படம் STR_MAP_MENU_EXTRA_VIEWPORT :கூடுதல் பார்வைபடம் STR_MAP_MENU_LINGRAPH_LEGEND :சரக்கு செல்லும் வழிப் படம் STR_MAP_MENU_SIGN_LIST :குறிகளின் பட்டியல் # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :நகர புத்தகம் STR_TOWN_MENU_FOUND_TOWN :நகரம் உருவாக்கு # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :மானியங்கள் # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :தொழிற்பாட்டு இலாப வரைபடம் STR_GRAPH_MENU_INCOME_GRAPH :வருமான வரைபடம் STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :கொண்டு சேர்கப்பட்ட சரக்கு வரைபடம் @@ -437,57 +431,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :கம்பெ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :சரக்கு வருமானங்கள் # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :நிறுவனங்களின் பட்டியல் STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :விவரமான செயல்திறன் மதிப்பீடு STR_GRAPH_MENU_HIGHSCORE :புள்ளிகள் பட்டியல் # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :தொழிற்சாலைகளின் பட்டியல் STR_INDUSTRY_MENU_INDUSTRY_CHAIN :தொழிற்சாலைத் தொடர்கள் STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :புதிய தொழிற்சாலையை நிறுவு # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :இரயில்வே கட்டுமானம் STR_RAIL_MENU_ELRAIL_CONSTRUCTION :மின்சார இரயில்வே கட்டுமானம் STR_RAIL_MENU_MONORAIL_CONSTRUCTION :மோனோ இரயில் கட்டுமானம் STR_RAIL_MENU_MAGLEV_CONSTRUCTION :மேக்லெவ் கட்டுமானம் # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :சாலை கட்டுமானம் STR_ROAD_MENU_TRAM_CONSTRUCTION :அமிழ் தண்டூர்திப் பாதை கட்டுமானம் # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :கடல்வழி போக்குவரத்து கட்டுமானம் # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :விமானநிலைய கட்டுமானம் # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :நிலத்தோற்றம் மாற்றுதல் STR_LANDSCAPING_MENU_PLANT_TREES :மரங்களை நடு STR_LANDSCAPING_MENU_PLACE_SIGN :அறிவிக்கை பலகை வை # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :ஒலி/இசை # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :கடைசி செய்தி/செய்தி அறிவிக்கை STR_NEWS_MENU_MESSAGE_HISTORY_MENU :செய்தி வரலாறு STR_NEWS_MENU_DELETE_ALL_MESSAGES :எல்லா செய்திகளையும் நீக்கு # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :நிலா பகுதி விவரம் -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :முனையத்தை மாற்று STR_ABOUT_MENU_AI_DEBUG :AI/வரிவடிவம் சரிபார் STR_ABOUT_MENU_SCREENSHOT :திரைபிடிப்பு diff --git a/src/lang/thai.txt b/src/lang/thai.txt index 0154731250..1eb2d8a276 100644 --- a/src/lang/thai.txt +++ b/src/lang/thai.txt @@ -399,31 +399,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :สิ่งก STR_SETTINGS_MENU_TRANSPARENT_SIGNS :ป้ายแบบโปร่งใส # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :บันทึกเกม STR_FILE_MENU_LOAD_GAME :โหลดเกม STR_FILE_MENU_QUIT_GAME :กลับไปยังเมนูหลักของเกม -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :ออกจากเกม # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :แผนที่โลก STR_MAP_MENU_EXTRA_VIEWPORT :มุมมองเพิ่มเติม STR_MAP_MENU_LINGRAPH_LEGEND :เส้นทางการกระจายสินค้า STR_MAP_MENU_SIGN_LIST :รายการป้าย # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :ทำเนียบชื่อเมือง STR_TOWN_MENU_FOUND_TOWN :ตั้งเมือง # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :การสนับสนุน # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :กราฟแสดงผลประกอบการ STR_GRAPH_MENU_INCOME_GRAPH :กราฟแสดงรายได้ STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :กราฟแสดงปริมาณการขนส่งสินค้า @@ -432,56 +426,45 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :กราฟแ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :อัตราผลตอบแทนของการส่งสินค้า # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :ตารางแสดงอันดับบริษัท STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :การวัดผลประสิทธิภาพอย่างละเอียด STR_GRAPH_MENU_HIGHSCORE :ตารางคะแนนสูงสุด # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :ทำเนียบอุตสาหกรรม STR_INDUSTRY_MENU_INDUSTRY_CHAIN :ห่วงโซ่อุตสาหกรรม STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :ลงทุนอุตสาหกรรมใหม่ # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :การก่อสร้างทางรถไฟ STR_RAIL_MENU_ELRAIL_CONSTRUCTION :การก่อสร้างทางรถไฟพลังไฟฟ้า STR_RAIL_MENU_MONORAIL_CONSTRUCTION :การก่อสร้างทางรถไฟรางเดี่ยว STR_RAIL_MENU_MAGLEV_CONSTRUCTION :การก่อสร้างทางรถไฟพลังแม่เหล็ก # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :การก่อสร้างถนน STR_ROAD_MENU_TRAM_CONSTRUCTION :การก่อสร้างทางรถราง # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :การก่อสร้างคลอง # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :การก่อสร้างท่าอากาศยาน # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :การปรับพื้นที่ STR_LANDSCAPING_MENU_PLANT_TREES :ปลูกต้นไม้ STR_LANDSCAPING_MENU_PLACE_SIGN :ปักป้าย # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :เสียงและดนตรี # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :ข้อความล่าสุด/รายงานข่าว STR_NEWS_MENU_MESSAGE_HISTORY_MENU :ดูข้อความย้อนหลัง # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :ข้อมูลพื้นที่ -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :เปิด/ปิด คอนโซล STR_ABOUT_MENU_AI_DEBUG :ดีบัก สคริปต์ AI/Game STR_ABOUT_MENU_SCREENSHOT :จับภาพหน้าจอ (Ctrl+S) diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 0fc2c4b1b3..36b7a26cc3 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -440,31 +440,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :視野穿透建 STR_SETTINGS_MENU_TRANSPARENT_SIGNS :半透明標籤 # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :儲存遊戲 STR_FILE_MENU_LOAD_GAME :載入遊戲 STR_FILE_MENU_QUIT_GAME :放棄遊戲 -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :離開 # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :世界地圖 STR_MAP_MENU_EXTRA_VIEWPORT :打開新視野 STR_MAP_MENU_LINGRAPH_LEGEND :貨物流程索引 STR_MAP_MENU_SIGN_LIST :標誌清單 # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :市鎮目錄 STR_TOWN_MENU_FOUND_TOWN :興建市鎮 # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :補助資訊 # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :營運報表 STR_GRAPH_MENU_INCOME_GRAPH :收入圖表 STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :運載報表 @@ -473,58 +467,47 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :公司市值圖 STR_GRAPH_MENU_CARGO_PAYMENT_RATES :貨物運費表 # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :公司排行榜 STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :詳細營運評比 STR_GRAPH_MENU_HIGHSCORE :積分排行榜 # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :工業目錄 STR_INDUSTRY_MENU_INDUSTRY_CHAIN :工業關係鏈 STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :投資成立工廠 # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :鋪設鐵軌 STR_RAIL_MENU_ELRAIL_CONSTRUCTION :鋪設電氣化鐵路 STR_RAIL_MENU_MONORAIL_CONSTRUCTION :鋪設單軌 STR_RAIL_MENU_MAGLEV_CONSTRUCTION :鋪設磁浮軌 # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :鋪設道路 STR_ROAD_MENU_TRAM_CONSTRUCTION :鋪設電車軌 # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :興建水道 # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :興建機場 # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :地形 STR_LANDSCAPING_MENU_PLANT_TREES :植樹 STR_LANDSCAPING_MENU_PLACE_SIGN :放置標誌 # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :音效／背景音樂 # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :上次訊息／新聞報告 STR_NEWS_MENU_MESSAGE_HISTORY_MENU :訊息記錄 STR_NEWS_MENU_DELETE_ALL_MESSAGES :刪除所有訊息 # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :土地資訊 STR_ABOUT_MENU_HELP :幫助和手冊 -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :切換主控台 STR_ABOUT_MENU_AI_DEBUG :AI/遊戲腳本除錯 STR_ABOUT_MENU_SCREENSHOT :擷取畫面 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 6acef6c10b..a176d5e3ed 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -441,31 +441,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Şeffaf binalar STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Şeffaf tabelalar # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Kaydet STR_FILE_MENU_LOAD_GAME :Yükle STR_FILE_MENU_QUIT_GAME :Ana menüye dön -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Çıkış # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Dünya haritası STR_MAP_MENU_EXTRA_VIEWPORT :Ek görünüm STR_MAP_MENU_LINGRAPH_LEGEND :Kargo Akış Göstergesi STR_MAP_MENU_SIGN_LIST :Tabela listesi # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Şehir listesi STR_TOWN_MENU_FOUND_TOWN :Şehir başlat # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Teşvikler # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Faaliyet kar grafiği STR_GRAPH_MENU_INCOME_GRAPH :Gelir grafiği STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Taşınan kargo grafiği @@ -474,58 +468,47 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Şirket değeri STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Kargo ödeme tablosu # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Şirketler ligi tablosu STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Ayrıntılı performans değerlendirmesi STR_GRAPH_MENU_HIGHSCORE :Puan tablosu # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Fabrika listesi STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Sanayi zincirleri STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Yeni fabrika kur # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Demiryolu yapımı STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Elektrikli demiryolu yapımı STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Tekli ray yapımı STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Manyetik ray yapımı # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Yol yapımı STR_ROAD_MENU_TRAM_CONSTRUCTION :Tramvay yapımı # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Suyolu inşaatı # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Havalimanı inşası # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Peyzaj STR_LANDSCAPING_MENU_PLANT_TREES :Ağaç dik STR_LANDSCAPING_MENU_PLACE_SIGN :Tabela dik # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Ses/müzik # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Son mesaj/haber raporu STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Mesaj geçmişi STR_NEWS_MENU_DELETE_ALL_MESSAGES :Tüm mesajları sil # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Arazi bilgisi STR_ABOUT_MENU_HELP :Yardım & Kılavuzlar -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Konsolu aç/kapa STR_ABOUT_MENU_AI_DEBUG :YZ/Oyun betik hata ayıklama STR_ABOUT_MENU_SCREENSHOT :Ekran görüntüsü diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index c647e12358..a497550f16 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -548,31 +548,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Прозорі STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Прозорі назви станцій # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Зберегти гру STR_FILE_MENU_LOAD_GAME :Завантажити гру STR_FILE_MENU_QUIT_GAME :Покинути гру -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Вихід # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Карта світу STR_MAP_MENU_EXTRA_VIEWPORT :Додаткове вікно STR_MAP_MENU_LINGRAPH_LEGEND :Легенда вантажопотоку STR_MAP_MENU_SIGN_LIST :Список позначок # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Список міст STR_TOWN_MENU_FOUND_TOWN :Заснувати місто # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Субсидії # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Операційний прибуток STR_GRAPH_MENU_INCOME_GRAPH :Графік доходів STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Доставка вантажів @@ -581,57 +575,46 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Вартіст STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Вартість перевезень # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Рейтингова таблиця STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Детальний рейтинг продуктивності STR_GRAPH_MENU_HIGHSCORE :Таблиця рекордів # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Список підприємств STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Виробничі ланцюжки STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Заснувати підприємство # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Будівництво залізниці STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Будівництво електрифікованої залізниці STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Будівництво монорейкової залізниці STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Будівництво магнітної залізниці # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Будівництво автомобільних доріг STR_ROAD_MENU_TRAM_CONSTRUCTION :Будівництво трамвайних колій # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Будівництво водних шляхів # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Будівництво аеропортів # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Ландшафт STR_LANDSCAPING_MENU_PLANT_TREES :Посадка дерев STR_LANDSCAPING_MENU_PLACE_SIGN :Встановлення позначок # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Звук/Музика # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Останнє повідомлення STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Історія повідомлень STR_NEWS_MENU_DELETE_ALL_MESSAGES :Видалити всі повідомлення # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Інформація про ділянку -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Вкл./відкл. консоль STR_ABOUT_MENU_AI_DEBUG :Зневадження ШІ / ігрового скрипту STR_ABOUT_MENU_SCREENSHOT :Знімок екрану diff --git a/src/lang/urdu.txt b/src/lang/urdu.txt index de677c0210..2060def919 100644 --- a/src/lang/urdu.txt +++ b/src/lang/urdu.txt @@ -379,30 +379,24 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :شفاف عما STR_SETTINGS_MENU_TRANSPARENT_SIGNS :شفاف اشارے # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :کھیل محفوظ کرو STR_FILE_MENU_LOAD_GAME :کھیل دوبارہ چڑھاو STR_FILE_MENU_QUIT_GAME :کھیل چھوڑ دو -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :باہر نکلو # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :دنیا کا نقشھ STR_MAP_MENU_EXTRA_VIEWPORT :اضافی منظر STR_MAP_MENU_SIGN_LIST :اشاروں کی فھرست # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :کتبِ قصبھ جات STR_TOWN_MENU_FOUND_TOWN :قصبھ قائم کیجیئے # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :امداد # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :عملی منافع مخطط STR_GRAPH_MENU_INCOME_GRAPH :آمدنی مخطط STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :پھنچائے گئے سامان کا مخطط @@ -411,54 +405,43 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :کمپنی کی STR_GRAPH_MENU_CARGO_PAYMENT_RATES :سامان کی ادایگی کا تناسب # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :کمپنیوں کے گروپ کی فہرست STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :تفصیلی عملی درجہ بندی # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :کتبِ صنعت STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :نئ سنعت تعمیر کیجیئے # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :راھ آھن پٹری کی تعمیر STR_RAIL_MENU_ELRAIL_CONSTRUCTION :برقی راھ آھن پٹری کی تعمیر STR_RAIL_MENU_MONORAIL_CONSTRUCTION :وحید راھ کی تعمیر STR_RAIL_MENU_MAGLEV_CONSTRUCTION :علناظیس کی تعمیر # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :سڑک کی تعمیر STR_ROAD_MENU_TRAM_CONSTRUCTION :ٹرام وے کی تعمیر # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :نھر کی تعمیر # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :ھواگاھ کی تعمیر # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :منظر کشی STR_LANDSCAPING_MENU_PLANT_TREES :درخت لگایئے STR_LANDSCAPING_MENU_PLACE_SIGN :اشارھ لگایے # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :آواز و موسیقی # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :پچھلا پیعام/ خبر STR_NEWS_MENU_MESSAGE_HISTORY_MENU :تاریخِ پیغامات # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :زمینی رقبہ کی معلومات -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :حائطھ تدویم STR_ABOUT_MENU_AI_DEBUG :AI debug STR_ABOUT_MENU_SCREENSHOT :اسکرین کی تصویر diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index c2c2bd0d5f..f8c1178640 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -440,31 +440,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Làm trong su STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Làm trong suốt biển hiệu # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Lưu game STR_FILE_MENU_LOAD_GAME :Nạp game STR_FILE_MENU_QUIT_GAME :Bỏ game -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Thoát # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Bản đồ thế giới STR_MAP_MENU_EXTRA_VIEWPORT :Cửa sổ bổ sung STR_MAP_MENU_LINGRAPH_LEGEND :Ghi chú luồng hàng hóa STR_MAP_MENU_SIGN_LIST :Danh sách biển hiệu # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Thư mục thị trấn STR_TOWN_MENU_FOUND_TOWN :Thị Xã # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Tiền trợ cấp # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Biều đồ lợi nhuận hoạt động STR_GRAPH_MENU_INCOME_GRAPH :Biểu đồ thu nhập STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Biểu đồ hàng hoá phân phối @@ -473,58 +467,47 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Biểu đồ gi STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Bảng giá cước vận chuyển # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Bảng tầm cỡ công ty STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Chi tiết hệ số năng suất STR_GRAPH_MENU_HIGHSCORE :Bảng điểm chơi cao nhất # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Danh mục các ngành STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Chuỗi cung ứng STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Góp vốn xây nhà máy mới # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Công trình đường ray STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Công trình đường ray điện STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Công trình tàu đơn ray STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Công trình tàu điện từ # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Công trình đường ôtô STR_ROAD_MENU_TRAM_CONSTRUCTION :Công trình ô tô điện # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Công trình đường thuỷ # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Công trình sân bay # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Phong cảnh STR_LANDSCAPING_MENU_PLANT_TREES :Trồng cây STR_LANDSCAPING_MENU_PLACE_SIGN :Đặt ký hiệu # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Âm thanh/nhạc # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Thư/bản tin cuối cùng STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Thông báo cũ STR_NEWS_MENU_DELETE_ALL_MESSAGES :Xoá tất cả thông điệp # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Thông tin vùng đất STR_ABOUT_MENU_HELP :Trợ giúp & hướng dẫn -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Bật/tắt bảng lệnh STR_ABOUT_MENU_AI_DEBUG :Gỡ rối AI / Game script STR_ABOUT_MENU_SCREENSHOT :Ảnh chụp màn hình diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 6ca4d9e6ce..e7fac0868b 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -402,31 +402,25 @@ STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :Adeiladau trylo STR_SETTINGS_MENU_TRANSPARENT_SIGNS :Arwyddion tryloyw # File menu -###length 5 STR_FILE_MENU_SAVE_GAME :Cadw Gêm STR_FILE_MENU_LOAD_GAME :Llwytho Gêm STR_FILE_MENU_QUIT_GAME :Rhoi'r gorau i'r Gêm -STR_FILE_MENU_SEPARATOR : STR_FILE_MENU_EXIT :Gadael # Map menu -###length 4 STR_MAP_MENU_MAP_OF_WORLD :Map o'r Byd STR_MAP_MENU_EXTRA_VIEWPORT :Ffenestr Olygfa Newydd STR_MAP_MENU_LINGRAPH_LEGEND :Allwedd Llif Cargo STR_MAP_MENU_SIGN_LIST :Rhestr Arwyddion # Town menu -###length 2 STR_TOWN_MENU_TOWN_DIRECTORY :Cyfeiriadur Trefi STR_TOWN_MENU_FOUND_TOWN :Sefydlu tref # Subsidies menu -###length 1 STR_SUBSIDIES_MENU_SUBSIDIES :Cymorthdaliadau # Graph menu -###length 6 STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH :Graff Elw Gweithredol STR_GRAPH_MENU_INCOME_GRAPH :Graff Incwm STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Graff Llwythi a Ddanfonwyd @@ -435,56 +429,45 @@ STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Graff Gwerth Cw STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Cyfraddau Tâl Llwythi # Company league menu -###length 3 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Tabl Cynghrair Cwmnïau STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Graddfa Fanwl Perfformiad STR_GRAPH_MENU_HIGHSCORE :Tabl sgôr uchaf # Industry menu -###length 3 STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY :Cyfeiriadur Diwydiannau STR_INDUSTRY_MENU_INDUSTRY_CHAIN :Cadwyni diwydiant STR_INDUSTRY_MENU_FUND_NEW_INDUSTRY :Ariannu diwydiant newydd # URailway construction menu -###length 4 STR_RAIL_MENU_RAILROAD_CONSTRUCTION :Adeiladu rheilffordd STR_RAIL_MENU_ELRAIL_CONSTRUCTION :Adeiladu rheilffordd drydan STR_RAIL_MENU_MONORAIL_CONSTRUCTION :Adeiladu monoreilffordd STR_RAIL_MENU_MAGLEV_CONSTRUCTION :Adeiladu maglef # Road construction menu -###length 2 STR_ROAD_MENU_ROAD_CONSTRUCTION :Adeiladu ffyrdd STR_ROAD_MENU_TRAM_CONSTRUCTION :Adeiladu tramffordd # Waterways construction menu -###length 1 STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION :Adeiladu camlesi # Aairport construction menu -###length 1 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION :Adeiladu maes awyr # Landscaping menu -###length 3 STR_LANDSCAPING_MENU_LANDSCAPING :Tirweddu STR_LANDSCAPING_MENU_PLANT_TREES :Plannu coed STR_LANDSCAPING_MENU_PLACE_SIGN :Gosod arwydd # Music menu -###length 1 STR_TOOLBAR_SOUND_MUSIC :Sain/cerddoriaeth # Message menu -###length 3 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Neges/Adroddiad newyddion ddiwethaf STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Hanes negeseuon # About menu -###length 12 STR_ABOUT_MENU_LAND_BLOCK_INFO :Gwybodaeth ardal tir -STR_ABOUT_MENU_SEPARATOR : STR_ABOUT_MENU_TOGGLE_CONSOLE :Toglu Consol STR_ABOUT_MENU_AI_DEBUG :Dadnamu AI / Sgript Gêm STR_ABOUT_MENU_SCREENSHOT :Ciplun diff --git a/src/mixer.cpp b/src/mixer.cpp index 9da1027a65..17ba32974b 100644 --- a/src/mixer.cpp +++ b/src/mixer.cpp @@ -66,67 +66,35 @@ static int RateConversion(T *b, int frac_pos) return ((b[0] * ((1 << 16) - frac_pos)) + (b[1] * frac_pos)) >> 16; } -static void mix_int16(MixerChannel *sc, int16 *buffer, uint samples, uint8 effect_vol) +template +static void mix_int16(MixerChannel *sc, int16_t *buffer, uint samples, uint8_t effect_vol) { - if (samples > sc->samples_left) samples = sc->samples_left; - sc->samples_left -= samples; - assert(samples > 0); - - const int16 *b = (const int16 *)sc->memory + sc->pos; - uint32 frac_pos = sc->frac_pos; - uint32 frac_speed = sc->frac_speed; - int volume_left = sc->volume_left * effect_vol / 255; - int volume_right = sc->volume_right * effect_vol / 255; + /* Shift required to get sample value into range for the data type. */ + const uint SHIFT = sizeof(T) * CHAR_BIT; - if (frac_speed == 0x10000) { - /* Special case when frac_speed is 0x10000 */ - do { - buffer[0] = Clamp(buffer[0] + (*b * volume_left >> 16), -MAX_VOLUME, MAX_VOLUME); - buffer[1] = Clamp(buffer[1] + (*b * volume_right >> 16), -MAX_VOLUME, MAX_VOLUME); - b++; - buffer += 2; - } while (--samples > 0); - } else { - do { - int data = RateConversion(b, frac_pos); - buffer[0] = Clamp(buffer[0] + (data * volume_left >> 16), -MAX_VOLUME, MAX_VOLUME); - buffer[1] = Clamp(buffer[1] + (data * volume_right >> 16), -MAX_VOLUME, MAX_VOLUME); - buffer += 2; - frac_pos += frac_speed; - b += frac_pos >> 16; - frac_pos &= 0xffff; - } while (--samples > 0); - } - - sc->frac_pos = frac_pos; - sc->pos = b - (const int16 *)sc->memory; -} - -static void mix_int8_to_int16(MixerChannel *sc, int16 *buffer, uint samples, uint8 effect_vol) -{ if (samples > sc->samples_left) samples = sc->samples_left; sc->samples_left -= samples; assert(samples > 0); - const int8 *b = sc->memory + sc->pos; - uint32 frac_pos = sc->frac_pos; - uint32 frac_speed = sc->frac_speed; + const T *b = (const T *)sc->memory + sc->pos; + uint32_t frac_pos = sc->frac_pos; + uint32_t frac_speed = sc->frac_speed; int volume_left = sc->volume_left * effect_vol / 255; int volume_right = sc->volume_right * effect_vol / 255; if (frac_speed == 0x10000) { /* Special case when frac_speed is 0x10000 */ do { - buffer[0] = Clamp(buffer[0] + (*b * volume_left >> 8), -MAX_VOLUME, MAX_VOLUME); - buffer[1] = Clamp(buffer[1] + (*b * volume_right >> 8), -MAX_VOLUME, MAX_VOLUME); + buffer[0] = Clamp(buffer[0] + (*b * volume_left >> SHIFT), -MAX_VOLUME, MAX_VOLUME); + buffer[1] = Clamp(buffer[1] + (*b * volume_right >> SHIFT), -MAX_VOLUME, MAX_VOLUME); b++; buffer += 2; } while (--samples > 0); } else { do { int data = RateConversion(b, frac_pos); - buffer[0] = Clamp(buffer[0] + (data * volume_left >> 8), -MAX_VOLUME, MAX_VOLUME); - buffer[1] = Clamp(buffer[1] + (data * volume_right >> 8), -MAX_VOLUME, MAX_VOLUME); + buffer[0] = Clamp(buffer[0] + (data * volume_left >> SHIFT), -MAX_VOLUME, MAX_VOLUME); + buffer[1] = Clamp(buffer[1] + (data * volume_right >> SHIFT), -MAX_VOLUME, MAX_VOLUME); buffer += 2; frac_pos += frac_speed; b += frac_pos >> 16; @@ -135,7 +103,7 @@ static void mix_int8_to_int16(MixerChannel *sc, int16 *buffer, uint samples, uin } sc->frac_pos = frac_pos; - sc->pos = b - sc->memory; + sc->pos = b - (const T *)sc->memory; } static void MxCloseChannel(uint8 channel_index) @@ -175,9 +143,9 @@ void MxMixSamples(void *buffer, uint samples) for (uint8 idx : SetBitIterator(active)) { MixerChannel *mc = &_channels[idx]; if (mc->is16bit) { - mix_int16(mc, (int16*)buffer, samples, effect_vol); + mix_int16(mc, (int16_t*)buffer, samples, effect_vol); } else { - mix_int8_to_int16(mc, (int16*)buffer, samples, effect_vol); + mix_int16(mc, (int16_t*)buffer, samples, effect_vol); } if (mc->samples_left == 0) MxCloseChannel(idx); } diff --git a/src/music/extmidi.cpp b/src/music/extmidi.cpp index dca4fc5f0d..1ab8ff42ed 100644 --- a/src/music/extmidi.cpp +++ b/src/music/extmidi.cpp @@ -134,23 +134,38 @@ void MusicDriver_ExtMidi::DoPlay() } } -void MusicDriver_ExtMidi::DoStop() +/** + * Try to end child process with kill/waitpid for up to 1 second. + * @param pid The process ID to end. + * @param signal The signal type to send. + * @return True if the process has been ended. + */ +static bool KillWait(pid_t &pid, int signal) { - if (this->pid <= 0) return; - - /* First try to gracefully stop for about five seconds; - * 5 seconds = 5000 milliseconds, 10 ms per cycle => 500 cycles. */ - for (int i = 0; i < 500; i++) { - kill(this->pid, SIGTERM); - if (waitpid(this->pid, nullptr, WNOHANG) == this->pid) { + /* First try to stop for about a second; + * 1 seconds = 1000 milliseconds, 50 ms per cycle => 20 cycles. */ + for (int i = 0; i < 20; i++) { + kill(pid, signal); + if (waitpid(pid, nullptr, WNOHANG) == pid) { /* It has shut down, so we are done */ - this->pid = -1; - return; + pid = -1; + return true; } - /* Wait 10 milliseconds. */ - CSleep(10); + /* Wait 50 milliseconds. */ + CSleep(50); } + return false; +} + +void MusicDriver_ExtMidi::DoStop() +{ + if (this->pid <= 0) return; + + if (KillWait(this->pid, SIGINT)) return; + + if (KillWait(this->pid, SIGTERM)) return; + DEBUG(driver, 0, "extmidi: gracefully stopping failed, trying the hard way"); /* Gracefully stopping failed. Do it the hard way * and wait till the process finally died. */ diff --git a/src/music_gui.cpp b/src/music_gui.cpp index 2fb1ed7ee1..b6a9a76ef1 100644 --- a/src/music_gui.cpp +++ b/src/music_gui.cpp @@ -88,6 +88,8 @@ struct MusicSystem { void PlaylistClear(); private: + uint GetSetIndex(); + void SetPositionBySetIndex(uint set_index); void ChangePlaylistPosition(int ofs); int playlist_position; @@ -156,12 +158,8 @@ void MusicSystem::ChangePlaylist(PlaylistChoices pl) this->selected_playlist = pl; this->playlist_position = 0; - if (_settings_client.music.shuffle) { - this->Shuffle(); - /* Shuffle() will also Play() if necessary, only start once */ - } else if (_settings_client.music.playing) { - this->Play(); - } + if (_settings_client.music.shuffle) this->Shuffle(); + if (_settings_client.music.playing) this->Play(); } InvalidateWindowData(WC_MUSIC_TRACK_SELECTION, 0); @@ -186,30 +184,58 @@ void MusicSystem::ChangeMusicSet(const std::string &set_name) InvalidateWindowData(WC_MUSIC_WINDOW, 0, 1, true); } -/** Enable shuffle mode and restart playback */ +/** + * Set playlist position by set index. + * @param set_index Set index to select. + */ +void MusicSystem::SetPositionBySetIndex(uint set_index) +{ + auto it = std::find_if(std::begin(this->active_playlist), std::end(this->active_playlist), [&set_index](const PlaylistEntry &ple) { return ple.set_index == set_index; }); + if (it != std::end(this->active_playlist)) this->playlist_position = std::distance(std::begin(this->active_playlist), it); +} + +/** + * Get set index from current playlist position. + * @return current set index, or UINT_MAX if nothing is selected. + */ +uint MusicSystem::GetSetIndex() +{ + return static_cast(this->playlist_position) < this->active_playlist.size() + ? this->active_playlist[this->playlist_position].set_index + : UINT_MAX; +} + +/** + * Enable shuffle mode. + */ void MusicSystem::Shuffle() { _settings_client.music.shuffle = true; + uint set_index = this->GetSetIndex(); this->active_playlist = this->displayed_playlist; for (size_t i = 0; i < this->active_playlist.size(); i++) { size_t shuffle_index = InteractiveRandom() % (this->active_playlist.size() - i); std::swap(this->active_playlist[i], this->active_playlist[i + shuffle_index]); } + this->SetPositionBySetIndex(set_index); - if (_settings_client.music.playing) this->Play(); - + InvalidateWindowData(WC_MUSIC_TRACK_SELECTION, 0); InvalidateWindowData(WC_MUSIC_WINDOW, 0); } -/** Disable shuffle and restart playback */ +/** + * Disable shuffle mode. + */ void MusicSystem::Unshuffle() { _settings_client.music.shuffle = false; - this->active_playlist = this->displayed_playlist; - if (_settings_client.music.playing) this->Play(); + uint set_index = this->GetSetIndex(); + this->active_playlist = this->displayed_playlist; + this->SetPositionBySetIndex(set_index); + InvalidateWindowData(WC_MUSIC_TRACK_SELECTION, 0); InvalidateWindowData(WC_MUSIC_WINDOW, 0); } diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp index e4e80e7792..e05fde9d74 100644 --- a/src/network/network_content_gui.cpp +++ b/src/network/network_content_gui.cpp @@ -859,7 +859,7 @@ public: case WID_NCL_OPEN_URL: if (this->selected != nullptr) { - OpenBrowser(this->selected->url.c_str()); + OpenBrowser(this->selected->url); } break; @@ -1043,67 +1043,67 @@ static const NWidgetPart _nested_network_content_list_widgets[] = { NWidget(WWT_DEFSIZEBOX, COLOUR_LIGHT_BLUE), EndContainer(), NWidget(WWT_PANEL, COLOUR_LIGHT_BLUE, WID_NCL_BACKGROUND), - NWidget(NWID_SPACER), SetMinimalSize(0, 7), SetResize(1, 0), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(8, 8, 8), + NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_wide, 0), SetPadding(WidgetDimensions::unscaled.sparse_resize), /* Top */ - NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, WID_NCL_FILTER_CAPT), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_CONTENT_FILTER_TITLE, STR_NULL), SetAlignment(SA_RIGHT), - NWidget(WWT_EDITBOX, COLOUR_LIGHT_BLUE, WID_NCL_FILTER), SetFill(1, 0), SetResize(1, 0), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0), + NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, WID_NCL_FILTER_CAPT), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_CONTENT_FILTER_TITLE, STR_NULL), SetAlignment(SA_RIGHT | SA_VERT_CENTER), + NWidget(WWT_EDITBOX, COLOUR_LIGHT_BLUE, WID_NCL_FILTER), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_LIST_FILTER_OSKTITLE, STR_LIST_FILTER_TOOLTIP), - EndContainer(), - NWidget(NWID_SPACER), SetMinimalSize(0, 7), SetResize(1, 0), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(8, 8, 8), - /* Left side. */ - NWidget(NWID_VERTICAL), SetPIP(0, 4, 0), - NWidget(NWID_HORIZONTAL), - NWidget(NWID_VERTICAL), - NWidget(NWID_HORIZONTAL), - NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_CHECKBOX), SetMinimalSize(13, 1), SetDataTip(STR_EMPTY, STR_NULL), - NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_TYPE), - SetDataTip(STR_CONTENT_TYPE_CAPTION, STR_CONTENT_TYPE_CAPTION_TOOLTIP), - NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_NAME), SetResize(1, 0), SetFill(1, 0), - SetDataTip(STR_CONTENT_NAME_CAPTION, STR_CONTENT_NAME_CAPTION_TOOLTIP), + EndContainer(), + /* Lists and info. */ + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0), + /* Left side. */ + NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_sparse, 0), + NWidget(NWID_HORIZONTAL), + NWidget(NWID_VERTICAL), + NWidget(NWID_HORIZONTAL), + NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_CHECKBOX), SetMinimalSize(13, 1), SetDataTip(STR_EMPTY, STR_NULL), + NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_TYPE), + SetDataTip(STR_CONTENT_TYPE_CAPTION, STR_CONTENT_TYPE_CAPTION_TOOLTIP), + NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_NAME), SetResize(1, 0), SetFill(1, 0), + SetDataTip(STR_CONTENT_NAME_CAPTION, STR_CONTENT_NAME_CAPTION_TOOLTIP), + EndContainer(), + NWidget(WWT_MATRIX, COLOUR_LIGHT_BLUE, WID_NCL_MATRIX), SetResize(1, 14), SetFill(1, 1), SetScrollbar(WID_NCL_SCROLLBAR), SetMatrixDataTip(1, 0, STR_CONTENT_MATRIX_TOOLTIP), EndContainer(), - NWidget(WWT_MATRIX, COLOUR_LIGHT_BLUE, WID_NCL_MATRIX), SetResize(1, 14), SetFill(1, 1), SetScrollbar(WID_NCL_SCROLLBAR), SetMatrixDataTip(1, 0, STR_CONTENT_MATRIX_TOOLTIP), + NWidget(NWID_VSCROLLBAR, COLOUR_LIGHT_BLUE, WID_NCL_SCROLLBAR), + EndContainer(), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0), + NWidget(NWID_SELECTION, INVALID_COLOUR, WID_NCL_SEL_ALL_UPDATE), + NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_SELECT_UPDATE), SetResize(1, 0), SetFill(1, 0), + SetDataTip(STR_CONTENT_SELECT_UPDATES_CAPTION, STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP), + NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_SELECT_ALL), SetResize(1, 0), SetFill(1, 0), + SetDataTip(STR_CONTENT_SELECT_ALL_CAPTION, STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP), + EndContainer(), + NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_UNSELECT), SetResize(1, 0), SetFill(1, 0), + SetDataTip(STR_CONTENT_UNSELECT_ALL_CAPTION, STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP), EndContainer(), - NWidget(NWID_VSCROLLBAR, COLOUR_LIGHT_BLUE, WID_NCL_SCROLLBAR), EndContainer(), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(0, 8, 0), - NWidget(NWID_SELECTION, INVALID_COLOUR, WID_NCL_SEL_ALL_UPDATE), - NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_SELECT_UPDATE), SetResize(1, 0), SetFill(1, 0), - SetDataTip(STR_CONTENT_SELECT_UPDATES_CAPTION, STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP), - NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_SELECT_ALL), SetResize(1, 0), SetFill(1, 0), - SetDataTip(STR_CONTENT_SELECT_ALL_CAPTION, STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP), + /* Right side. */ + NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_sparse, 0), + NWidget(WWT_PANEL, COLOUR_LIGHT_BLUE, WID_NCL_DETAILS), SetResize(1, 1), SetFill(1, 1), + EndContainer(), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_TEXTFILE + TFT_README), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_TEXTFILE_VIEW_README, STR_NULL), + NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_TEXTFILE + TFT_CHANGELOG), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_TEXTFILE_VIEW_CHANGELOG, STR_NULL), + EndContainer(), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_OPEN_URL), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_CONTENT_OPEN_URL, STR_CONTENT_OPEN_URL_TOOLTIP), + NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_TEXTFILE + TFT_LICENSE), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_TEXTFILE_VIEW_LICENCE, STR_NULL), EndContainer(), - NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_UNSELECT), SetResize(1, 0), SetFill(1, 0), - SetDataTip(STR_CONTENT_UNSELECT_ALL_CAPTION, STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP), EndContainer(), EndContainer(), - /* Right side. */ - NWidget(NWID_VERTICAL), SetPIP(0, 4, 0), - NWidget(WWT_PANEL, COLOUR_LIGHT_BLUE, WID_NCL_DETAILS), SetResize(1, 1), SetFill(1, 1), EndContainer(), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(0, 8, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_TEXTFILE + TFT_README), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_TEXTFILE_VIEW_README, STR_NULL), - NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_TEXTFILE + TFT_CHANGELOG), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_TEXTFILE_VIEW_CHANGELOG, STR_NULL), - EndContainer(), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(0, 8, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_OPEN_URL), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_CONTENT_OPEN_URL, STR_CONTENT_OPEN_URL_TOOLTIP), - NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_TEXTFILE + TFT_LICENSE), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_TEXTFILE_VIEW_LICENCE, STR_NULL), + /* Bottom. */ + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_SEARCH_EXTERNAL), SetResize(1, 0), SetFill(1, 0), + SetDataTip(STR_CONTENT_SEARCH_EXTERNAL, STR_CONTENT_SEARCH_EXTERNAL_TOOLTIP), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0), + NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_CANCEL), SetResize(1, 0), SetFill(1, 0), + SetDataTip(STR_BUTTON_CANCEL, STR_NULL), + NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_DOWNLOAD), SetResize(1, 0), SetFill(1, 0), + SetDataTip(STR_CONTENT_DOWNLOAD_CAPTION, STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP), EndContainer(), EndContainer(), EndContainer(), - NWidget(NWID_SPACER), SetMinimalSize(0, 7), SetResize(1, 0), - /* Bottom. */ - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(8, 8, 8), - NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_SEARCH_EXTERNAL), SetResize(1, 0), SetFill(1, 0), - SetDataTip(STR_CONTENT_SEARCH_EXTERNAL, STR_CONTENT_SEARCH_EXTERNAL_TOOLTIP), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(0, 8, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_CANCEL), SetResize(1, 0), SetFill(1, 0), - SetDataTip(STR_BUTTON_CANCEL, STR_NULL), - NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_DOWNLOAD), SetResize(1, 0), SetFill(1, 0), - SetDataTip(STR_CONTENT_DOWNLOAD_CAPTION, STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP), - EndContainer(), - EndContainer(), - NWidget(NWID_SPACER), SetMinimalSize(0, 2), SetResize(1, 0), /* Resize button. */ NWidget(NWID_HORIZONTAL), NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0), diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 2f0d34c85f..c53e5c7697 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -2511,7 +2511,7 @@ struct NetworkAskSurveyWindow : public Window { break; case WID_NAS_LINK: - OpenBrowser(NETWORK_SURVEY_DETAILS_LINK.c_str()); + OpenBrowser(NETWORK_SURVEY_DETAILS_LINK); break; case WID_NAS_NO: diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 98ec36b3ed..8c9ce85c5c 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -3333,12 +3333,12 @@ static ChangeInfoResult IndustrytilesChangeInfo(uint indtid, int numinfo, int pr case 0x13: { // variable length cargo acceptance byte num_cargoes = buf->ReadByte(); - if (num_cargoes > lengthof(tsp->acceptance)) { + if (num_cargoes > std::size(tsp->acceptance)) { GRFError *error = DisableGrf(STR_NEWGRF_ERROR_LIST_PROPERTY_TOO_LONG); error->param_value[1] = prop; return CIR_DISABLED; } - for (uint i = 0; i < lengthof(tsp->acceptance); i++) { + for (uint i = 0; i < std::size(tsp->acceptance); i++) { if (i < num_cargoes) { tsp->accepts_cargo[i] = GetCargoTranslation(buf->ReadByte(), _cur.grffile); /* Tile acceptance can be negative to counteract the INDTILE_SPECIAL_ACCEPTS_ALL_CARGO flag */ diff --git a/src/newgrf_callbacks.h b/src/newgrf_callbacks.h index c7db272f93..4a3bd814fc 100644 --- a/src/newgrf_callbacks.h +++ b/src/newgrf_callbacks.h @@ -283,6 +283,9 @@ enum CallbackID { /** Called to determine the engine name to show. */ CBID_VEHICLE_NAME = 0x161, // 15 bit callback + /** Called to determine probability during build. */ + CBID_VEHICLE_BUILD_PROBABILITY = 0x162, // 15 bit callback + /** Extended/non-standard callbacks follow */ /** Called to set town zones */ diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp index 5200d8f5b5..83b0e6d296 100644 --- a/src/newgrf_engine.cpp +++ b/src/newgrf_engine.cpp @@ -1362,6 +1362,20 @@ int GetEngineProperty(EngineID engine, PropertyID property, int orig_value, cons return orig_value; } +/** + * Test for vehicle build probablity type. + * @param v Vehicle whose build probability to test. + * @param type Build probability type to test for. + * @returns True iff the probability result says so. + */ +bool TestVehicleBuildProbability(Vehicle *v, EngineID engine, BuildProbabilityType type) +{ + uint16_t p = GetVehicleCallback(CBID_VEHICLE_BUILD_PROBABILITY, std::underlying_type::type(type), 0, engine, v); + if (p == CALLBACK_FAILED) return false; + + const uint16_t PROBABILITY_RANGE = 100; + return p + RandomRange(PROBABILITY_RANGE) >= PROBABILITY_RANGE; +} static void DoTriggerVehicle(Vehicle *v, VehicleTrigger trigger, uint16 base_random_bits, bool first) { diff --git a/src/newgrf_engine.h b/src/newgrf_engine.h index dfe2d2ffc8..5cf0104c19 100644 --- a/src/newgrf_engine.h +++ b/src/newgrf_engine.h @@ -103,6 +103,12 @@ bool UsesWagonOverride(const Vehicle *v); int GetVehicleProperty(const Vehicle *v, PropertyID property, int orig_value, bool is_signed = false); int GetEngineProperty(EngineID engine, PropertyID property, int orig_value, const Vehicle *v = nullptr, bool is_signed = false); +enum class BuildProbabilityType { + Reversed = 0, +}; + +bool TestVehicleBuildProbability(Vehicle *v, EngineID engine, BuildProbabilityType type); + enum VehicleTrigger { VEHICLE_TRIGGER_NEW_CARGO = 0x01, /* Externally triggered only for the first vehicle in chain */ diff --git a/src/openttd.cpp b/src/openttd.cpp index 47483af0ae..5fd1eead58 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -122,7 +122,7 @@ void OnTick_Companies(bool main_tick); extern void AfterLoadCompanyStats(); extern Company *DoStartupNewCompany(bool is_ai, CompanyID company = INVALID_COMPANY); -extern void OSOpenBrowser(const char *url); +extern void OSOpenBrowser(const std::string &url); extern void RebuildTownCaches(bool cargo_update_required, bool old_map_position); extern void ShowOSErrorBox(const char *buf, bool system); extern void NORETURN DoOSAbort(); @@ -590,7 +590,7 @@ void MakeNewgameSettingsLive() SetupTickRate(); } -void OpenBrowser(const char *url) +void OpenBrowser(const std::string &url) { /* Make sure we only accept urls that are sure to open a browser. */ if (StrStartsWith(url, "http://") || StrStartsWith(url, "https://")) { @@ -1736,7 +1736,7 @@ void CheckCaches(bool force_check, std::function log, CheckC if (flags & CHECK_CACHE_GENERAL) { /* Strict checking of the road stop cache entries */ for (const RoadStop *rs : RoadStop::Iterate()) { - if (IsStandardRoadStopTile(rs->xy)) continue; + if (IsBayRoadStopTile(rs->xy)) continue; assert(rs->GetEntry(DIAGDIR_NE) != rs->GetEntry(DIAGDIR_NW)); rs->GetEntry(DIAGDIR_NE)->CheckIntegrity(rs); diff --git a/src/openttd.h b/src/openttd.h index 032ae4a36a..1e48d24bd5 100644 --- a/src/openttd.h +++ b/src/openttd.h @@ -99,7 +99,7 @@ void SwitchToMode(SwitchMode new_mode); bool RequestNewGRFScan(struct NewGRFScanCallback *callback = nullptr); void GenerateSavegameId(); -void OpenBrowser(const char *url); +void OpenBrowser(const std::string &url); void ChangeAutosaveFrequency(bool reset); #endif /* OPENTTD_H */ diff --git a/src/os/macosx/macos.mm b/src/os/macosx/macos.mm index a034220d12..27a6bfcae9 100644 --- a/src/os/macosx/macos.mm +++ b/src/os/macosx/macos.mm @@ -150,9 +150,9 @@ void DoOSAbort() abort(); } -void OSOpenBrowser(const char *url) +void OSOpenBrowser(const std::string &url) { - [ [ NSWorkspace sharedWorkspace ] openURL:[ NSURL URLWithString:[ NSString stringWithUTF8String:url ] ] ]; + [ [ NSWorkspace sharedWorkspace ] openURL:[ NSURL URLWithString:[ NSString stringWithUTF8String:url.c_str() ] ] ]; } /** diff --git a/src/os/unix/unix.cpp b/src/os/unix/unix.cpp index 78b9d5a5c8..291c57507a 100644 --- a/src/os/unix/unix.cpp +++ b/src/os/unix/unix.cpp @@ -244,23 +244,23 @@ std::optional GetClipboardContents() #if defined(__EMSCRIPTEN__) -void OSOpenBrowser(const char *url) +void OSOpenBrowser(const std::string &url) { /* Implementation in pre.js */ - EM_ASM({ if(window["openttd_open_url"]) window.openttd_open_url($0, $1) }, url, strlen(url)); + EM_ASM({ if (window["openttd_open_url"]) window.openttd_open_url($0, $1) }, url.c_str(), url.size()); } #elif !defined( __APPLE__) -void OSOpenBrowser(const char *url) +void OSOpenBrowser(const std::string &url) { pid_t child_pid = fork(); if (child_pid != 0) return; const char *args[3]; args[0] = "xdg-open"; - args[1] = url; + args[1] = url.c_str(); args[2] = nullptr; execvp(args[0], const_cast(args)); - DEBUG(misc, 0, "Failed to open url: %s", url); + DEBUG(misc, 0, "Failed to open url: %s", url.c_str()); exit(0); } #endif /* __APPLE__ */ diff --git a/src/os/windows/win32.cpp b/src/os/windows/win32.cpp index 20ed87ad11..653e7961df 100644 --- a/src/os/windows/win32.cpp +++ b/src/os/windows/win32.cpp @@ -91,7 +91,7 @@ void NORETURN DoOSAbort() abort(); } -void OSOpenBrowser(const char *url) +void OSOpenBrowser(const std::string &url) { ShellExecute(GetActiveWindow(), L"open", OTTD2FS(url).c_str(), nullptr, nullptr, SW_SHOWNORMAL); } diff --git a/src/pathfinder/follow_track.hpp b/src/pathfinder/follow_track.hpp index 941a5230ec..8b6fe5abae 100644 --- a/src/pathfinder/follow_track.hpp +++ b/src/pathfinder/follow_track.hpp @@ -251,7 +251,7 @@ protected: inline bool CanExitOldTile() { /* road stop can be left at one direction only unless it's a drive-through stop */ - if (IsRoadTT() && IsStandardRoadStopTile(m_old_tile)) { + if (IsRoadTT() && IsBayRoadStopTile(m_old_tile)) { DiagDirection exitdir = GetRoadStopDir(m_old_tile); if (exitdir != m_exitdir) { m_err = EC_NO_WAY; @@ -282,7 +282,7 @@ protected: /** return true if we can enter m_new_tile from m_exitdir */ inline bool CanEnterNewTile() { - if (IsRoadTT() && IsStandardRoadStopTile(m_new_tile)) { + if (IsRoadTT() && IsBayRoadStopTile(m_new_tile)) { /* road stop can be entered from one direction only unless it's a drive-through stop */ DiagDirection exitdir = GetRoadStopDir(m_new_tile); if (ReverseDiagDir(exitdir) != m_exitdir) { @@ -425,7 +425,7 @@ protected: /* Single tram bits and standard road stops cause reversing. */ if (IsRoadTT() && ((IsTram() && GetSingleTramBit(m_old_tile) == ReverseDiagDir(m_exitdir)) || - (IsStandardRoadStopTile(m_old_tile) && GetRoadStopDir(m_old_tile) == ReverseDiagDir(m_exitdir)))) { + (IsBayRoadStopTile(m_old_tile) && GetRoadStopDir(m_old_tile) == ReverseDiagDir(m_exitdir)))) { /* reverse */ m_new_tile = m_old_tile; m_new_td_bits = TrackdirToTrackdirBits(ReverseTrackdir(m_old_td)); diff --git a/src/pathfinder/npf/npf.cpp b/src/pathfinder/npf/npf.cpp index c261af2d6e..870e7e3ab3 100644 --- a/src/pathfinder/npf/npf.cpp +++ b/src/pathfinder/npf/npf.cpp @@ -695,7 +695,7 @@ static bool CanEnterTileOwnerCheck(Owner owner, TileIndex tile, DiagDirection en case MP_STATION: if (HasStationRail(tile)) { // Rail station tile/waypoint return IsInfraTileUsageAllowed(VEH_TRAIN, owner, tile); - } else if (IsStandardRoadStopTile(tile)) { // Road station tile (but not drive-through stops) + } else if (IsBayRoadStopTile(tile)) { // Road station tile (but not drive-through stops) return IsInfraTileUsageAllowed(VEH_ROAD, owner, tile); } break; @@ -760,7 +760,7 @@ static DiagDirection GetTileSingleEntry(TileIndex tile, TransportType type, uint if (type != TRANSPORT_WATER && IsDepotTypeTile(tile, type)) return GetDepotDirection(tile, type); if (type == TRANSPORT_ROAD) { - if (IsStandardRoadStopTile(tile)) return GetRoadStopDir(tile); + if (IsBayRoadStopTile(tile)) return GetRoadStopDir(tile); if ((RoadTramType)subtype == RTT_TRAM) return GetSingleTramBit(tile); } diff --git a/src/roadstop.cpp b/src/roadstop.cpp index 9c4a7bcf8b..cf95fcc155 100644 --- a/src/roadstop.cpp +++ b/src/roadstop.cpp @@ -45,7 +45,7 @@ RoadStop *RoadStop::GetNextRoadStop(const RoadVehicle *v) const /* The vehicle cannot go to this roadstop (different roadtype) */ if (!HasTileAnyRoadType(rs->xy, v->compatible_roadtypes)) continue; /* The vehicle is articulated and can therefore not go to a standard road stop. */ - if (IsStandardRoadStopTile(rs->xy) && v->HasArticulatedPart()) continue; + if (IsBayRoadStopTile(rs->xy) && v->HasArticulatedPart()) continue; /* The vehicle can actually go to this road stop. So, return it! */ return rs; @@ -312,7 +312,7 @@ void RoadStop::ChangeDriveThroughDisallowedRoadDirections(DisallowedRoadDirectio */ void RoadStop::Leave(RoadVehicle *rv) { - if (IsStandardRoadStopTile(rv->tile)) { + if (IsBayRoadStopTile(rv->tile)) { /* Vehicle is leaving a road stop tile, mark bay as free */ this->FreeBay(HasBit(rv->state, RVS_USING_SECOND_BAY)); this->SetEntranceBusy(false); @@ -329,7 +329,7 @@ void RoadStop::Leave(RoadVehicle *rv) */ bool RoadStop::Enter(RoadVehicle *rv) { - if (IsStandardRoadStopTile(this->xy)) { + if (IsBayRoadStopTile(this->xy)) { /* For normal (non drive-through) road stops * Check if station is busy or if there are no free bays or whether it is a articulated vehicle. */ if (this->IsEntranceBusy() || !this->HasFreeBay() || rv->HasArticulatedPart()) return false; diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index 1a3d925d80..853460bd71 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -1188,7 +1188,7 @@ static Trackdir RoadFindPathToDest(RoadVehicle *v, TileIndex tile, DiagDirection /* Road depot owned by another company or with the wrong orientation */ trackdirs = TRACKDIR_BIT_NONE; } - } else if (IsTileType(tile, MP_STATION) && IsStandardRoadStopTile(tile)) { + } else if (IsTileType(tile, MP_STATION) && IsBayRoadStopTile(tile)) { /* Standard road stop (drive-through stops are treated as normal road) */ if (!IsInfraTileUsageAllowed(VEH_ROAD, v->owner, tile) || GetRoadStopDir(tile) == enterdir || v->HasArticulatedPart()) { @@ -1203,7 +1203,7 @@ static Trackdir RoadFindPathToDest(RoadVehicle *v, TileIndex tile, DiagDirection trackdirs = TRACKDIR_BIT_NONE; } else { /* Proper station type, check if there is free loading bay */ - if (!_settings_game.pf.roadveh_queue && IsStandardRoadStopTile(tile) && + if (!_settings_game.pf.roadveh_queue && IsBayRoadStopTile(tile) && !RoadStop::GetByTile(tile, rstype)->HasFreeBay()) { /* Station is full and RV queuing is off */ trackdirs = TRACKDIR_BIT_NONE; @@ -2089,7 +2089,7 @@ again: } } - if (IsStandardRoadStopTile(v->tile)) rs->SetEntranceBusy(true); + if (IsBayRoadStopTile(v->tile)) rs->SetEntranceBusy(true); StartRoadVehSound(v); SetWindowWidgetDirty(WC_VEHICLE_VIEW, v->index, WID_VV_START_STOP); @@ -2333,7 +2333,7 @@ Trackdir RoadVehicle::GetVehicleTrackdir() const return DiagDirToDiagTrackdir(GetRoadDepotDirection(this->tile)); } - if (IsStandardRoadStopTile(this->tile)) { + if (IsBayRoadStopTile(this->tile)) { /* We'll assume the road vehicle is facing outwards */ return DiagDirToDiagTrackdir(GetRoadStopDir(this->tile)); // Road vehicle in a station } diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 486b76f165..61104daca1 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -3306,7 +3306,7 @@ bool AfterLoadGame() /* The road owner of standard road stops was not properly accounted for. */ if (IsSavegameVersionBefore(SLV_172)) { for (TileIndex t = 0; t < map_size; t++) { - if (!IsStandardRoadStopTile(t)) continue; + if (!IsBayRoadStopTile(t)) continue; Owner o = GetTileOwner(t); SetRoadOwner(t, RTT_ROAD, o); SetRoadOwner(t, RTT_TRAM, o); @@ -3592,7 +3592,15 @@ bool AfterLoadGame() } } - if (!SlXvIsFeaturePresent(XSLFI_TIMETABLES_START_TICKS, 3)) { + if (!IsSavegameVersionBefore(SLV_TIMETABLE_START_TICKS)) { + /* Convert timetable start from a date to an absolute tick in TimerGameTick::counter. */ + for (Vehicle *v : Vehicle::Iterate()) { + /* If the start date is 0, the vehicle is not waiting to start and can be ignored. */ + if (v->timetable_start == 0) continue; + + v->timetable_start += _scaled_date_ticks - _tick_counter; + } + } else if (!SlXvIsFeaturePresent(XSLFI_TIMETABLES_START_TICKS, 3)) { extern btree::btree_map _old_timetable_start_subticks_map; for (Vehicle *v : Vehicle::Iterate()) { diff --git a/src/saveload/order_sl.cpp b/src/saveload/order_sl.cpp index 5ccc266f61..904bcbd4ae 100644 --- a/src/saveload/order_sl.cpp +++ b/src/saveload/order_sl.cpp @@ -204,7 +204,8 @@ SaveLoadTable GetOrderBackupDescription() SLE_CONDVAR(OrderBackup, cur_implicit_order_index, SLE_FILE_U8 | SLE_VAR_U16, SLV_176, SL_MAX_VERSION), SLE_CONDVAR(OrderBackup, current_order_time, SLE_UINT32, SLV_176, SL_MAX_VERSION), SLE_CONDVAR(OrderBackup, lateness_counter, SLE_INT32, SLV_176, SL_MAX_VERSION), - SLE_CONDVAR(OrderBackup, timetable_start, SLE_FILE_I32 | SLE_VAR_I64, SLV_176, SL_MAX_VERSION), + SLE_CONDVAR(OrderBackup, timetable_start, SLE_FILE_I32 | SLE_VAR_I64, SLV_176, SLV_TIMETABLE_START_TICKS_FIX), + SLE_CONDVAR(OrderBackup, timetable_start, SLE_FILE_U64 | SLE_VAR_I64, SLV_TIMETABLE_START_TICKS_FIX, SL_MAX_VERSION), SLE_CONDVAR(OrderBackup, vehicle_flags, SLE_FILE_U8 | SLE_VAR_U32, SLV_176, SLV_180), SLE_CONDVAR(OrderBackup, vehicle_flags, SLE_FILE_U16 | SLE_VAR_U32, SLV_180, SL_MAX_VERSION), SLE_REF(OrderBackup, orders, REF_ORDER), diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp index 16ba859412..c8af7a1c8a 100644 --- a/src/saveload/vehicle_sl.cpp +++ b/src/saveload/vehicle_sl.cpp @@ -130,7 +130,8 @@ public: SLE_CONDVAR(Vehicle, current_order.wait_time, SLE_FILE_U16 | SLE_VAR_U32, SLV_67, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, current_order.travel_time, SLE_FILE_U16 | SLE_VAR_U32, SLV_67, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, current_order.max_speed, SLE_UINT16, SLV_174, SL_MAX_VERSION), - SLE_CONDVAR(Vehicle, timetable_start, SLE_FILE_I32 | SLE_VAR_I64, SLV_129, SL_MAX_VERSION), + SLE_CONDVAR(Vehicle, timetable_start, SLE_FILE_I32 | SLE_VAR_I64, SLV_129, SLV_TIMETABLE_START_TICKS), + SLE_CONDVAR(Vehicle, timetable_start, SLE_FILE_U64 | SLE_VAR_I64, SLV_TIMETABLE_START_TICKS, SL_MAX_VERSION), SLE_CONDREF(Vehicle, orders, REF_ORDER, SL_MIN_VERSION, SLV_105), SLE_CONDREF(Vehicle, orders, REF_ORDERLIST, SLV_105, SL_MAX_VERSION), @@ -175,7 +176,8 @@ public: SLE_CONDREF(Vehicle, next_shared, REF_VEHICLE, SLV_2, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, group_id, SLE_UINT16, SLV_60, SL_MAX_VERSION), - SLE_CONDVAR(Vehicle, current_order_time, SLE_UINT32, SLV_67, SL_MAX_VERSION), + SLE_CONDVAR(Vehicle, current_order_time, SLE_UINT32, SLV_67, SLV_TIMETABLE_TICKS_TYPE), + SLE_CONDVAR(Vehicle, current_order_time, SLE_FILE_I32 | SLE_VAR_U32, SLV_TIMETABLE_TICKS_TYPE, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, last_loading_tick, SLE_UINT64, SLV_LAST_LOADING_TICK, SL_MAX_VERSION), SLE_CONDVAR(Vehicle, lateness_counter, SLE_INT32, SLV_67, SL_MAX_VERSION), }; diff --git a/src/script/api/script_engine.cpp b/src/script/api/script_engine.cpp index f5bdd6d815..e731158132 100644 --- a/src/script/api/script_engine.cpp +++ b/src/script/api/script_engine.cpp @@ -54,16 +54,10 @@ CargoArray cap = ::GetCapacityOfArticulatedParts(engine_id); - CargoID most_cargo = CT_INVALID; - uint amount = 0; - for (CargoID cid = 0; cid < NUM_CARGO; cid++) { - if (cap[cid] > amount) { - amount = cap[cid]; - most_cargo = cid; - } - } + auto it = std::max_element(std::cbegin(cap), std::cend(cap)); + if (*it == 0) return CT_INVALID; - return most_cargo; + return CargoID(std::distance(std::cbegin(cap), it)); } /* static */ bool ScriptEngine::CanRefitCargo(EngineID engine_id, CargoID cargo_id) @@ -93,9 +87,8 @@ case VEH_ROAD: case VEH_TRAIN: { CargoArray capacities = GetCapacityOfArticulatedParts(engine_id); - for (CargoID c = 0; c < NUM_CARGO; c++) { - if (capacities[c] == 0) continue; - return capacities[c]; + for (uint &cap : capacities) { + if (cap != 0) return cap; } return -1; } diff --git a/src/script/api/script_event_types.cpp b/src/script/api/script_event_types.cpp index db7300aee1..c7c0a5c68c 100644 --- a/src/script/api/script_event_types.cpp +++ b/src/script/api/script_event_types.cpp @@ -40,16 +40,10 @@ CargoID ScriptEventEnginePreview::GetCargoType() if (!this->IsEngineValid()) return CT_INVALID; CargoArray cap = ::GetCapacityOfArticulatedParts(this->engine); - CargoID most_cargo = CT_INVALID; - uint amount = 0; - for (CargoID cid = 0; cid < NUM_CARGO; cid++) { - if (cap[cid] > amount) { - amount = cap[cid]; - most_cargo = cid; - } - } + auto it = std::max_element(std::cbegin(cap), std::cend(cap)); + if (*it == 0) return CT_INVALID; - return most_cargo; + return CargoID(std::distance(std::cbegin(cap), it)); } int32 ScriptEventEnginePreview::GetCapacity() @@ -60,9 +54,8 @@ int32 ScriptEventEnginePreview::GetCapacity() case VEH_ROAD: case VEH_TRAIN: { CargoArray capacities = GetCapacityOfArticulatedParts(this->engine); - for (CargoID c = 0; c < NUM_CARGO; c++) { - if (capacities[c] == 0) continue; - return capacities[c]; + for (uint &cap : capacities) { + if (cap != 0) return cap; } return -1; } diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 1cc77d0517..5dbc101171 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -517,7 +517,7 @@ struct GameOptionsWindow : Window { break; case WID_GO_SURVEY_LINK_BUTTON: - OpenBrowser(NETWORK_SURVEY_DETAILS_LINK.c_str()); + OpenBrowser(NETWORK_SURVEY_DETAILS_LINK); break; case WID_GO_SURVEY_PREVIEW_BUTTON: diff --git a/src/sl/saveload_common.h b/src/sl/saveload_common.h index 7bbbd47e46..e113227c38 100644 --- a/src/sl/saveload_common.h +++ b/src/sl/saveload_common.h @@ -375,6 +375,9 @@ enum SaveLoadVersion : uint16 { SLV_CARGO_TRAVELLED, ///< 319 PR#11283 CargoPacket now tracks how far it travelled inside a vehicle. SLV_STATION_RATING_CHEAT, ///< 320 PR#11346 Add cheat to fix station ratings at 100%. + SLV_TIMETABLE_START_TICKS, ///< 321 PR#11468 Convert timetable start from a date to ticks. + SLV_TIMETABLE_START_TICKS_FIX, ///< 322 PR#11557 Fix for missing convert timetable start from a date to ticks. + SLV_TIMETABLE_TICKS_TYPE, ///< 323 PR#11435 Convert timetable current order time to ticks. SL_MAX_VERSION, ///< Highest possible saveload version diff --git a/src/sound.cpp b/src/sound.cpp index 7ae7f8dd8b..6fb582bae1 100644 --- a/src/sound.cpp +++ b/src/sound.cpp @@ -208,7 +208,7 @@ static void StartSound(SoundID sound_id, float pan, uint volume) static const byte _vol_factor_by_zoom[] = {255, 255, 255, 190, 134, 87, 10, 1, 1, 1}; -static_assert(lengthof(_vol_factor_by_zoom) == ZOOM_LVL_COUNT); +static_assert(lengthof(_vol_factor_by_zoom) == ZOOM_LVL_END); static const byte _sound_base_vol[] = { 128, 90, 128, 128, 128, 128, 128, 128, @@ -271,7 +271,7 @@ static void SndPlayScreenCoordFx(SoundID sound, int left, int right, int top, in StartSound( sound, panning, - _vol_factor_by_zoom[vp->zoom - ZOOM_LVL_BEGIN] + _vol_factor_by_zoom[vp->zoom] ); return; } diff --git a/src/station.cpp b/src/station.cpp index a12345e9ce..1ccc88d80a 100644 --- a/src/station.cpp +++ b/src/station.cpp @@ -227,7 +227,7 @@ RoadStop *Station::GetPrimaryRoadStop(const RoadVehicle *v) const /* The vehicle cannot go to this roadstop (different roadtype) */ if (!HasTileAnyRoadType(rs->xy, v->compatible_roadtypes)) continue; /* The vehicle is articulated and can therefore not go to a standard road stop. */ - if (IsStandardRoadStopTile(rs->xy) && v->HasArticulatedPart()) continue; + if (IsBayRoadStopTile(rs->xy) && v->HasArticulatedPart()) continue; /* The vehicle can actually go to this road stop. So, return it! */ break; diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 8e2a0b6b47..80064da3f7 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -3827,7 +3827,7 @@ static TrackStatus GetTileTrackStatus_Station(TileIndex tile, TransportType mode Axis axis = DiagDirToAxis(dir); if (side != INVALID_DIAGDIR) { - if (axis != DiagDirToAxis(side) || (IsStandardRoadStopTile(tile) && dir != side)) break; + if (axis != DiagDirToAxis(side) || (IsBayRoadStopTile(tile) && dir != side)) break; } TrackBits trackbits = AxisToTrackBits(axis); diff --git a/src/station_map.h b/src/station_map.h index 7c6778c233..c1bd82edef 100644 --- a/src/station_map.h +++ b/src/station_map.h @@ -259,11 +259,11 @@ static inline bool IsAnyRoadStopTile(TileIndex t) } /** - * Is tile \a t a standard (non-drive through) road stop station? + * Is tile \a t a bay (non-drive through) road stop station? * @param t Tile to check - * @return \c true if the tile is a station tile and a standard road stop + * @return \c true if the tile is a station tile and a bay road stop */ -static inline bool IsStandardRoadStopTile(TileIndex t) +static inline bool IsBayRoadStopTile(TileIndex t) { return IsAnyRoadStopTile(t) && GetStationGfx(t) < GFX_TRUCK_BUS_DRIVETHROUGH_OFFSET; } diff --git a/src/textfile_gui.cpp b/src/textfile_gui.cpp index 7d895fc89d..e675bec49a 100644 --- a/src/textfile_gui.cpp +++ b/src/textfile_gui.cpp @@ -408,7 +408,7 @@ void TextfileWindow::NavigateHistory(int delta) } case HyperlinkType::Web: - OpenBrowser(link.destination.c_str()); + OpenBrowser(link.destination); break; case HyperlinkType::File: diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index b080c0edff..6b6b2b3edf 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -85,12 +85,12 @@ void RebuildTownKdtree() /** * Check if a town 'owns' a bridge. - * Bridges to not directly have an owner, so we check the tiles adjacent to the bridge ends. + * Bridges do not directly have an owner, so we check the tiles adjacent to the bridge ends. * If either adjacent tile belongs to the town then it will be assumed that the town built * the bridge. - * @param tile Bridge tile to test - * @param t Town we are interested in - * @return true if town 'owns' a bridge. + * @param tile The bridge tile to test + * @param t The town we are interested in + * @return true If town 'owns' a bridge. */ static bool TestTownOwnsBridge(TileIndex tile, const Town *t) { @@ -174,7 +174,8 @@ void Town::PostDestructor(size_t) } /** - * Assigns town layout. If Random, generates one based on TileHash. + * Assign the town layout. + * @param layout The desired layout. If TL_RANDOM, we pick one based on TileHash. */ void Town::InitializeLayout(TownLayout layout) { @@ -188,7 +189,7 @@ void Town::InitializeLayout(TownLayout layout) /** * Return a random valid town. - * @return random town, nullptr if there are no towns + * @return A random town, or nullptr if there are no towns. */ /* static */ Town *Town::GetRandom() { @@ -257,8 +258,8 @@ void Town::FillCachedName() const } /** - * Get the cost for removing this house - * @return the cost (inflation corrected etc) + * Get the cost for removing this house. + * @return The cost adjusted for inflation, etc. */ Money HouseSpec::GetRemovalCost() const { @@ -268,7 +269,7 @@ Money HouseSpec::GetRemovalCost() const /* Local */ static int _grow_town_result; -/* Describe the possible states */ +/* The possible states of town growth. */ enum TownGrowthResult { GROWTH_SUCCEED = -1, GROWTH_SEARCH_STOPPED = 0 @@ -300,12 +301,11 @@ static TownDrawTileProc * const _town_draw_tile_procs[1] = { */ static inline DiagDirection RandomDiagDir() { - return (DiagDirection)(3 & Random()); + return (DiagDirection)(RandomRange(DIAGDIR_END)); } /** - * House Tile drawing handler. - * Part of the tile loop process + * Draw a house and its tile. This is a tile callback routine. * @param ti TileInfo of the tile to draw */ static void DrawTile_Town(TileInfo *ti, DrawTileProcParams params) @@ -437,7 +437,11 @@ static int GetSlopePixelZ_Town(TileIndex tile, uint x, uint y, bool ground_vehic return GetTileMaxPixelZ(tile); } -/** Tile callback routine */ +/** + * Get the foundation for a house. This is a tile callback routine. + * @param tile The tile to find a foundation for. + * @param tileh The slope of the tile. + */ static Foundation GetFoundation_Town(TileIndex tile, Slope tileh) { HouseID hid = GetHouseType(tile); @@ -465,10 +469,10 @@ uint8 GetAnimatedTileSpeed_Town(TileIndex tile) } /** - * Animate a tile for a town - * Only certain houses can be animated - * The newhouses animation supersedes regular ones - * @param tile TileIndex of the house to animate + * Animate a tile for a town. + * Only certain houses can be animated. + * The newhouses animation supersedes regular ones. + * @param tile TileIndex of the house to animate. */ void AnimateTile_Town(TileIndex tile) { @@ -516,10 +520,10 @@ void AnimateTile_Town(TileIndex tile) } /** - * Determines if a town is close to a tile - * @param tile TileIndex of the tile to query - * @param dist maximum distance to be accepted - * @returns true if the tile correspond to the distance criteria + * Determines if a town is close to a tile. + * @param tile TileIndex of the tile to query. + * @param dist The maximum distance to be accepted. + * @returns true if the tile is within the specified distance. */ static bool IsCloseToTown(TileIndex tile, uint dist) { @@ -528,10 +532,7 @@ static bool IsCloseToTown(TileIndex tile, uint dist) return DistanceManhattan(tile, t->xy) < dist; } -/** - * Resize the sign(label) of the town after changes in - * population (creation or growth or else) - */ +/** Resize the sign (label) of the town after it changes population. */ void Town::UpdateVirtCoord() { this->UpdateLabel(); @@ -556,6 +557,7 @@ void UpdateAllTownVirtCoords() } } +/** Clear the cached_name of all towns. */ void ClearAllTownCachedNames() { for (Town *t : Town::Iterate()) { @@ -564,9 +566,9 @@ void ClearAllTownCachedNames() } /** - * Change the towns population - * @param t Town which population has changed - * @param mod population change (can be positive or negative) + * Change the town's population as recorded in the town cache, town label, and town directory. + * @param t The town which has changed. + * @param mod The population change (can be positive or negative). */ static void ChangePopulation(Town *t, int mod) { @@ -592,9 +594,9 @@ uint32 GetWorldPopulation() /** * Remove stations from nearby station list if a town is no longer in the catchment area of each. * To improve performance only checks stations that cover the provided house area (doesn't need to contain an actual house). - * @param t Town to work on - * @param tile Location of house area (north part) - * @param flags BuildingFlags containing the size of house area + * @param t Town to work on. + * @param tile Location of house area (north tile). + * @param flags BuildingFlags containing the size of house area. */ static void RemoveNearbyStations(Town *t, TileIndex tile, BuildingFlags flags) { @@ -615,14 +617,14 @@ static void RemoveNearbyStations(Town *t, TileIndex tile, BuildingFlags flags) } /** - * Helper function for house completion stages progression - * @param tile TileIndex of the house (or parts of it) to "grow" + * Helper function for house construction stage progression. + * @param tile TileIndex of the house (or parts of it) to construct. */ -static void MakeSingleHouseBigger(TileIndex tile) +static void AdvanceSingleHouseConstruction(TileIndex tile) { assert_tile(IsTileType(tile, MP_HOUSE), tile); - /* progress in construction stages */ + /* Progress in construction stages */ IncHouseConstructionTick(tile); if (GetHouseConstructionTick(tile) != 0) return; @@ -638,16 +640,16 @@ static void MakeSingleHouseBigger(TileIndex tile) } /** - * Make the house advance in its construction stages until completion - * @param tile TileIndex of house + * Increase the construction stage of a house. + * @param tile The tile of the house under construction. */ -static void MakeTownHouseBigger(TileIndex tile) +static void AdvanceHouseConstruction(TileIndex tile) { uint flags = HouseSpec::Get(GetHouseType(tile))->building_flags; - if (flags & BUILDING_HAS_1_TILE) MakeSingleHouseBigger(TILE_ADDXY(tile, 0, 0)); - if (flags & BUILDING_2_TILES_Y) MakeSingleHouseBigger(TILE_ADDXY(tile, 0, 1)); - if (flags & BUILDING_2_TILES_X) MakeSingleHouseBigger(TILE_ADDXY(tile, 1, 0)); - if (flags & BUILDING_HAS_4_TILES) MakeSingleHouseBigger(TILE_ADDXY(tile, 1, 1)); + if (flags & BUILDING_HAS_1_TILE) AdvanceSingleHouseConstruction(TILE_ADDXY(tile, 0, 0)); + if (flags & BUILDING_2_TILES_Y) AdvanceSingleHouseConstruction(TILE_ADDXY(tile, 0, 1)); + if (flags & BUILDING_2_TILES_X) AdvanceSingleHouseConstruction(TILE_ADDXY(tile, 1, 0)); + if (flags & BUILDING_HAS_4_TILES) AdvanceSingleHouseConstruction(TILE_ADDXY(tile, 1, 1)); } /** @@ -691,8 +693,8 @@ static void TileLoop_Town(TileIndex tile) if (house_id >= NEW_HOUSE_OFFSET && !NewHouseTileLoop(tile)) return; if (!IsHouseCompleted(tile)) { - /* Construction is not completed. See if we can go further in construction*/ - MakeTownHouseBigger(tile); + /* Construction is not completed, so we advance a construction stage. */ + AdvanceHouseConstruction(tile); return; } @@ -807,6 +809,12 @@ static void TileLoop_Town(TileIndex tile) cur_company.Restore(); } +/** + * Callback function to clear a house tile. + * @param tile The tile to clear. + * @param flags Type of operation. + * @return The cost of this operation or an error. + */ static CommandCost ClearTile_Town(TileIndex tile, DoCommandFlag flags) { if (flags & DC_AUTO) return_cmd_error(STR_ERROR_BUILDING_MUST_BE_DEMOLISHED); @@ -959,6 +967,10 @@ static void ChangeTileOwner_Town(TileIndex, Owner, Owner) static bool GrowTown(Town *t); +/** + * Handle the town tick for a single town, by growing the town if desired. + * @param t The town to try growing. + */ static void TownTickHandler(Town *t) { if (HasBit(t->flags, TOWN_IS_GROWING)) { @@ -975,6 +987,7 @@ static void TownTickHandler(Town *t) } } +/** Iterate through all towns and call their tick handler. */ void OnTick_Town() { if (_game_mode == GM_EDITOR) return; @@ -985,21 +998,22 @@ void OnTick_Town() } /** - * Return the RoadBits of a tile - * - * @note There are many other functions doing things like that. - * @note Needs to be checked for needlessness. - * @param tile The tile we want to analyse - * @return The roadbits of the given tile + * Return the RoadBits of a tile, ignoring depot and bay road stops. + * @param tile The tile to check. + * @return The roadbits of the given tile. */ static RoadBits GetTownRoadBits(TileIndex tile) { - if (IsRoadDepotTile(tile) || IsStandardRoadStopTile(tile)) return ROAD_NONE; + if (IsRoadDepotTile(tile) || IsBayRoadStopTile(tile)) return ROAD_NONE; if (!MayTownModifyRoad(tile)) return ROAD_NONE; return GetAnyRoadBits(tile, RTT_ROAD, true); } +/** + * Get the road type that towns should build at this current moment. + * They may have built a different type in the past. + */ RoadType GetTownRoadType() { RoadType best_rt = ROADTYPE_ROAD; @@ -1048,10 +1062,10 @@ bool MayTownModifyRoad(TileIndex tile) * Assuming a road from (tile - TileOffsByDiagDir(dir)) to tile, * is there a parallel road left or right of it within distance dist_multi? * - * @param tile current tile - * @param dir target direction - * @param dist_multi distance multiplayer - * @return true if there is a parallel road + * @param tile The current tile. + * @param dir The target direction. + * @param dist_multi The distance multiplier. + * @return true if there is a parallel road. */ static bool IsNeighborRoadTile(TileIndex tile, const DiagDirection dir, uint dist_multi) { @@ -1080,12 +1094,12 @@ static bool IsNeighborRoadTile(TileIndex tile, const DiagDirection dir, uint dis } /** - * Check if a Road is allowed on a given tile + * Check if a Road is allowed on a given tile. * - * @param t The current town - * @param tile The target tile - * @param dir The direction in which we want to extend the town - * @return true if it is allowed else false + * @param t The current town. + * @param tile The target tile. + * @param dir The direction in which we want to extend the town. + * @return true if it is allowed. */ static bool IsRoadAllowedHere(Town *t, TileIndex tile, DiagDirection dir) { @@ -1157,13 +1171,12 @@ static void LevelTownLand(TileIndex tile) } /** - * Generate the RoadBits of a grid tile + * Generate the RoadBits of a grid tile. * - * @param t current town - * @param tile tile in reference to the town - * @param dir The direction to which we are growing ATM - * @return the RoadBit of the current tile regarding - * the selected town layout + * @param t The current town. + * @param tile The tile in reference to the town. + * @param dir The direction to which we are growing. + * @return The RoadBit of the current tile regarding the selected town layout. */ static RoadBits GetTownRoadGridElement(Town *t, TileIndex tile, DiagDirection dir) { @@ -1220,9 +1233,9 @@ static RoadBits GetTownRoadGridElement(Town *t, TileIndex tile, DiagDirection di * next to the current tile. If there are enough * add another house. * - * @param t The current town - * @param tile The target tile for the extra house - * @return true if an extra house has been added + * @param t The current town. + * @param tile The target tile for the extra house. + * @return true if an extra house has been added. */ static bool GrowTownWithExtraHouse(Town *t, TileIndex tile) { @@ -1261,10 +1274,10 @@ static bool GrowTownWithExtraHouse(Town *t, TileIndex tile) /** * Grows the town with a road piece. * - * @param t The current town - * @param tile The current tile - * @param rcmd The RoadBits we want to build on the tile - * @return true if the RoadBits have been added else false + * @param t The current town. + * @param tile The current tile. + * @param rcmd The RoadBits we want to build on the tile. + * @return true if the RoadBits have been added. */ static bool GrowTownWithRoad(const Town *t, TileIndex tile, RoadBits rcmd) { @@ -1519,10 +1532,10 @@ static bool GrowTownWithTunnel(const Town *t, const TileIndex tile, const DiagDi } /** - * Checks whether at least one surrounding roads allows to build a house here + * Checks whether at least one surrounding road allows to build a house here. * - * @param t the tile where the house will be built - * @return true if at least one surrounding roadtype allows building houses here + * @param t The tile where the house will be built. + * @return true if at least one surrounding roadtype allows building houses here. */ static inline bool RoadTypesAllowHouseHere(TileIndex t) { @@ -1886,10 +1899,10 @@ static bool CanFollowRoad(const Town *t, TileIndex tile, DiagDirection dir) } /** - * Returns "growth" if a house was built, or no if the build failed. - * @param t town to inquiry - * @param tile to inquiry - * @return true if town expansion was possible + * Try to grow a town at a given road tile. + * @param t The town to grow. + * @param tile The road tile to try growing from. + * @return true if we successfully expanded the town. */ static bool GrowTownAtRoad(Town *t, TileIndex tile) { @@ -1995,9 +2008,9 @@ static RoadBits GenRandomRoadBits() } /** - * Grow the town - * @param t town to grow - * @return true iff something (house, road, bridge, ...) was built + * Grow the town. + * @param t The town to grow + * @return true if we successfully grew the town with a road or house. */ static bool GrowTown(Town *t) { @@ -2055,6 +2068,10 @@ static bool GrowTown(Town *t) return false; } +/** + * Update the cached town zone radii of a town, based on the number of houses. + * @param t The town to update. + */ void UpdateTownRadius(Town *t) { static const uint32 _town_squared_town_zone_radius_data[23][5] = { @@ -2145,15 +2162,15 @@ static void UpdateTownGrowthRate(Town *t); static void UpdateTownGrowth(Town *t); /** - * Does the actual town creation. + * Actually create a town. * - * @param t The town - * @param tile Where to put it - * @param townnameparts The town name - * @param size Parameter for size determination - * @param city whether to build a city or town - * @param layout the (road) layout of the town - * @param manual was the town placed manually? + * @param t The town. + * @param tile Where to put it. + * @param townnameparts The town name. + * @param size The preset size of the town. + * @param city Should we create a city? + * @param layout The road layout of the town. + * @param manual Was the town placed manually? */ static void DoCreateTown(Town *t, TileIndex tile, uint32 townnameparts, TownSize size, bool city, TownLayout layout, bool manual) { @@ -2227,9 +2244,9 @@ static void DoCreateTown(Town *t, TileIndex tile, uint32 townnameparts, TownSize } /** - * Checks if it's possible to place a town at given tile - * @param tile tile to check - * @return error value or zero cost + * Check if it's possible to place a town on a given tile. + * @param tile The tile to check. + * @return A zero cost if allowed, otherwise an error. */ static CommandCost TownCanBePlacedHere(TileIndex tile, bool city) { @@ -2269,8 +2286,8 @@ static CommandCost TownCanBePlacedHere(TileIndex tile, bool city) /** * Verifies this custom name is unique. Only custom names are checked. - * @param name name to check - * @return is this name unique? + * @param name The name to check. + * @return true if the name is unique */ static bool IsUniqueTownName(const char *name) { @@ -2291,7 +2308,7 @@ static bool IsUniqueTownName(const char *name) * 6 use random location (randomize \c tile ) * @param p2 town name parts * @param text Custom name for the town. If empty, the town name parts will be used. - * @return the cost of this operation or an error + * @return The cost of this operation or an error. */ CommandCost CmdFoundTown(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text) { @@ -2413,9 +2430,9 @@ CommandCost CmdFoundTown(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 * interpenetrate their road networks will not mesh nicely; this * function adjusts a tile so that it aligns properly. * - * @param tile the tile to start at - * @param layout which town layout algo is in effect - * @return the adjusted tile + * @param tile The tile to start at. + * @param layout The town layout in effect. + * @return The adjusted tile. */ static TileIndex AlignTileToGrid(TileIndex tile, TownLayout layout) { @@ -2431,9 +2448,9 @@ static TileIndex AlignTileToGrid(TileIndex tile, TownLayout layout) * interpenetrate their road networks will not mesh nicely; this * function tells you if a tile is properly aligned. * - * @param tile the tile to start at - * @param layout which town layout algo is in effect - * @return true if the tile is in the correct location + * @param tile The tile to start at. + * @param layout The town layout in effect. + * @return true if the tile is in the correct location. */ static bool IsTileAlignedToGrid(TileIndex tile, TownLayout layout) { @@ -2486,8 +2503,7 @@ static bool FindFurthestFromWater(TileIndex tile, void *user_data) } /** - * CircularTileSearch callback; finds the nearest land tile - * + * CircularTileSearch callback to find the nearest land tile. * @param tile Start looking from this tile */ static bool FindNearestEmptyLand(TileIndex tile, void *) @@ -2498,7 +2514,7 @@ static bool FindNearestEmptyLand(TileIndex tile, void *) /** * Given a spot on the map (presumed to be a water tile), find a good * coastal spot to build a city. We don't want to build too close to - * the edge if we can help it (since that retards city growth) hence + * the edge if we can help it (since that inhibits city growth) hence * the search within a search within a search. O(n*m^2), where n is * how far to search for land, and m is how far inland to look for a * flat spot. @@ -2568,11 +2584,10 @@ static Town *CreateRandomTown(uint attempts, uint32 townnameparts, TownSize size static const byte _num_initial_towns[4] = {5, 11, 23, 46}; // very low, low, normal, high /** - * This function will generate a certain amount of towns, with a certain layout - * It can be called from the scenario editor (i.e.: generate Random Towns) - * as well as from world creation. - * @param layout which towns will be set to, when created - * @return true if towns have been successfully created + * Generate a number of towns with a given layout. + * This function is used by the Random Towns button in Scenario Editor as well as in world generation. + * @param layout The road layout to build. + * @return true if towns have been successfully created. */ bool GenerateTowns(TownLayout layout) { @@ -2667,13 +2682,13 @@ HouseZonesBits GetTownRadiusGroup(const Town *t, TileIndex tile) /** * Clears tile and builds a house or house part. - * @param tile tile index - * @param t The town to clear the house for - * @param counter of construction step - * @param stage of construction (used for drawing) - * @param type of house. Index into house specs array - * @param random_bits required for newgrf houses - * @pre house can be built here + * @param tile The tile to build upon. + * @param t The town which will own the house. + * @param counter The construction stage counter for the house. + * @param stage The current construction stage of the house. + * @param type The type of house. + * @param random_bits Random bits for newgrf houses to use. + * @pre The house can be built here. */ static inline void ClearMakeHouseTile(TileIndex tile, Town *t, byte counter, byte stage, HouseID type, byte random_bits) { @@ -2689,35 +2704,35 @@ static inline void ClearMakeHouseTile(TileIndex tile, Town *t, byte counter, byt /** - * Write house information into the map. For houses > 1 tile, all tiles are marked. - * @param t tile index + * Write house information into the map. For multi-tile houses, all tiles are marked. * @param town The town related to this house - * @param counter of construction step - * @param stage of construction (used for drawing) - * @param type of house. Index into house specs array - * @param random_bits required for newgrf houses - * @pre house can be built here + * @param t The tile to build on. If a multi-tile house, this is the northern-most tile. + * @param counter The counter of the construction stage. + * @param stage The current construction stage. + * @param The type of house. + * @param random_bits Random bits for newgrf houses to use. + * @pre The house can be built here. */ -static void MakeTownHouse(TileIndex t, Town *town, byte counter, byte stage, HouseID type, byte random_bits) +static void MakeTownHouse(TileIndex tile, Town *t, byte counter, byte stage, HouseID type, byte random_bits) { BuildingFlags size = HouseSpec::Get(type)->building_flags; - ClearMakeHouseTile(t, town, counter, stage, type, random_bits); - if (size & BUILDING_2_TILES_Y) ClearMakeHouseTile(t + TileDiffXY(0, 1), town, counter, stage, ++type, random_bits); - if (size & BUILDING_2_TILES_X) ClearMakeHouseTile(t + TileDiffXY(1, 0), town, counter, stage, ++type, random_bits); - if (size & BUILDING_HAS_4_TILES) ClearMakeHouseTile(t + TileDiffXY(1, 1), town, counter, stage, ++type, random_bits); + ClearMakeHouseTile(tile, t, counter, stage, type, random_bits); + if (size & BUILDING_2_TILES_Y) ClearMakeHouseTile(tile + TileDiffXY(0, 1), t, counter, stage, ++type, random_bits); + if (size & BUILDING_2_TILES_X) ClearMakeHouseTile(tile + TileDiffXY(1, 0), t, counter, stage, ++type, random_bits); + if (size & BUILDING_HAS_4_TILES) ClearMakeHouseTile(tile + TileDiffXY(1, 1), t, counter, stage, ++type, random_bits); if (!_generating_world) { - ForAllStationsAroundTiles(TileArea(t, (size & BUILDING_2_TILES_X) ? 2 : 1, (size & BUILDING_2_TILES_Y) ? 2 : 1), [town](Station *st, TileIndex tile) { - town->stations_near.insert(st); + ForAllStationsAroundTiles(TileArea(tile, (size & BUILDING_2_TILES_X) ? 2 : 1, (size & BUILDING_2_TILES_Y) ? 2 : 1), [t](Station *st, TileIndex tile) { + t->stations_near.insert(st); return true; }); } if (_record_house_coords) { - _record_house_rect.left = std::min(_record_house_rect.left, (int)TileX(t)); - _record_house_rect.top = std::min(_record_house_rect.top, (int)TileY(t)); - _record_house_rect.right = std::max(_record_house_rect.right, (int)TileX(t) + ((size & BUILDING_2_TILES_X) ? 2 : 1)); - _record_house_rect.bottom = std::max(_record_house_rect.bottom, (int)TileY(t) + ((size & BUILDING_2_TILES_Y) ? 2 : 1)); + _record_house_rect.left = std::min(_record_house_rect.left, (int)TileX(tile)); + _record_house_rect.top = std::min(_record_house_rect.top, (int)TileY(tile)); + _record_house_rect.right = std::max(_record_house_rect.right, (int)TileX(tile) + ((size & BUILDING_2_TILES_X) ? 2 : 1)); + _record_house_rect.bottom = std::max(_record_house_rect.bottom, (int)TileY(tile) + ((size & BUILDING_2_TILES_Y) ? 2 : 1)); } } @@ -3042,10 +3057,10 @@ CommandCost CmdBuildHouse(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 } /** - * Tries to build a house at this tile - * @param t town the house will belong to - * @param tile where the house will be built - * @return false iff no house can be built at this tile + * Tries to build a house at this tile. + * @param t The town the house will belong to. + * @param tile The tile to try building on. + * @return false iff no house can be built on this tile. */ static bool BuildTownHouse(Town *t, TileIndex tile) { @@ -3163,14 +3178,19 @@ TileIndexDiff GetHouseNorthPart(HouseID &house) return 0; } +/** + * Clear a town house. + * @param t The town which owns the house. + * @param tile The tile to clear. + */ void ClearTownHouse(Town *t, TileIndex tile) { assert_tile(IsTileType(tile, MP_HOUSE), tile); HouseID house = GetHouseType(tile); - /* need to align the tile to point to the upper left corner of the house */ - tile += GetHouseNorthPart(house); // modifies house to the ID of the north tile + /* The northernmost tile of the house is the main house. */ + tile += GetHouseNorthPart(house); const HouseSpec *hs = HouseSpec::Get(house); @@ -3546,6 +3566,12 @@ const byte _town_action_costs[TACT_COUNT] = { 2, 4, 9, 35, 48, 53, 117, 175 }; +/** + * Perform the "small advertising campaign" town action. + * @param t The town to advertise in. + * @param flags Type of operation. + * @return An empty cost. + */ static CommandCost TownActionAdvertiseSmall(Town *t, DoCommandFlag flags) { if (flags & DC_EXEC) { @@ -3554,6 +3580,12 @@ static CommandCost TownActionAdvertiseSmall(Town *t, DoCommandFlag flags) return CommandCost(); } +/** + * Perform the "medium advertising campaign" town action. + * @param t The town to advertise in. + * @param flags Type of operation. + * @return An empty cost. + */ static CommandCost TownActionAdvertiseMedium(Town *t, DoCommandFlag flags) { if (flags & DC_EXEC) { @@ -3562,6 +3594,12 @@ static CommandCost TownActionAdvertiseMedium(Town *t, DoCommandFlag flags) return CommandCost(); } +/** + * Perform the "large advertising campaign" town action. + * @param t The town to advertise in. + * @param flags Type of operation. + * @return An empty cost. + */ static CommandCost TownActionAdvertiseLarge(Town *t, DoCommandFlag flags) { if (flags & DC_EXEC) { @@ -3570,6 +3608,12 @@ static CommandCost TownActionAdvertiseLarge(Town *t, DoCommandFlag flags) return CommandCost(); } +/** + * Perform the "local road reconstruction" town action. + * @param t The town to grief in. + * @param flags Type of operation. + * @return An empty cost. + */ static CommandCost TownActionRoadRebuild(Town *t, DoCommandFlag flags) { /* Check if the company is allowed to fund new roads. */ @@ -3594,9 +3638,9 @@ static CommandCost TownActionRoadRebuild(Town *t, DoCommandFlag flags) /** * Check whether the land can be cleared. * @param tile Tile to check. - * @return The tile can be cleared. + * @return true if the tile can be cleared. */ -static bool TryClearTile(TileIndex tile) +static bool CheckClearTile(TileIndex tile) { Backup cur_company(_current_company, OWNER_NONE, FILE_LINE); CommandCost r = DoCommand(tile, 0, 0, DC_TOWN, CMD_LANDSCAPE_CLEAR); @@ -3631,7 +3675,7 @@ static bool SearchTileForStatue(TileIndex tile, void *user_data) if (IsBridgeAbove(tile)) return false; /* A clear-able open space is always preferred. */ - if ((IsTileType(tile, MP_CLEAR) || IsTileType(tile, MP_TREES)) && TryClearTile(tile)) { + if ((IsTileType(tile, MP_CLEAR) || IsTileType(tile, MP_TREES)) && CheckClearTile(tile)) { statue_data->best_position = tile; return true; } @@ -3641,7 +3685,7 @@ static bool SearchTileForStatue(TileIndex tile, void *user_data) /* Searching inside the inner circle. */ if (statue_data->tile_count <= STATUE_NUMBER_INNER_TILES) { /* Save first house in inner circle. */ - if (house && statue_data->best_position == INVALID_TILE && TryClearTile(tile)) { + if (house && statue_data->best_position == INVALID_TILE && CheckClearTile(tile)) { statue_data->best_position = tile; } @@ -3651,7 +3695,7 @@ static bool SearchTileForStatue(TileIndex tile, void *user_data) /* Searching outside the circle, just pick the first possible spot. */ statue_data->best_position = tile; // Is optimistic, the condition below must also hold. - return house && TryClearTile(tile); + return house && CheckClearTile(tile); } /** @@ -3680,6 +3724,12 @@ static CommandCost TownActionBuildStatue(Town *t, DoCommandFlag flags) return CommandCost(); } +/** + * Perform the "fund new buildings" town action. + * @param t The town to fund buildings in. + * @param flags Type of operation. + * @return An empty cost. + */ static CommandCost TownActionFundBuildings(Town *t, DoCommandFlag flags) { /* Check if it's allowed to buy the rights */ @@ -3707,6 +3757,12 @@ static CommandCost TownActionFundBuildings(Town *t, DoCommandFlag flags) return CommandCost(); } +/** + * Perform the "buy exclusive transport rights" town action. + * @param t The town to buy exclusivity in. + * @param flags Type of operation. + * @return An empty cost. + */ static CommandCost TownActionBuyRights(Town *t, DoCommandFlag flags) { /* Check if it's allowed to buy the rights */ @@ -3734,6 +3790,12 @@ static CommandCost TownActionBuyRights(Town *t, DoCommandFlag flags) return CommandCost(); } +/** + * Perform the "bribe" town action. + * @param t The town to bribe. + * @param flags Type of operation. + * @return An empty cost. + */ static CommandCost TownActionBribe(Town *t, DoCommandFlag flags) { if (flags & DC_EXEC) { @@ -3785,11 +3847,11 @@ static TownActionProc * const _town_action_proc[] = { }; /** - * Get a list of available actions to do at a town. - * @param nump if not nullptr add put the number of available actions in it - * @param cid the company that is querying the town - * @param t the town that is queried - * @return bitmasked value of enabled actions + * Get a list of available town authority actions. + * @param nump if not nullptr, store the number of available actions + * @param cid The company that is querying the town. + * @param t The town that is queried. + * @return The bitmasked value of enabled actions. */ uint GetMaskOfTownActions(int *nump, CompanyID cid, const Town *t) { @@ -3964,6 +4026,10 @@ static void ForAllStationsNearTown(Town *t, Func func) }); } +/** + * Monthly callback to update town and station ratings. + * @param t The town to update. + */ static void UpdateTownRating(Town *t) { if (_cheats.town_rating.value) return; @@ -4152,22 +4218,6 @@ static void UpdateTownGrowth(Town *t) SetBit(t->flags, TOWN_IS_GROWING); } -static void UpdateTownAmounts(Town *t) -{ - for (auto &supplied : t->supplied) supplied.NewMonth(); - for (auto &received : t->received) received.NewMonth(); - if (t->fund_buildings_months != 0) t->fund_buildings_months--; - - SetWindowDirty(WC_TOWN_VIEW, t->index); -} - -static void UpdateTownUnwanted(Town *t) -{ - for (const Company *c : Company::Iterate()) { - if (t->unwanted[c->index] > 0) t->unwanted[c->index]--; - } -} - /** * Checks whether the local authority allows construction of a new station (rail, road, airport, dock) on the given tile * @param tile The tile where the station shall be constructed. @@ -4395,16 +4445,27 @@ CommandCost CheckforTownRating(DoCommandFlag flags, Town *t, TownRatingCheckType void TownsMonthlyLoop() { for (Town *t : Town::Iterate()) { + /* Check for active town actions and decrement their counters. */ if (t->road_build_months != 0) t->road_build_months--; + if (t->fund_buildings_months != 0) t->fund_buildings_months--; if (t->exclusive_counter != 0) { if (--t->exclusive_counter == 0) t->exclusivity = INVALID_COMPANY; } - UpdateTownAmounts(t); + /* Check for active failed bribe cooloff periods and decrement them. */ + for (const Company *c : Company::Iterate()) { + if (t->unwanted[c->index] > 0) t->unwanted[c->index]--; + } + + /* Update cargo statistics. */ + for (auto &supplied : t->supplied) supplied.NewMonth(); + for (auto &received : t->received) received.NewMonth(); + UpdateTownGrowth(t); UpdateTownRating(t); - UpdateTownUnwanted(t); + + SetWindowDirty(WC_TOWN_VIEW, t->index); } } diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 61a74e97be..3f72c7f304 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -1486,6 +1486,7 @@ static CommandCost CmdBuildRailWagon(TileIndex tile, DoCommandFlag flags, const v->group_id = DEFAULT_GROUP; + if (TestVehicleBuildProbability(v, v->engine_type, BuildProbabilityType::Reversed)) SetBit(v->flags, VRF_REVERSE_DIRECTION); AddArticulatedParts(v); _new_vehicle_id = v->index; @@ -1520,6 +1521,7 @@ static CommandCost CmdBuildRailWagon(TileIndex tile, DoCommandFlag flags, const /** Move all free vehicles in the depot to the train */ void NormalizeTrainVehInDepot(const Train *u) { + assert(u->IsEngine()); for (const Train *v : Train::Iterate()) { if (v->IsFreeWagon() && v->tile == u->tile && v->track == TRACK_BIT_DEPOT && @@ -1563,6 +1565,7 @@ static void AddRearEngineToMultiheadedTrain(Train *v) u->SetMultiheaded(); if (v->IsVirtual()) u->SetVirtual(); v->SetNext(u); + if (TestVehicleBuildProbability(u, u->engine_type, BuildProbabilityType::Reversed)) SetBit(u->flags, VRF_REVERSE_DIRECTION); u->UpdatePosition(); /* Now we need to link the front and rear engines together */ @@ -1640,6 +1643,7 @@ CommandCost CmdBuildRailVehicle(TileIndex tile, DoCommandFlag flags, const Engin v->SetFrontEngine(); v->SetEngine(); + if (TestVehicleBuildProbability(v, v->engine_type, BuildProbabilityType::Reversed)) SetBit(v->flags, VRF_REVERSE_DIRECTION); v->UpdatePosition(); if (rvi->railveh_type == RAILVEH_MULTIHEAD) { diff --git a/src/vehicle.cpp b/src/vehicle.cpp index d45ba739ed..e49225052a 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -4479,7 +4479,7 @@ StringID GetVehicleCannotUseStationReason(const Vehicle *v, const Station *st) for (; rs != nullptr; rs = rs->next) { /* Articulated vehicles cannot use bay road stops, only drive-through. Make sure the vehicle can actually use this bay stop */ - if (HasTileAnyRoadType(rs->xy, rv->compatible_roadtypes) && IsStandardRoadStopTile(rs->xy) && rv->HasArticulatedPart()) { + if (HasTileAnyRoadType(rs->xy, rv->compatible_roadtypes) && IsBayRoadStopTile(rs->xy) && rv->HasArticulatedPart()) { err = STR_ERROR_NO_STOP_ARTICULATED_VEHICLE; continue; } diff --git a/src/vehicle_cmd.cpp b/src/vehicle_cmd.cpp index d033a250ad..283b6449cf 100644 --- a/src/vehicle_cmd.cpp +++ b/src/vehicle_cmd.cpp @@ -182,7 +182,7 @@ CommandCost CmdBuildVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint } if (flags & DC_EXEC) { - if (type == VEH_TRAIN && !HasBit(p1, 16) && !(flags & DC_AUTOREPLACE)) { + if (type == VEH_TRAIN && !HasBit(p1, 16) && !(flags & DC_AUTOREPLACE) && Train::From(v)->IsEngine()) { /* Move any free wagons to the new vehicle. */ NormalizeTrainVehInDepot(Train::From(v)); } diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 472d4a6e58..3d45f09987 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -1559,8 +1559,8 @@ static bool VehicleCargoSorter(const Vehicle * const &a, const Vehicle * const & for (v = b; v != nullptr; v = v->Next()) diff[v->cargo_type] -= v->cargo_cap; int r = 0; - for (CargoID i = 0; i < NUM_CARGO; i++) { - r = diff[i]; + for (uint d : diff) { + r = d; if (r != 0) break; } diff --git a/src/vehicle_gui_base.h b/src/vehicle_gui_base.h index 17e4758e90..482898fe8b 100644 --- a/src/vehicle_gui_base.h +++ b/src/vehicle_gui_base.h @@ -84,10 +84,10 @@ public: Listing *sorting; ///< Pointer to the vehicle type related sorting. byte unitnumber_digits; ///< The number of digits of the highest unit number. Scrollbar *vscroll; - VehicleListIdentifier vli; ///< Identifier of the vehicle list we want to currently show. - VehicleID vehicle_sel; ///< Selected vehicle - byte cargo_filter_criteria; ///< Selected cargo filter index - uint order_arrow_width; ///< Width of the arrow in the small order list. + VehicleListIdentifier vli; ///< Identifier of the vehicle list we want to currently show. + VehicleID vehicle_sel; ///< Selected vehicle + CargoID cargo_filter_criteria; ///< Selected cargo filter index + uint order_arrow_width; ///< Width of the arrow in the small order list. typedef GUIVehicleGroupList::SortFunction VehicleGroupSortFunction; typedef GUIVehicleList::SortFunction VehicleIndividualSortFunction; diff --git a/src/video/opengl.cpp b/src/video/opengl.cpp index e4b836eecd..d80d1cceac 100644 --- a/src/video/opengl.cpp +++ b/src/video/opengl.cpp @@ -1328,7 +1328,7 @@ void OpenGLBackend::RenderOglSprite(OpenGLSprite *gl_sprite, PaletteID pal, int Dimension dim = gl_sprite->GetSize(zoom); _glUseProgram(this->sprite_program); _glUniform4f(this->sprite_sprite_loc, (float)x, (float)y, (float)dim.width, (float)dim.height); - _glUniform1f(this->sprite_zoom_loc, (float)(zoom - ZOOM_LVL_BEGIN)); + _glUniform1f(this->sprite_zoom_loc, (float)zoom); _glUniform2f(this->sprite_screen_loc, (float)_screen.width, (float)_screen.height); _glUniform1i(this->sprite_rgb_loc, rgb ? 1 : 0); _glUniform1i(this->sprite_crash_loc, pal == PALETTE_CRASH ? 1 : 0); diff --git a/src/viewport.cpp b/src/viewport.cpp index 9b73a960e7..25b12bdd61 100644 --- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -1969,7 +1969,7 @@ void ViewportSign::MarkDirty(ZoomLevel maxzoom) const { if (maxzoom == ZOOM_LVL_END) return; - Rect zoomlevels[ZOOM_LVL_COUNT]; + Rect zoomlevels[ZOOM_LVL_END]; for (ZoomLevel zoom = ZOOM_LVL_BEGIN; zoom != ZOOM_LVL_END; zoom++) { const ZoomLevel small_from = (maxzoom == ZOOM_LVL_OUT_8X) ? ZOOM_LVL_OUT_8X : ZOOM_LVL_OUT_16X; diff --git a/src/widget.cpp b/src/widget.cpp index 1cd9cef322..c271524578 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -922,15 +922,11 @@ int Window::SortButtonWidth() bool _draw_widget_outlines; -void DrawOutline(const Window *, const NWidgetBase *wid) +static void DrawOutline(const Window *, const NWidgetBase *wid) { if (!_draw_widget_outlines || wid->current_x == 0 || wid->current_y == 0) return; - Rect r = wid->GetCurrentRect(); - GfxDrawLine(r.left, r.top, r.right, r.top, PC_WHITE, 1, 4); - GfxDrawLine(r.left, r.top, r.left, r.bottom, PC_WHITE, 1, 4); - GfxDrawLine(r.right, r.top, r.right, r.bottom, PC_WHITE, 1, 4); - GfxDrawLine(r.left, r.bottom, r.right, r.bottom, PC_WHITE, 1, 4); + DrawRectOutline(wid->GetCurrentRect(), PC_WHITE, 1, 4); } /** diff --git a/src/zoom_type.h b/src/zoom_type.h index 243e0ff1bd..1a912cbfe7 100644 --- a/src/zoom_type.h +++ b/src/zoom_type.h @@ -31,8 +31,6 @@ enum ZoomLevel : byte { ZOOM_LVL_OUT_512X, ///< Zoomed 512 times out. ZOOM_LVL_END, ///< End for iteration. - ZOOM_LVL_COUNT = ZOOM_LVL_END - ZOOM_LVL_BEGIN, ///< Number of zoom levels. - /* Here we define in which zoom viewports are */ ZOOM_LVL_VIEWPORT = ZOOM_LVL_OUT_4X, ///< Default zoom level for viewports. ZOOM_LVL_NEWS = ZOOM_LVL_OUT_4X, ///< Default zoom level for the news messages.