Merge branch 'develop' into master

.github/ISSUE_TEMPLATE.md

@@ -2,7 +2,7 @@
   Fill in the placeholders below. Delete any headings and placeholders that you do not fill in.
 -->
 **OS:** [e.g. Windows 10]
-**Version:** [e.g. 0.0.7]
+**Version:** [e.g. 0.0.8]
 **Commit/Build:** [e.g. 426e106]
 
 <!-- Explanation of the issue -->

.gitignore

@@ -1,12 +1,13 @@
 # OPENRCT2
 
-sdl
+/sdl
 
 # Compiled dll
 openrct2.dll
 
 # Distribution
 distribution/windows/*.exe
+distribution/android/*/external/
 
 # Build artifacts
 artifacts
@@ -294,7 +295,10 @@ data/g2.dat
 ## Visual Studio Code
 #########################
 .vscode/*
-!.vscode/settings.json
+.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+
+# Cmake
+cmake-build-debug/

.travis.yml

@@ -1,14 +1,20 @@
 language: c
 
 before_install:
-    - if [[ $TRAVIS_OS_NAME == "linux" ]]; then bash scripts/linux/install.sh; export OPENRCT_MAKE_OPTS="-j2 -k" ; fi
+    # Android jobs are triggered from cron and overwrite `before_script` part
+    - if [[ "$TRAVIS_EVENT_TYPE" == "cron" ]] ; then echo Exiting early from cron job ; exit 0 ; fi
+    - if [[ "z$OPENRCT2_ORG_TOKEN" != "z" && "$TRAVIS_PULL_REQUEST" == "false" && ("${TRAVIS_BRANCH}" =~ ^(develop|push/) || "z${TRAVIS_TAG}" != "z") ]] ; then
+      echo "This build will get pushed!" ; echo "tag = ${TRAVIS_TAG}" ; echo "branch = ${TRAVIS_BRANCH}" ;
+      fi
+    - if [[ $TRAVIS_REPO_SLUG == "OpenRCT2/OpenRCT2" ]] && [[ $TRAVIS_PULL_REQUEST != "false" ]] && [[ $TRAVIS_BRANCH == "master" ]]; then echo "Pull requests to master branch are not allowed!" ; exit 1 ; fi
+    - if [[ $TRAVIS_OS_NAME == "linux" ]]; then bash scripts/linux/install.sh; export OPENRCT_MAKE_OPTS="-j2 -k all openrct2-cli" ; fi
     - if [[ $TRAVIS_OS_NAME == "osx" ]]; then sudo gem install xcpretty-travis-formatter; fi
 
 sudo: required
 dist: trusty
 env:
     global:
-        - OPENRCT2_VERSION="0.0.7"
+        - OPENRCT2_VERSION="0.0.8"
 
 matrix:
     include:
@@ -16,13 +22,15 @@ matrix:
           services:
             - docker
           env:
-            - OPENRCT2_CMAKE_OPTS="-DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=OpenRCT2" TARGET=ubuntu_amd64
+            - OPENRCT2_CMAKE_OPTS="-DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=OpenRCT2 -DPORTABLE=ON -DDISABLE_RCT2_TESTS=on" TARGET=ubuntu_amd64
             - secure: "S3u2VCE2Vy8KNXoeh+DhnzjCmgTX0r95uEZrXDU+IKANOOCKn7Dg4OFDZE3LY/i1y2/EUDpnR5yLC38Ks795EUP/sv/OoMl4tjQ20yERjqWh+gcIRrgx7SdVabuAh3t4aBdaLD4Pfnj5avxeCt6rL7yGnj0wdbrbJSBZPsgSnuQ="
           after_success:
+            # Android jobs are triggered from cron and overwrite `after_sucess` part
+            - if [[ "$TRAVIS_EVENT_TYPE" == "cron" ]] ; then exit 0 ; fi
             - sudo chown -R $USER build
             - cd build
               # make install is done inside docker
-            - mv OpenRCT2/bin/openrct2 OpenRCT2/ && mv OpenRCT2/share/openrct2 OpenRCT2/data && mv OpenRCT2/share/doc/openrct2 OpenRCT2/doc
+            - mv OpenRCT2/bin/openrct2 OpenRCT2/ && mv OpenRCT2/bin/libopenrct2.so OpenRCT2/ && mv OpenRCT2/share/openrct2 OpenRCT2/data && mv OpenRCT2/share/doc/openrct2 OpenRCT2/doc
             - rm -rf OpenRCT2/bin OpenRCT2/share # remove empty dirs
             - tar cvzf openrct2-linux.tar.gz OpenRCT2/
             - if [[ "z${TRAVIS_TAG}" != "z" ]] ; then
@@ -37,9 +45,11 @@ matrix:
           services:
             - docker
           env:
-            - OPENRCT2_CMAKE_OPTS="-DFORCE32=ON -DDISABLE_RCT2=OFF -DCMAKE_INSTALL_PREFIX=OpenRCT2" TARGET=ubuntu_i686
+            - OPENRCT2_CMAKE_OPTS="-DFORCE32=ON -DDISABLE_RCT2=OFF -DCMAKE_INSTALL_PREFIX=OpenRCT2 -DDISABLE_RCT2_TESTS=on" TARGET=ubuntu_i686
             - secure: "S3u2VCE2Vy8KNXoeh+DhnzjCmgTX0r95uEZrXDU+IKANOOCKn7Dg4OFDZE3LY/i1y2/EUDpnR5yLC38Ks795EUP/sv/OoMl4tjQ20yERjqWh+gcIRrgx7SdVabuAh3t4aBdaLD4Pfnj5avxeCt6rL7yGnj0wdbrbJSBZPsgSnuQ="
           after_success:
+            # Android jobs are triggered from cron and overwrite `after_sucess` part
+            - if [[ "$TRAVIS_EVENT_TYPE" == "cron" ]] ; then exit 0 ; fi
             - sudo chown -R $USER build
             - cd build
               # make install is done inside docker
@@ -55,19 +65,19 @@ matrix:
               else curl --progress-bar --upload-file openrct2-linux.tar.gz https://transfer.sh/openrct2-linux-i686.tar.gz -o link && cat link;
               fi
         - os: linux
-          env: OPENRCT2_CMAKE_OPTS="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++" TARGET=ubuntu_amd64
+          env: OPENRCT2_CMAKE_OPTS="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DDISABLE_RCT2_TESTS=on" TARGET=ubuntu_amd64
         - os: linux
-          env: OPENRCT2_CMAKE_OPTS="-DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DFORCE32=on" TARGET=windows
+          env: OPENRCT2_CMAKE_OPTS="-DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DFORCE32=on -DDISABLE_RCT2_TESTS=on" TARGET=windows
         - os: linux
-          env: TARGET=docker64 OPENRCT2_CMAKE_OPTS="-DDISABLE_TTF=ON -DCMAKE_BUILD_TYPE=release"
+          env: TARGET=docker64 OPENRCT2_CMAKE_OPTS="-DDISABLE_TTF=ON -DCMAKE_BUILD_TYPE=release -DDISABLE_RCT2_TESTS=on"
           services:
             - docker
         - os: linux
-          env: OPENRCT2_CMAKE_OPTS="-DDISABLE_NETWORK=ON -DDISABLE_HTTP_TWITCH=ON" TARGET=docker64
+          env: OPENRCT2_CMAKE_OPTS="-DDISABLE_NETWORK=ON -DDISABLE_HTTP_TWITCH=ON -DDISABLE_RCT2_TESTS=on" TARGET=docker64
           services:
             - docker
         - os: linux
-          env: OPENRCT2_CMAKE_OPTS="-DDISABLE_OPENGL=ON" TARGET=docker64
+          env: OPENRCT2_CMAKE_OPTS="-DDISABLE_OPENGL=ON -DDISABLE_RCT2_TESTS=on" TARGET=docker64
           services:
             - docker
         - os: osx
@@ -75,16 +85,60 @@ matrix:
           env:
             - secure: "OXn/i72FxW/oh6RGlaN+gHSbkt1ToFe36etaiDOsJQznt6fe9CpFdnE8U1XBHlGokcEjbGNErRU7CFDKYHQuGrPZyHXwgqG2/0emIqFaFt5ti5ypyYKf5qH9x1LLLfdZxDyHkxXdlJ7Etxbp3G7qrV8CGRQiYRNHm1f98AmuufE="
           after_success:
+            # Android jobs are triggered from cron and overwrite `after_sucess` part
+            - if [[ "$TRAVIS_EVENT_TYPE" == "cron" ]] ; then exit 0 ; fi
             - cd build/Release
             - zip -r openrct2-macos.zip OpenRCT2.app
             - if [[ "z${TRAVIS_TAG}" != "z" ]] ; then
               export PUSH_BRANCH=master ;
               else export PUSH_BRANCH=$TRAVIS_BRANCH ; export FILENAME_PART=-${TRAVIS_BRANCH}-$(git rev-parse --short HEAD) ;
               fi
-            - if [[ "z$OPENRCT2_ORG_TOKEN" != "z" && ("${TRAVIS_BRANCH}" =~ ^(develop|push/) || "z${TRAVIS_TAG}" != "z") ]] ; then
+            - if [[ "z$OPENRCT2_ORG_TOKEN" != "z" && "$TRAVIS_PULL_REQUEST" == "false" && ("${TRAVIS_BRANCH}" =~ ^(develop|push/) || "z${TRAVIS_TAG}" != "z") ]] ; then
               curl -o - -v --form "key=$OPENRCT2_ORG_TOKEN" --form "fileName=OpenRCT2-${OPENRCT2_VERSION}${FILENAME_PART}-macos.zip" --form "version=${OPENRCT2_VERSION}" --form "gitHash=$TRAVIS_COMMIT" --form "gitBranch=$PUSH_BRANCH" --form "flavourId=3" --form "file=@openrct2-macos.zip" "https://openrct2.org/altapi/?command=push-build"; else
               curl --progress-bar --upload-file openrct2-macos.zip https://transfer.sh/openrct2-macos.zip -o link && cat link;
               fi
+        - os: linux
+          language: android
+          dist: precise
+          before_install: []
+          addons:
+            apt:
+              sources:
+                - ubuntu-toolchain-r-test
+              packages:
+              - libstdc++6-4.7-dev
+          android:
+            components:
+              - build-tools-25.0.2
+          jdk: oraclejdk8
+          before_script:
+            # Only run Android jobs when triggered from cron or on tag, otherwise skip
+            - if [[ "$TRAVIS_EVENT_TYPE" != "cron" ]] && [[ "z${TRAVIS_TAG}" == "z" ]] ; then exit 0 ; fi
+            - pushd ~
+            - wget https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip
+            - unzip -qo sdk-tools-linux-3859397.zip
+            - rm -Rf "$ANDROID_HOME/tools"
+            - mv tools "$ANDROID_HOME/tools"
+            - popd
+            - 'echo "count=0" >  ~/.android/repositories.cfg'
+            - '"$ANDROID_HOME/tools/bin/sdkmanager" --list'
+            - 'echo y | "$ANDROID_HOME/tools/bin/sdkmanager" platform-tools'
+            - 'echo y | "$ANDROID_HOME/tools/bin/sdkmanager" "platforms;android-25"'
+            - 'echo y | "$ANDROID_HOME/tools/bin/sdkmanager" "cmake;3.6.4111459"'
+            - '"$ANDROID_HOME/tools/bin/sdkmanager" ndk-bundle'
+            - '"$ANDROID_HOME/tools/bin/sdkmanager" --list'
+            - 'export ANDROID_NDK_HOME="$ANDROID_HOME/ndk-bundle"'
+            - 'cd src/openrct2-android'
+            - TERM=dumb # Makes Gradle use 'boring' output
+          script:
+            # Only run Android jobs when triggered from cron or on tag, otherwise skip
+            - if [[ "$TRAVIS_EVENT_TYPE" != "cron" ]] && [[ "z${TRAVIS_TAG}" == "z" ]] ; then exit 0 ; fi
+            - './gradlew app:assemblePR'
+          after_success:
+            # Only run Android jobs when triggered from cron or on tag, otherwise skip
+            - if [[ "$TRAVIS_EVENT_TYPE" != "cron" ]] && [[ "z${TRAVIS_TAG}" == "z" ]] ; then exit 0 ; fi
+            - curl --progress-bar --upload-file app/build/outputs/apk/app-arm-pr.apk https://transfer.sh/openrct2-android-arm.apk -o link && cat link
+            - curl --progress-bar --upload-file app/build/outputs/apk/app-x86-pr.apk https://transfer.sh/openrct2-android-x86.apk -o link && cat link
         # Following entries used to be included in testing, but they only proved useful while changing things in CMake setup.
         # They are meant to be used when there are changes to CMakeLists.txt
         # - os: linux
@@ -103,6 +157,8 @@ matrix:
         #   env: OPENRCT2_CMAKE_OPTS="-DDISABLE_HTTP_TWITCH=ON -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt" TARGET=windows
 
 script:
+    # Android jobs are triggered from cron and overwrite `script` part
+    - if [[ "$TRAVIS_EVENT_TYPE" == "cron" ]] ; then exit 0 ; fi
     - if [[ $TRAVIS_OS_NAME == "linux" ]]; then bash scripts/linux/build.sh ; fi
     - if [[ $TRAVIS_OS_NAME == "osx" ]]; then set -o pipefail && xcodebuild | xcpretty -f `xcpretty-travis-formatter`; fi
 

.vscode/launch.json

@@ -7,10 +7,15 @@
             "request": "launch",
             "program": "${workspaceRoot}/bin/openrct2",
             "args": [],
-            "stopAtEntry": true,
+            "stopAtEntry": false,
             "cwd": "${workspaceRoot}/bin",
             "environment": [],
             "externalConsole": true,
+            "setupCommands": [
+                {
+                    "text": "-enable-pretty-printing"
+                }
+            ],
             "linux": {
                 "MIMode": "gdb"
             },
@@ -26,7 +31,12 @@
             "type": "cppdbg",
             "request": "attach",
             "program": "${workspaceRoot}/bin/openrct2",
-            "processId": "${command.pickProcess}",
+            "processId": "${command:pickProcess}",
+            "setupCommands": [
+                {
+                    "text": "-enable-pretty-printing"
+                }
+            ],
             "linux": {
                 "MIMode": "gdb"
             },

CMakeLists.txt

@@ -1,152 +1,75 @@
+# CMAKE project for openrct2
 cmake_minimum_required(VERSION 2.6)
-
-#
-# Execute these commands in this directory:
-#
-# 1. mkdir build/; cd build/
-#
-# 2. Choose compiler:
-#   Build with native toolchain:
-#    cmake -DCMAKE_BUILD_TYPE=Debug ..
-#
-#   Build with mingw:
-#    cmake -DCMAKE_TOOLCHAIN_FILE=../CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug ..
-#
-# 3. make
-#
-
-
-# project title
-set (PROJECT openrct2)
-# OpenRCT2 resource directory
-set (ORCT2_RESOURCE_DIR ${CMAKE_INSTALL_PREFIX}/share/${PROJECT}/)
-
-project(${PROJECT})
-
 if (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)
     message(FATAL_ERROR "Building in-source is not supported! Create a build dir and remove ${CMAKE_SOURCE_DIR}/CMakeCache.txt")
 endif()
-add_definitions(-DORCT2_RESOURCE_DIR="${ORCT2_RESOURCE_DIR}")
-add_definitions(-DHAVE_CONFIG_H)
-add_definitions(-DCURL_STATICLIB)
 
-# Define current git branch.
+include(FindPkgConfig)
+include(CheckCCompilerFlag)
+include(CheckCXXCompilerFlag)
+
+set(ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}")
+set(CMAKE_MACOSX_RPATH 1)
+
+set(TITLE_SEQUENCE_URL  "https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.0/title-sequence-v0.1.0.zip")
+set(TITLE_SEQUENCE_SHA1 "b587d83de508d0b104d14c599b76f8565900fce0")
+
+option(FORCE32 "Force 32-bit build. It will add `-m32` to compiler flags.")
+option(WITH_TESTS "Build tests")
+option(PORTABLE "Create a portable build (-rpath=$ORIGIN)" OFF)
+option(DOWNLOAD_TITLE_SEQUENCES "Download title sequences during installation." ON)
+
+# Define current git branch
 execute_process(
     COMMAND git rev-parse --abbrev-ref HEAD
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY ${ROOT_DIR}
     OUTPUT_VARIABLE OPENRCT2_BRANCH
     OUTPUT_STRIP_TRAILING_WHITESPACE
     ERROR_QUIET
 )
 add_definitions(-DOPENRCT2_BRANCH="${OPENRCT2_BRANCH}")
 
-# Define commit hash.
+# Define commit hash
 execute_process(
     COMMAND git rev-parse HEAD
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY ${ROOT_DIR}
     OUTPUT_VARIABLE OPENRCT2_COMMIT_SHA1
     OUTPUT_STRIP_TRAILING_WHITESPACE
     ERROR_QUIET
 )
 add_definitions(-DOPENRCT2_COMMIT_SHA1="${OPENRCT2_COMMIT_SHA1}")
 
-# Define short commit hash.
+# Define short commit hash
 execute_process(
     COMMAND git rev-parse --short HEAD
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY ${ROOT_DIR}
     OUTPUT_VARIABLE OPENRCT2_COMMIT_SHA1_SHORT
     OUTPUT_STRIP_TRAILING_WHITESPACE
     ERROR_QUIET
 )
+
 # Tagged builds are not meant to display commit info
 if (NOT OPENRCT2_COMMIT_SHA1_SHORT STREQUAL "HEAD")
     add_definitions(-DOPENRCT2_COMMIT_SHA1_SHORT="${OPENRCT2_COMMIT_SHA1_SHORT}")
 endif()
 
-# Convenience functions to set compiler flags only if available
+function (ADD_CHECK_C_COMPILER_FLAG _CFLAGS _CACHE_VAR _FLAG)
-include(CheckCCompilerFlag)
-include(CheckCXXCompilerFlag)
-
-function(ADD_CHECK_C_COMPILER_FLAG
-    _CFLAGS
-    _CACHE_VAR
-    _FLAG
-    )
-
     CHECK_C_COMPILER_FLAG("${_FLAG}" "${_CACHE_VAR}")
-    if(${_CACHE_VAR})
+    if (${_CACHE_VAR})
-        # message(STATUS "Using CFLAG: ${_FLAG}")
         set(${_CFLAGS} "${${_CFLAGS}} ${_FLAG}" PARENT_SCOPE)
-    else()
+    else ()
         message(STATUS "Unsupported CFLAG: ${_FLAG}")
-    endif()
+    endif ()
-endfunction()
+endfunction ()
-
-function(ADD_CHECK_CXX_COMPILER_FLAG
-    _CXXFLAGS
-    _CACHE_VAR
-    _FLAG
-    )
 
+function (ADD_CHECK_CXX_COMPILER_FLAG _CXXFLAGS _CACHE_VAR _FLAG)
     CHECK_CXX_COMPILER_FLAG("${_FLAG}" "${_CACHE_VAR}")
-    if(${_CACHE_VAR})
+    if (${_CACHE_VAR})
-        # message(STATUS "Using CXXFLAG: ${_FLAG}")
         set(${_CXXFLAGS} "${${_CXXFLAGS}} ${_FLAG}" PARENT_SCOPE)
-    else()
+    else ()
         message(STATUS "Unsupported CXXFLAG: ${_FLAG}")
-    endif()
+    endif ()
-endfunction()
+endfunction ()
-
-# pkg-config
-INCLUDE(FindPkgConfig)
-
-# Needed for linking with non-broken OpenSSL on Apple platforms
-if (APPLE)
-    set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/opt/openssl/lib/pkgconfig")
-endif (APPLE)
-
-# Options
-
-option(DISABLE_HTTP_TWITCH "Disable HTTP and Twitch support.")
-option(DISABLE_NETWORK "Disable multiplayer functionality. Mainly for testing.")
-option(STATIC "Create a static build.")
-option(FORCE32 "Force 32-bit build. It will add `-m32` to compiler flags")
-option(DISABLE_OPENGL "Disable OpenGL support.")
-option(DISABLE_RCT2 "Build a standalone version, without using code and data segments from vanilla. On by default." ON)
-option(USE_MMAP "Use mmap to try loading rct2's data segment into memory.")
-option(WITH_TESTS "Build tests")
-option(DISABLE_TTF "Disable support for TTF provided by SDL2_ttf.")
-option(ENABLE_LIGHTFX "Enable lighting effects." ON)
-
-set(COMMON_COMPILE_OPTIONS "${COMMON_COMPILE_OPTIONS} -fstrict-aliasing -Werror -Wundef -Wmissing-declarations -Winit-self -Wall -Wno-unknown-pragmas -Wno-unused-function -Wno-missing-braces ")
-set(COMMON_COMPILE_OPTIONS "${COMMON_COMPILE_OPTIONS} -Wno-comment -Wshadow  -Wmissing-declarations -Wnonnull")
-
-# macOS builds fail on the use of tmpnam otherwise (#4959)
-if(APPLE)
-    set(COMMON_COMPILE_OPTIONS "${COMMON_COMPILE_OPTIONS} -Wno-error=deprecated-declarations -Wno-error=objc-method-access")
-endif()
-
-# On mingw all code is already PIC, this will avoid compiler error on redefining this option
-if(NOT MINGW)
-    set(COMMON_COMPILE_OPTIONS "${COMMON_COMPILE_OPTIONS} -fPIC")
-endif()
-
-if (NOT DISABLE_RCT2)
-    set (FORCE32 ON)
-    message("DISABLE_RCT2 implies FORCE32")
-endif()
-
-if (DISABLE_HTTP_TWITCH)
-    add_definitions(-DDISABLE_HTTP -DDISABLE_TWITCH)
-endif (DISABLE_HTTP_TWITCH)
-
-if (DISABLE_TTF)
-    add_definitions(-DNO_TTF)
-endif (DISABLE_TTF)
-
-if (ENABLE_LIGHTFX)
-    add_definitions(-D__ENABLE_LIGHTFX__)
-endif (ENABLE_LIGHTFX)
 
 # Launchpad turns on -Wdate-time for compilers that support it, this shouldn't break our build
 ADD_CHECK_C_COMPILER_FLAG(CMAKE_C_FLAGS C_WARN_WRITE_STRINGS -Wno-error=date-time)
@@ -156,9 +79,11 @@ ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_SUGGEST_FINAL_TYPES -Wsugge
 ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_SUGGEST_FINAL_METHODS -Wsuggest-final-methods)
 ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_SUGGEST_OVERRIDE -Wsuggest-override)
 ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_DUPLICATED_COND -Wduplicated-cond)
+ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_NON_VIRTUAL_DTOR -Wnon-virtual-dtor)
 if (MINGW)
-	ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_SUGGEST_OVERRIDE -Wno-error=redundant-decls)
+    ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_SUGGEST_OVERRIDE -Wno-error=redundant-decls)
 endif ()
+
 # Items below are not supported by ICC
 ADD_CHECK_C_COMPILER_FLAG(CMAKE_C_FLAGS C_WARN_REDUNDANT_DECLS -Wredundant-decls)
 ADD_CHECK_C_COMPILER_FLAG(CMAKE_C_FLAGS C_WARN_IGNORED_QUALIFIERS -Wignored-qualifiers)
@@ -172,313 +97,62 @@ set(COMMON_COMPILE_OPTIONS "${COMMON_COMPILE_OPTIONS} -fstrict-overflow")
 ADD_CHECK_C_COMPILER_FLAG(CMAKE_C_FLAGS C_WARN_STRICT_OVERFLOW -Wstrict-overflow=1)
 ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_STRICT_OVERFLOW -Wstrict-overflow=1)
 
-if (FORCE32)
-    set(TARGET_M "-m32")
-endif()
 
-if (FORCE32)
+# Include sub-projects
-    set(OBJ_FORMAT "elf32-i386")
+include("${ROOT_DIR}/src/openrct2/CMakeLists.txt" NO_POLICY_SCOPE)
-    set(LINKER_SCRIPT "ld_script_i386.xc")
+include("${ROOT_DIR}/src/openrct2-cli/CMakeLists.txt" NO_POLICY_SCOPE)
-endif ()
+include("${ROOT_DIR}/src/openrct2-ui/CMakeLists.txt" NO_POLICY_SCOPE)
 
-if (DISABLE_OPENGL)
+# g2
-    add_definitions(-DDISABLE_OPENGL)
+add_custom_command(
-else (DISABLE_OPENGL)
+    OUTPUT g2.dat
-    # Makes OpenGL function get queried in run-time rather than linked-in
+    COMMAND ./openrct2 sprite build ${CMAKE_BINARY_DIR}/g2.dat ${ROOT_DIR}/resources/g2/sprites.json
-    add_definitions(-DOPENGL_NO_LINK)
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-endif (DISABLE_OPENGL)
+)
+add_custom_target(g2 DEPENDS ${PROJECT} g2.dat)
 
-if (USE_MMAP)
+# Include tests
-    add_definitions(-DUSE_MMAP)
+if (WITH_TESTS)
-endif (USE_MMAP)
+    enable_testing()
-
+    if (UNIX AND (NOT USE_MMAP) AND (NOT DISABLE_RCT2) AND (FORCE32))
-if (DISABLE_NETWORK)
+        include("${ROOT_DIR}/test/testpaint/CMakeLists.txt" NO_POLICY_SCOPE)
-    add_definitions(-DDISABLE_NETWORK)
-else (DISABLE_NETWORK)
-    if (WIN32)
-        SET(NETWORKLIBS ${NETWORKLIBS} ws2_32)
-    endif (WIN32)
-    # If you are on macOS, CMake might try using system-provided OpenSSL.
-    # This is too old and will not work.
-    PKG_CHECK_MODULES(SSL REQUIRED openssl>=1.0.0)
-endif (DISABLE_NETWORK)
-
-if (DISABLE_RCT2)
-    add_definitions(-DNO_RCT2)
-endif (DISABLE_RCT2)
-
-# Start of library checks
-
-PKG_CHECK_MODULES(PNG libpng>=1.6)
-if (NOT PNG_FOUND)
-    PKG_CHECK_MODULES(PNG libpng16)
-endif (NOT PNG_FOUND)
-if (NOT PNG_FOUND)
-    PKG_CHECK_MODULES(PNG libpng>=1.2)
-endif (NOT PNG_FOUND)
-if (NOT PNG_FOUND)
-    PKG_CHECK_MODULES(PNG REQUIRED libpng12)
-endif (NOT PNG_FOUND)
-
-PKG_CHECK_MODULES(ZLIB REQUIRED zlib)
-PKG_CHECK_MODULES(JANSSON REQUIRED jansson>=2.5)
-
-# Handle creating the rct2 text and data files on macOS and Linux
-# See details in src/openrct2/rct2/interop.c:rct2_interop_setup_segment for how the values
-# were derived.
-if ((NOT DISABLE_RCT2) AND UNIX)
-  add_custom_command(
-    OUTPUT openrct2_text
-    COMMAND dd if="${CMAKE_CURRENT_SOURCE_DIR}/openrct2.exe" of="${CMAKE_BINARY_DIR}/openrct2_text" bs=4096 skip=1 count=1187
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/openrct2.exe
-  )
-  add_custom_command(
-    OUTPUT openrct2_data
-    COMMAND dd if="${CMAKE_CURRENT_SOURCE_DIR}/openrct2.exe" of="${CMAKE_BINARY_DIR}/openrct2_data" bs=4096 skip=1188 count=318
-    COMMAND dd if=/dev/zero of="${CMAKE_BINARY_DIR}/openrct2_data" bs=4096 seek=318 count=2630 conv=notrunc
-    COMMAND dd if="${CMAKE_CURRENT_SOURCE_DIR}/openrct2.exe" of="${CMAKE_BINARY_DIR}/openrct2_data" bs=4096 skip=1506 seek=2948 count=1 conv=notrunc
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/openrct2.exe
-  )
-  add_custom_target(segfiles DEPENDS openrct2_text openrct2_data)
-    if (NOT USE_MMAP)
-        if (APPLE)
-            set(RCT2_SEGMENT_LINKER_FLAGS "-sectcreate rct2_text __text ${CMAKE_BINARY_DIR}/openrct2_text -sectcreate rct2_data __data ${CMAKE_BINARY_DIR}/openrct2_data -segaddr rct2_data 0x8a4000 -segprot rct2_data rwx rwx -segaddr rct2_text 0x401000 -segprot rct2_text rwx rwx -segaddr __TEXT 0x2000000 -read_only_relocs suppress")
-        else (APPLE)
-            # For Linux we have to use objcopy to wrap regular binaries into a linkable
-            # format. We use specific section names which are then referenced in a
-            # bespoke linker script so they can be placed at predefined VMAs.
-            add_custom_command(
-                OUTPUT openrct2_text_section.o
-                COMMAND objcopy --input binary --output ${OBJ_FORMAT} --binary-architecture i386 openrct2_text openrct2_text_section.o --rename-section .data=.rct2_text,contents,alloc,load,readonly,code
-                DEPENDS segfiles
-                WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-            )
-            add_custom_command(
-                OUTPUT openrct2_data_section.o
-                COMMAND objcopy --input binary --output ${OBJ_FORMAT} --binary-architecture i386 openrct2_data openrct2_data_section.o --rename-section .data=.rct2_data,contents,alloc,load,readonly,data
-                DEPENDS segfiles
-                WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-            )
-            add_custom_target(linkable_sections DEPENDS openrct2_text_section.o openrct2_data_section.o)
-            SET_SOURCE_FILES_PROPERTIES(
-                openrct2_text_section.o openrct2_data_section.o
-                PROPERTIES
-                EXTERNAL_OBJECT true
-                GENERATED true
-            )
-            # can't use GLOB here, as the files don't exist yet at cmake-time
-            set(RCT2_SECTIONS "${CMAKE_BINARY_DIR}/openrct2_data_section.o" "${CMAKE_BINARY_DIR}/openrct2_text_section.o")
-            set(RCT2_SEGMENT_LINKER_FLAGS "-Wl,-T,\"${CMAKE_CURRENT_SOURCE_DIR}/distribution/linux/${LINKER_SCRIPT}\"")
-        endif (APPLE)
-    endif (NOT USE_MMAP)
-elseif (USE_MMAP)
-    # No dd here, can't extract data segment
-    message(WARNING "Sorry, your platform is not supported, you have to extract data segment manually")
-endif ((NOT DISABLE_RCT2) AND UNIX)
-set(DEBUG_LEVEL 0 CACHE STRING "Select debug level for compilation. Use value in range 0–3.")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDEBUG=${DEBUG_LEVEL}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDEBUG=${DEBUG_LEVEL}")
-
-# include lib
-include_directories("lib/")
-# add source files
-file(GLOB_RECURSE ORCT2_SOURCES "src/openrct2/*.c" "src/openrct2/*.cpp" "src/openrct2/*.h" "src/openrct2/*.hpp")
-if (APPLE)
-    file(GLOB_RECURSE ORCT2_MM_SOURCES "src/openrct2/*.m")
-    set_source_files_properties(${ORCT2_MM_SOURCES} PROPERTIES COMPILE_FLAGS "-x objective-c -fmodules")
-endif (APPLE)
-
-
-if (APPLE AND NOT USE_MMAP)
-    set(PIE_FLAG "-fno-pie")
-else ()
-    set(PIE_FLAG "-fpie")
-endif ()
-
-# set necessary flags to compile code as is
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TARGET_M} -std=gnu11 ${COMMON_COMPILE_OPTIONS} -Wimplicit")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TARGET_M} -std=gnu++14 ${COMMON_COMPILE_OPTIONS} -Wnon-virtual-dtor")
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${TARGET_M}")
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS} ${PIE_FLAG}")
-
-if (MINGW)
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-libgcc -static-libstdc++")
-endif ()
-
-option(WITH_BREAKPAD "Enable breakpad")
-if (WITH_BREAKPAD)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_BREAKPAD")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_BREAKPAD")
-    set(BREAKPAD_DIR "/home/janisozaur/workspace/breakpad/src")
-    set(BREAKPAD_INCLUDE_DIR "${BREAKPAD_DIR}/src")
-    set(BREAKPAD_LIBRARY_DIR "${BREAKPAD_DIR}/src/client/linux")
-    set(BREAKPAD_LIBS breakpad_client pthread)
-endif (WITH_BREAKPAD)
-
-PKG_CHECK_MODULES(LIBZIP REQUIRED libzip>=1.0)
-# find and include SDL2
-PKG_CHECK_MODULES(SDL2 REQUIRED sdl2)
-if (NOT DISABLE_TTF)
-    PKG_CHECK_MODULES(SDL2_TTF REQUIRED SDL2_ttf)
-endif (NOT DISABLE_TTF)
-
-if (STATIC)
-    if (NOT DISABLE_TTF)
-        # FreeType is required by SDL2_ttf, but not wired up properly in package
-        PKG_CHECK_MODULES(FREETYPE REQUIRED freetype2)
-    endif (NOT DISABLE_TTF)
-    SET(SDL2LIBS ${SDL2_STATIC_LIBRARIES} ${SDL2_TTF_STATIC_LIBRARIES} ${FREETYPE_STATIC_LIBRARIES})
-else (STATIC)
-    SET(SDL2LIBS ${SDL2_LIBRARIES} ${SDL2_TTF_LIBRARIES})
-endif (STATIC)
-
-if (STATIC)
-    set(STATIC_START "-static")
-    SET(REQUIREDLIBS ${PNG_STATIC_LIBRARIES} ${JANSSON_STATIC_LIBRARIES} ${ZLIB_STATIC_LIBRARIES} ${SSL_STATIC_LIBRARIES} ${LIBZIP_STATIC_LIBRARIES})
-else (STATIC)
-    SET(REQUIREDLIBS ${PNG_LIBRARIES} ${JANSSON_LIBRARIES} ${ZLIB_LIBRARIES} ${SSL_LIBRARIES} ${LIBZIP_LIBRARIES})
-endif (STATIC)
-
-if (NOT DISABLE_OPENGL)
-    if (WIN32)
-        # Curl depends on openssl and ws2 in mingw builds, but is not wired up in pkg-config
-        set(GLLIBS opengl32)
-        # mingw complains about "%zu" not being a valid format specifier for printf, unless we
-        # tell it that it is
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__USE_MINGW_ANSI_STDIO=1")
-    elseif (APPLE)
-        # GL doesn't work nicely with macOS, while find_package doesn't work with multiarch on Ubuntu.
-        find_package(OpenGL REQUIRED)
-        set(GLLIBS ${OPENGL_LIBRARY})
-    else (WIN32)
-        PKG_CHECK_MODULES(GL REQUIRED gl)
-        set(GLLIBS ${GL_LIBRARIES})
-    endif (WIN32)
-endif (NOT DISABLE_OPENGL)
-
-if (NOT DISABLE_HTTP_TWITCH)
-    PKG_CHECK_MODULES(LIBCURL REQUIRED libcurl)
-    if (WIN32)
-        # Curl depends on openssl and ws2 in mingw builds, but is not wired up in pkg-config
-        set(WSLIBS ws2_32)
-    endif (WIN32)
-    if (STATIC)
-        SET(HTTPLIBS ${LIBCURL_STATIC_LIBRARIES} ${WSLIBS})
-    else (STATIC)
-        SET(HTTPLIBS ${LIBCURL_LIBRARIES} ${WSLIBS})
-    endif (STATIC)
-endif (NOT DISABLE_HTTP_TWITCH)
-
-PKG_CHECK_MODULES(SPEEX REQUIRED speexdsp)
-
-if (UNIX AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "BSD")
-    # Include libdl for dlopen
-    set(DLLIB dl)
-endif ()
-
-# libzip library has issues with some of the enabled warning, include it as system library
-INCLUDE_DIRECTORIES(SYSTEM ${LIBZIP_INCLUDE_DIRS})
-INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIRS} ${LIBCURL_INCLUDE_DIRS} ${JANSSON_INCLUDE_DIRS} ${SPEEX_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${BREAKPAD_INCLUDE_DIR} ${SSL_INCLUDE_DIRS})
-
-LINK_DIRECTORIES(${SDL2_LIBRARY_DIRS} ${JANSSON_LIBRARY_DIRS} ${LIBCURL_LIBRARY_DIRS} ${PNG_LIBRARY_DIRS} ${ZLIB_LIBRARY_DIRS} ${BREAKPAD_LIBRARY_DIR} ${SSL_LIBRARY_DIRS} ${LIBZIP_LIBRARY_DIRS})
-
-if (NOT DISABLE_RCT2)
-    # Disable optimizations for addresses.c for all compilers, to allow optimized
-    # builds without need for -fno-omit-frame-pointer
-    set_source_files_properties(src/openrct2/addresses.c PROPERTIES COMPILE_FLAGS -O0)
-endif (NOT DISABLE_RCT2)
-
-if (WIN32)
-    # build as library for now, replace with add_executable
-    if (USE_MMAP OR DISABLE_RCT2)
-        add_executable(${PROJECT} ${ORCT2_SOURCES} ${SPEEX_SOURCES})
-    else ()
-        add_library(${PROJECT} SHARED ${ORCT2_SOURCES} ${SPEEX_SOURCES})
     endif ()
-else (WIN32)
+    include("${ROOT_DIR}/test/tests/CMakeLists.txt" NO_POLICY_SCOPE)
-    add_executable(${PROJECT} ${ORCT2_SOURCES} ${ORCT2_MM_SOURCES} ${RCT2_SECTIONS})
-    if (NOT DISABLE_RCT2)
-        add_dependencies(${PROJECT} segfiles)
-        if (NOT APPLE AND NOT USE_MMAP)
-            add_dependencies(${PROJECT} linkable_sections)
-        endif ()
-        set_target_properties(${PROJECT} PROPERTIES LINK_FLAGS ${RCT2_SEGMENT_LINKER_FLAGS})
-    endif (NOT DISABLE_RCT2)
-    add_custom_command(
-        OUTPUT g2.dat
-        COMMAND ./openrct2 sprite build ${CMAKE_BINARY_DIR}/g2.dat ${CMAKE_CURRENT_SOURCE_DIR}/resources/g2/
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        )
-    add_custom_target(g2 DEPENDS ${PROJECT} g2.dat)
-endif (WIN32)
-
-if (UNIX AND NOT APPLE AND NOT DISABLE_TTF)
-    # FontConfig for TrueType fonts.
-    PKG_CHECK_MODULES(FONTCONFIG REQUIRED fontconfig)
-    INCLUDE_DIRECTORIES(${FONTCONFIG_INCLUDE_DIRS})
-    TARGET_LINK_LIBRARIES(${PROJECT} ${FONTCONFIG_LIBRARIES})
-endif (UNIX AND NOT APPLE AND NOT DISABLE_TTF)
-
-
-# install into ${CMAKE_INSTALL_PREFIX}/bin/
-#install (TARGETS ${PROJECT} DESTINATION bin)
-
-# libopenrct2.dll -> openrct2.dll
-set_target_properties(${PROJECT} PROPERTIES PREFIX "")
-set_target_properties(${PROJECT} PROPERTIES COMPILE_FLAGS "-Wundef")
-
-# Link shared libs first
-TARGET_LINK_LIBRARIES(${PROJECT} ${GLLIBS})
-# if creating a static binary, precede libraries with -static, then name all the libs
-TARGET_LINK_LIBRARIES(${PROJECT} ${STATIC_START} ${SDL2LIBS} ${HTTPLIBS} ${NETWORKLIBS} ${SPEEX_LIBRARIES} ${DLLIB} ${REQUIREDLIBS} ${BREAKPAD_LIBS})
-
-if (APPLE OR STATIC OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD")
-    FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
-    TARGET_LINK_LIBRARIES(${PROJECT} ${ICONV_LIBRARIES})
 endif ()
 
+# Install
 # Don't recurse, grab all *.txt and *.md files
-file(GLOB DOC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/distribution/*.txt")
+file(GLOB DOC_FILES "${ROOT_DIR}/distribution/*.txt")
-list(APPEND DOC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/contributors.md" "${CMAKE_CURRENT_SOURCE_DIR}/licence.txt")
+list(APPEND DOC_FILES "${ROOT_DIR}/contributors.md"
+                      "${ROOT_DIR}/licence.txt")
 
 # CMake does not allow specifying a dependency chain which includes built-in
 # targets, like `install`, so we have to trick it and execute dependency ourselves.
 install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" --build \"${CMAKE_CURRENT_BINARY_DIR}\" --target g2)")
-install(CODE "file(DOWNLOAD https://github.com/OpenRCT2/title-sequences/releases/download/v0.0.5/title-sequence-v0.0.5.zip \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/${PROJECT}/title/title-sequences.zip EXPECTED_HASH SHA1=79ffb2585d12abcbfce205d7696e3472a504b005 SHOW_PROGRESS)")
+IF (DOWNLOAD_TITLE_SEQUENCES)
-install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/${PROJECT}/title/ \"${CMAKE_COMMAND}\" -E tar xvf title-sequences.zip)")
+    install(CODE "file(DOWNLOAD ${TITLE_SEQUENCE_URL} \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/${PROJECT}/title/title-sequences.zip EXPECTED_HASH SHA1=${TITLE_SEQUENCE_SHA1} SHOW_PROGRESS)")
-install(CODE "file(REMOVE \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/${PROJECT}/title/title-sequences.zip)")
+    install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/${PROJECT}/title/ \"${CMAKE_COMMAND}\" -E tar xvf title-sequences.zip)")
-install(TARGETS ${PROJECT} RUNTIME DESTINATION bin)
+    install(CODE "file(REMOVE \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/${PROJECT}/title/title-sequences.zip)")
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/g2.dat" DESTINATION share/${PROJECT})
-install(DIRECTORY data/ DESTINATION share/${PROJECT})
-install(FILES ${DOC_FILES} DESTINATION share/doc/${PROJECT})
-
-install(FILES resources/logo/icon_x16.png DESTINATION share/icons/hicolor/16x16/apps RENAME openrct2.png)
-install(FILES resources/logo/icon_x32.png DESTINATION share/icons/hicolor/32x32/apps RENAME openrct2.png)
-install(FILES resources/logo/icon_x64.png DESTINATION share/icons/hicolor/64x64/apps RENAME openrct2.png)
-install(FILES resources/logo/icon_x128.png DESTINATION share/icons/hicolor/128x128/apps RENAME openrct2.png)
-install(FILES resources/logo/icon_x256.png DESTINATION share/icons/hicolor/256x256/apps RENAME openrct2.png)
-install(FILES resources/logo/icon_flag.svg DESTINATION share/icons/hicolor/scalable/apps RENAME openrct2.svg)
-install(FILES distribution/linux/openrct2.desktop DESTINATION share/applications)
-
-if (WITH_TESTS)
-    enable_testing()
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/test/tests/)
 endif ()
-
+if (WIN32)
-if (UNIX AND (NOT USE_MMAP) AND (NOT DISABLE_RCT2) AND (FORCE32))
+    install(TARGETS "libopenrct2" RUNTIME DESTINATION "bin")
-    set(OPENRCT2_SRCPATH "src/openrct2")
+else ()
-    file(GLOB_RECURSE ORCT2_RIDE_SOURCES "${OPENRCT2_SRCPATH}/ride/*/*.c")
+    if (PORTABLE)
-    file(GLOB_RECURSE ORCT2_RIDE_DEP_SOURCES "${OPENRCT2_SRCPATH}/ride/ride_data.c" "${OPENRCT2_SRCPATH}/ride/track_data.c" "${OPENRCT2_SRCPATH}/ride/track_data_old.c" "${OPENRCT2_SRCPATH}/ride/track_paint.c" "${OPENRCT2_SRCPATH}/rct2/addresses.c" "${OPENRCT2_SRCPATH}/diagnostic.c" "${OPENRCT2_SRCPATH}/rct2/hook.c" "${OPENRCT2_SRCPATH}/paint/map_element/map_element.c" "${OPENRCT2_SRCPATH}/paint/paint_helpers.c")
+        install(TARGETS "libopenrct2" LIBRARY DESTINATION "bin")
-    file(GLOB_RECURSE ORCT2_TESTPAINT_SOURCES "test/testpaint/*.c" "test/testpaint/*.cpp" "test/testpaint/*.h")
+    else ()
-
+        install(TARGETS "libopenrct2" LIBRARY DESTINATION "lib")
-    add_executable(testpaint EXCLUDE_FROM_ALL ${ORCT2_RIDE_SOURCES} ${ORCT2_RIDE_DEP_SOURCES} ${ORCT2_TESTPAINT_SOURCES} ${RCT2_SECTIONS})
+    endif ()
-    target_include_directories(testpaint PRIVATE "src/")
-    set_target_properties(testpaint PROPERTIES COMPILE_FLAGS "-DNO_VEHICLES -D__TESTPAINT__ -Wno-unused")
-    set_target_properties(testpaint PROPERTIES LINK_FLAGS ${RCT2_SEGMENT_LINKER_FLAGS})
-    add_dependencies(testpaint segfiles)
 endif ()
-
+install(TARGETS "openrct2" RUNTIME DESTINATION "bin")
-set(CPACK_PACKAGE_VERSION_MAJOR 0)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/g2.dat" DESTINATION "share/openrct2")
-set(CPACK_PACKAGE_VERSION_MINOR 0)
+install(DIRECTORY "data/" DESTINATION "share/openrct2")
-set(CPACK_PACKAGE_VERSION_PATCH 7)
+install(FILES ${DOC_FILES} DESTINATION "share/doc/openrct2")
-INCLUDE(CPack)
+install(FILES "resources/logo/icon_x16.png" DESTINATION "share/icons/hicolor/16x16/apps" RENAME "openrct2.png")
+install(FILES "resources/logo/icon_x32.png" DESTINATION "share/icons/hicolor/32x32/apps" RENAME "openrct2.png")
+install(FILES "resources/logo/icon_x64.png" DESTINATION "share/icons/hicolor/64x64/apps" RENAME "openrct2.png")
+install(FILES "resources/logo/icon_x128.png" DESTINATION "share/icons/hicolor/128x128/apps" RENAME "openrct2.png")
+install(FILES "resources/logo/icon_x256.png" DESTINATION "share/icons/hicolor/256x256/apps" RENAME "openrct2.png")
+install(FILES "resources/logo/icon_flag.svg" DESTINATION "share/icons/hicolor/scalable/apps" RENAME "openrct2.svg")
+install(FILES "distribution/linux/openrct2.desktop" DESTINATION "share/applications")
+install(DIRECTORY "distribution/man/" DESTINATION "share/man/man6" FILES_MATCHING PATTERN "*.6")
+install(CODE "execute_process(COMMAND find \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/man/man6 -type f -exec gzip -f \"{}\" \;)")

appveyor.yml

@@ -1,4 +1,4 @@
-version: 0.0.7.{build}
+version: 0.0.8.{build}
 image:
   - Visual Studio 2015
 #  - Visual Studio 2017 RC
@@ -21,7 +21,9 @@ configuration: Release
 build:
   project: openrct2.proj
 test_script:
-- ps: msbuild openrct2.proj /t:test /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+- ps: msbuild openrct2.proj /t:TestNoRCT2 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+after_test:
+- ps: (new-object net.webclient).UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\artifacts\test-results.xml))
 artifacts:
 - path: .\artifacts\openrct2-portable*.zip
   name: OpenRCT2-portable

contributors.md

@@ -9,6 +9,7 @@ Includes all git commit authors. Aliases are GitHub user names.
 * Lewis Fox (LRFLEW) - Developer, macOS management
 * Marijn van der Werf (marijnvdwerf) - Developer
 * (zsilencer) - Developer
+* Richard Jenkins (rwjuk) - Developer, issue management
 
 ## Implementation (RCT2)
 * Ted John (IntelOrca)
@@ -48,7 +49,7 @@ Includes all git commit authors. Aliases are GitHub user names.
 * Robert Jordan (trigger-death) - UI theming, title sequence editor, misc.
 * Aaron van Geffen (AaronVanGeffen) - scenario select screen, font detection, misc.
 * Michał Janiszewski (janisozaur) - Linux port, crash handling, security, misc.
-* Kelson Blakewood (spacek531) - title sequence for 0.0.4 and 0.0.5/0.0.6
+* Kelson Blakewood (spacek531) - title sequences for 0.0.4, 0.0.5/0.0.6/0.0.7, and 0.1.0; title sequences using milliseconds
 * Hugo Wallenburg (Goddesen) - Misc.
 * Matte Andersson (Nubbie) - Misc, UX
 * Daniel Trujillo Viedma (gDanix) - Custom currency.
@@ -57,6 +58,7 @@ Includes all git commit authors. Aliases are GitHub user names.
 * Hielke Morsink (Broxzier) - Tile inspector, heightmap loader, misc.
 * Joël Troch (JoelTroch) - Keyboard shortcuts for ride construction.
 * Thomas Delebo (delebota) - Misc.
+* Brian Callahan (ibara) - OpenBSD port.
 
 ## Bug fixes
 * (halfbro)
@@ -77,6 +79,9 @@ Includes all git commit authors. Aliases are GitHub user names.
 * Jake Breen (Haekb)
 * Marco Benzi Tobar (Lisergishnu)
 * Richard Jenkins (rwjuk)
+* (ceeac)
+* Matthias Moninger (Zeh Matt)
+* Tomas Dittmann (Chaosmeister)
 
 ## Toolchain
 * (Balletie) - macOS
@@ -109,6 +114,7 @@ Includes all git commit authors. Aliases are GitHub user names.
 * Finnish - (DJHasis), (Zode), (TheWing)
 * French - (fbourigault), Joël Troch (JoelTroch), Michael Steenbeek (Gymnasiast), Romain Vigier (rvgr),  (AziasYur), Hugo Courtial (s0r00t), David Delobel (incyclum)
 * German - (danidoedel), (atmaxinger), (Yepoleb), Daniel Kessel (dkessel), Leon (AllGoodNamesAreTaken), (raidcookie)
+* Italian - Luca Andrea Rossi (LucaRed)
 * Japanese - Aaron van Geffen (AaronVanGeffen), Nick Hall (nickhall), (jhako), Harry Lam (daihakken)
 * Korean - "TELK" (telk5093), (NeverDruid); small fixes: (kexplo)
 * Polish - Adrian Wielgosik (adrian17), (lopezloo), Michał Janiszewski (janisozaur)

data/language/ca-ES.txt

@@ -3762,7 +3762,7 @@ STR_5420    :Gira{MOVE_X}{87}{COMMA16}
 STR_5421    :Enfoca
 STR_5422    :Enfoca{MOVE_X}{87}{COMMA16}
 STR_5423    :Espera
-STR_5424    :Espera{MOVE_X}{87}{COMMA16}
+STR_5424    :Espera{MOVE_X}{87}{UINT16}
 STR_5425    :Torna a començar
 STR_5426    :Acaba
 STR_5427    :Coordenades:

data/language/cs-CZ.txt

@@ -2750,7 +2750,7 @@ STR_2739    :Žádná
 STR_2740    :RollerCoaster Tycoon 1
 STR_2741    :RollerCoaster Tycoon 2
 STR_2742    :css50.dat nenalezen
-STR_2743    :Nakopírujte data\css17.dat z vaší instalace RCT1 do to data\css50.dat ve vaší instalaci RCT2.
+STR_2743    :Nakopírujte 'data/css17.dat' z vaší instalace RCT1 do 'data/css50.dat' ve vaší instalaci RCT2.
 STR_2744    :[
 STR_2745    :\
 STR_2746    :]
@@ -3764,13 +3764,13 @@ STR_5420    :Otočit{MOVE_X}{87}{COMMA16}
 STR_5421    :Přiblížit
 STR_5422    :Přiblížit{MOVE_X}{87}{COMMA16}
 STR_5423    :Čekat
-STR_5424    :Čekat{MOVE_X}{87}{COMMA16}
+STR_5424    :Čekat{MOVE_X}{87}{UINT16}
 STR_5425    :Restart
 STR_5426    :Konec
 STR_5427    :Souřadnice:
 STR_5428    :Počet otočení proti směru hod.ruč.:
 STR_5429    :Úroveň přiblížení:
-STR_5430    :Délka čekání (v sekundách):
+STR_5430    :Délka čekání (v milisekundách):
 STR_5431    :Uložená hra k načtení:
 STR_5432    :Příkaz:
 STR_5433    :Herní sekvence
@@ -4145,7 +4145,7 @@ STR_5832    :{SMALLFONT}{BLACK}Výškové jednotky zobrazit pouze číslem, bez
 STR_5833    :{SMALLFONT}{BLACK}Změní formát data
 STR_5834    :{SMALLFONT}{BLACK}Vyberte zvukové zařízení pro použití v OpenRCT2
 STR_5835    :{SMALLFONT}{BLACK}Zakázat zvuky, pokud herní okno přestane být aktivní
-STR_5836    :{SMALLFONT}{BLACK}Vyberte hudbu, která bude hrát na úvodní obrazovce.{NEWLINE}Výběr RCT1 znělky vyžaduje zkopírování a přejmenování 'data/css17.dat' ze složky RCT1 jako 'data/css50.dat' do vaší RCT2 složky.
+STR_5836    :{SMALLFONT}{BLACK}Vyberte hudbu, která bude hrát na úvodní obrazovce.{NEWLINE}Výběr RCT1 znělky vyžaduje zkopírování a přejmenování 'data/css17.dat' ze složky RCT1 jako 'data/css50.dat' do vaší RCT2 složky, nebo nastavení cesty k RCT1 v nastavení.
 STR_5837    :{SMALLFONT}{BLACK}Vytvořit a spravovat vlastní barevné palety UI
 STR_5838    :{SMALLFONT}{BLACK}Zobrazit samostatné tlačítko pro financí na nástrojové liště
 STR_5839    :{SMALLFONT}{BLACK}Zobrazit samostatné tlačítko pro výzkum a vývoj na nástrojové liště
@@ -4342,6 +4342,104 @@ STR_6029    :Stavba trati - odebrat aktivní část
 STR_6030    :{SMALLFONT}{BLACK}Výběr kulis. Klikněte na jakoukoliv kulisu na mapě pro postavení její kopie.
 STR_6031    :Popis serveru:
 STR_6032    :Uvítací zpráva serveru:
+STR_6033    :Cesta k RCT1 instalaci:
+STR_6034    :{SMALLFONT}{BLACK}{STRING}
+STR_6035    :Prosím vyberte složku s RCT1
+STR_6036    :{SMALLFONT}{BLACK}Zrušit
+STR_6037    :Prosím vyberte správnou složku s RCT1
+STR_6038    :{SMALLFONT}{BLACK}Pokud máte nainstalovaný RCT1, použijte tuto volbu k nastavení cesty k RCT1 pro možnost nahrání scénářů, hudby a dalších.
+STR_6039    :{SMALLFONT}{BLACK}Rychle odebrat atrakci
+STR_6040    :Upravit nastavení scénáře
+STR_6041    :{BLACK}Nemáte najmuté žádné mechaniky!
+STR_6042    :Načíst výškovou mapu
+STR_6043    :Vybrat výškovou mapu
+STR_6044    :Vyhladit výškovou mapu
+STR_6045    :Síla
+STR_6046    :Normalizovat výškovou mapu
+STR_6047    :Vyhladit dlaždice
+STR_6048    :Chyba výškové mapy
+STR_6049    :Chyba při čtení PNG
+STR_6050    :Chyba při čtení bitmapy
+STR_6051    :Šířka a výška musí být stejné
+STR_6052    :Výšková mapa je moc velká a bude oříznuta
+STR_6053    :Výškovou mapu nelze normalizovat
+STR_6054    :Podporovány jsou pouze 24-bitové bitmapy
+STR_6055    :Soubor výškové mapy OpenRCT2
+STR_6056    :{SMALLFONT}{BLACK}Ztlumit
+STR_6057    :{SMALLFONT}{BLACK}Na nástrojové liště zobrazovat samostatné tlačítko "Ztlumit"
+STR_6058    :Ztlumit
+STR_6059    :{RIGHTGUILLEMET}
+STR_6060    :Povolit animaci při nákupu návštěvníků
+STR_6061    :{SMALLFONT}{BLACK}Zobrazit animovaný efekt peněz, když návštěvníci platí.
+STR_6062    :{OUTLINE}{GREEN}+ {CURRENCY2DP}
+STR_6063    :{OUTLINE}{RED}- {CURRENCY2DP}
+STR_6064    :Vlastnit všechny pozemky
+STR_6065    :Ukládat aktivitu uživatele
+STR_6066    :{SMALLFONT}{BLACK}Ukládat aktivitu uživatelů do souborů ve Vašem domovském adresáři.
+STR_6067    :Server spuštěn.
+STR_6068    :Server zastaven.
+STR_6069    :Uživatel {STRING} byl vyhozen ze hry uživatelem {STRING}.
+STR_6070    :Uživatel {STRING} byl přidán do skupiny '{STRING}' uživatelem {STRING}.
+STR_6071    :Uživatel {STRING} vytvořil novou skupinu '{STRING}'.
+STR_6072    :Uživatel {STRING} smazal skupinu '{String}'.
+STR_6073    :Uživatel {STRING} upravil oprávnění skupiny '{String}'.
+STR_6074    :Uživatel {STRING} změnil název skupiny z '{String}' na '{String}'.
+STR_6075    :Uživatel {STRING} nastavil výchozí skupinu na '{String}'.
+STR_6076    :Uživatel {STRING} použil/přepnul cheat '{STRING}'.
+STR_6077    :Přidat peníze
+STR_6078    :Uživatel {STRING} vytvořil atrakci '{STRING}'.
+STR_6079    :Uživatel {STRING} zboural atrakci '{STRING}'.
+STR_6080    :Uživatel {STRING} změnil vzhled atrakce '{STRING}'.
+STR_6081    :Uživatel {STRING} nastavil stav atrakce '{STRING}' na zavřeno.
+STR_6082    :Uživatel {STRING} nastavil stav atrakce '{STRING}' na otevřeno.
+STR_6083    :Uživatel {STRING} nastavil stav atrakce '{STRING}' na testování.
+STR_6084    :Uživatel {STRING} změnil nastavení vozů atrakce '{STRING}'.
+STR_6085    :Uživatel {STRING} změnil nastavení jízdy atrakce '{STRING}'.
+STR_6086    :Uživatel {STRING} přejmenoval atrakci '{STRING}' na '{STRING}'.
+STR_6087    :Uživatel {STRING} nastavil cenu vstupenky atrakce '{STRING}' na {STRING}
+STR_6088    :Uživatel {STRING} nastavil sekundární cenu vstupenky atrakce '{STRING}' na {STRING}
+STR_6089    :Uživatel {STRING} přejmenoval park z '{STRING}' na '{STRING}'.
+STR_6090    :Uživatel {STRING} otevřel park.
+STR_6091    :Uživatel {STRING} zavřel park.
+STR_6092    :Uživatel {STRING} nastavil vstupné do parku na {STRING}
+STR_6093    :Uživatel {STRING} umístil novou kulisu.
+STR_6094    :Uživatel {STRING} odstranil kulisu.
+STR_6095    :Uživatel {STRING} upravil krajinu.
+STR_6096    :Uživatel {STRING} nastavil nápis na ceduli na '{STRING}'.
+STR_6097    :Uživatel {STRING} umístil část trati atrakce '{STRING}'.
+STR_6098    :Uživatel {STRING} odebral část trati.
+STR_6099    :Připojili jste se na server.
+STR_6100    :Odpojili jste se od serveru.
+STR_6101    :Hodnota atrakcí časem nedegraduje
+STR_6102    :{SMALLFONT}{BLACK}Hodnota atrakce nebude s postupem času klesat, takže návštěvníci nebudou najednou mít pocit, že je vstupné moc drahé.
+STR_6103    :{SMALLFONT}{BLACK}Tato volba není ve hře více hráčů dostupná.
+STR_6104    :Vývrtková horská dráha
+STR_6105    :Hyper horská dráha
+STR_6106    :Autodráha
+STR_6107    :Monster Trucks
+STR_6108    :Ocelová horská
+STR_6109    :Hyper-Twister
+STR_6110    :Dorostenecká horská dráha
+STR_6111    :Klasická malá horská dráha
+STR_6112    :Malá ocelová horská dráha, na které vlak projíždí smyčky a vývrtky
+STR_6113    :Vysoká horská dráha s dlouhými pády, velkou rychlostí a pohodlnými vlaky, kde se jezdí s opěrkou v klíně
+STR_6114    :Návštěvníci jedou pomalu ve vozidlech po postavené dráze.
+STR_6115    :Obří auta s pohonem 4x4, které jsou schopna vyjíždět velmi strmé svahy
+STR_6116    :Široká ocelová horská dráha, na které vozy jedou po hladkých kolejnicích skrze propletenou dráhu
+STR_6117    :Horská dráha s dlouhými pády, velkou rychlostí a pohodlnými vlaky, kde se jezdí s opěrkou v klíně, která přelétává vrcholky kopců
+STR_6118    :Pozvolná horská dráha pro ty kdo se zatím neodvažují na větší dráhy
+STR_6119    :Levná horská dráha, kterou lze snadno postavit - má však omezenou maximální výšku
+STR_6120    :{BABYBLUE}Nové vozy dostupné pro {STRINGID}:{NEWLINE}{STRINGID}
+STR_6121    :{SMALLFONT}{BLACK}Zajistí práva pro všechny pozemky na mapě
+STR_6122    :Ve scénáři není dostatečný počet horských drah!
+STR_6123    :Nepodařilo se načíst objekty parku
+STR_6124    :Název objektu
+STR_6125    :Typ objektu
+STR_6126    :Neznámý typ
+STR_6127    :Soubor: {STRING}
+STR_6128    :Soubor se nepodařilo načíst, protože využívá objekty, z nichž některé jsou porušené nebo zcela chybí. Seznam takových objektů je k dispozici níže.
+STR_6129    :Kopírovat vybrané do schránky
+STR_6130    :Kopírovat celý seznam do schránky
 
 ###############################################################################
 ## RCT2 Objects

data/language/de-DE.txt

@@ -2395,7 +2395,7 @@ STR_2389    :{BLACK}Bauen Sie Ihre(n) beste(n) {STRINGID}!
 STR_2390    :{BLACK}Mindestens 10 verschiedene Achterbahntypen in Ihrem Park zu betreiben, wobei jeder einen Nervenkitzelwert von mindestens 6,00 aufweisen muss
 STR_2391    :{BLACK}Mindestens {COMMA16} Parkbesucher zu erreichen. Die Parkbewertung darf zu keinem Zeitpunkt unter 700 fallen!
 STR_2392    :{BLACK}Monatliche Einkünfte durch Fahrttickets von mindestens {POP16}{POP16}{CURRENCY} zu erreichen
-STR_2393    :{BLACK}Mindestens 10 verschiedene Achterbahntypen in Ihrem Park zu betreiben, wobei jeder eine Mindestlänge von {LENGTH} und einen Nervenkitzelwert von mindestens 7.00 aufweisen muss
+STR_2393    :{BLACK}Mindestens 10 verschiedene Achterbahntypen in Ihrem Park zu betreiben, wobei jeder eine Mindestlänge von {LENGTH} und einen Nervenkitzelwert von mindestens 7,00 aufweisen muss
 STR_2394    :{BLACK}Alle 5 bereits teilweise gebauten Achterbahnen fertigzustellen, damit sie jeweils einen Nervenkitzelwert von {POP16}{POP16}{COMMA2DP32} erzielen
 STR_2395    :{BLACK}Ihr Darlehen zurückzuzahlen und einen Verkehrswert von mindestens {POP16}{POP16}{CURRENCY} zu erreichen
 STR_2396    :{BLACK}Einen monatlichen Gewinn durch Speisen, Getränke und Werbeartikeln von mindestens {POP16}{POP16}{CURRENCY} zu erzielen
@@ -2747,7 +2747,7 @@ STR_2739    :Keine
 STR_2740    :RollerCoaster Tycoon 1
 STR_2741    :RollerCoaster Tycoon 2
 STR_2742    :css50.dat nicht gefunden
-STR_2743    :Kopieren Sie data\css17.dat aus Ihrem RCT1-Verzeichnis nach data\css50.dat in Ihrem RCT2-Verzeichnis oder versichern Sie sich, dass der Pfad zur RCT1-Installation in den Optionen korrekt angegeben ist.
+STR_2743    :Kopieren Sie 'data/css17.dat' aus Ihrem RCT1-Verzeichnis nach 'data/css50.dat' in Ihrem RCT2-Verzeichnis oder versichern Sie sich, dass der Pfad zur RCT1-Installation in den Optionen korrekt angegeben ist.
 STR_2744    :[
 STR_2745    :\
 STR_2746    :]
@@ -3758,7 +3758,7 @@ STR_5420    :Drehen{MOVE_X}{87}{COMMA16}
 STR_5421    :Zoom
 STR_5422    :Zoom{MOVE_X}{87}{COMMA16}
 STR_5423    :Warten
-STR_5424    :Warten{MOVE_X}{87}{COMMA16}
+STR_5424    :Warten{MOVE_X}{87}{UINT16}
 STR_5425    :Neustart
 STR_5426    :Ende
 STR_5427    :Koordinaten:
@@ -4334,6 +4334,7 @@ STR_6030    :{SMALLFONT}{BLACK}Landschaftsauswahl. Wählen Sie ein Landschaftsel
 STR_6031    :Serverbeschreibung:
 STR_6032    :Serverbegrüßung:
 STR_6033    :Pfad zur RCT1-Installation:
+STR_6034    :{SMALLFONT}{BLACK}{STRING}
 STR_6035    :Bitte wählen Sie ein RCT1-Verzeichnis
 STR_6036    :{SMALLFONT}{BLACK}Leeren
 STR_6037    :Bitte wählen Sie ein valides RCT1-Verzeichnis
@@ -4341,6 +4342,87 @@ STR_6038    :{SMALLFONT}{BLACK}Falls Sie RCT1 installiert haben, setzen Sie dies
 STR_6039    :{SMALLFONT}{BLACK}Schnellabriss
 STR_6040    :Bearbeite Szenariooptionen
 STR_6041    :{BLACK}Es sind keine Mechaniker eingestellt! 
+STR_6042    :Höhenkarte laden
+STR_6043    :Höhenkarte auswählen
+STR_6044    :Höhenkarte glätten
+STR_6045    :Stärke
+STR_6046    :Höhenkarte normalisieren
+STR_6047    :Kacheln glätten
+STR_6048    :Fehler beim Verarbeiten der Höhenkarte
+STR_6049    :Fehler beim Lesen der PNG-Datei
+STR_6050    :Fehler beim Lesen der Bitmap-Datei
+STR_6051    :Die Höhe und Breite müssen übereinstimmen
+STR_6052    :Die Höhenkarte ist zu groß und wird zugeschnitten
+STR_6053    :Die Höhenkarte kann nicht normalisiert werden
+STR_6054    :Es werden nur Bitmaps mit einer Farbtiefe von 24-Bit unterstützt
+STR_6055    :Höhenkarte für OpenRCT2
+STR_6056    :{SMALLFONT}{BLACK}Ton ein-/ausschalten
+STR_6057    :{SMALLFONT}{BLACK}Zeigt für die Stummschaltung in der Symbolleiste eine gesonderte{NEWLINE}Schaltfläche an
+STR_6058    :Stummschaltung
+STR_6059    :{RIGHTGUILLEMET}
+STR_6060    :Besucherkäufe als Animation anzeigen
+STR_6061    :{SMALLFONT}{BLACK}Ein animierter Geldeffekt wird angezeigt, wenn Besucher Käufe tätigen
+STR_6062    :{OUTLINE}{GREEN}+ {CURRENCY2DP}
+STR_6063    :{OUTLINE}{RED}- {CURRENCY2DP}
+STR_6064    :Alles Land besitzen
+STR_6065    :Benutzeraktionen protokollieren
+STR_6066    :{SMALLFONT}{BLACK}Speichert alle Benutzeraktionen in{NEWLINE}Ihrem Benutzerverzeichnis
+STR_6067    :Server gestartet.
+STR_6068    :Server heruntergefahren.
+STR_6069    :{STRING} wurde von {STRING} vom Server gekickt.
+STR_6070    :{STRING} wurde der Gruppe '{STRING}' von {STRING} zugewiesen.
+STR_6071    :{STRING} hat die neue Gruppe '{STRING}' erstellt.
+STR_6072    :{STRING} hat die Gruppe '{String}' gelöscht.
+STR_6073    :{STRING} hat die Berechtigungen der Gruppe '{String}' bearbeitet.
+STR_6074    :{STRING} hat den Namen der Gruppe von '{String}' zu '{String}' geändert.
+STR_6075    :{STRING} hat '{String}' als Standardgruppe festgelegt.
+STR_6076    :{STRING} hat den Cheat '{STRING}' verwendet.
+STR_6077    :Geld hinzufügen
+STR_6078    :{STRING} hat die Attraktion '{STRING}' erstellt.
+STR_6079    :{STRING} hat die Attraktion '{STRING}' abgerissen.
+STR_6080    :{STRING} hat das Aussehen der Attraktion '{STRING}' verändert.
+STR_6081    :{STRING} hat den Status der Attraktion '{STRING}' auf geschlossen geändert.
+STR_6082    :{STRING} hat den Status der Attraktion '{STRING}' auf geöffnet geändert.
+STR_6083    :{STRING} hat den Status der Attraktion '{STRING}' auf testen geändert.
+STR_6084    :{STRING} hat die Fahrzeugeinstellungen der Attraktion '{STRING}' geändert.
+STR_6085    :{STRING} hat die Attraktionseinstellungen der Attraktion '{STRING}' geändert.
+STR_6086    :{STRING} hat die Attraktion '{STRING}' in '{STRING}' umbenannt.
+STR_6087    :{STRING} hat den Preis der Attraktion '{STRING}' auf {STRING} geändert.
+STR_6088    :{STRING} hat den Sekundärpreis der Attraktion '{STRING}' auf {STRING} geändert.
+STR_6089    :{STRING} hat den Park von '{STRING}' in '{STRING}' umbenannt.
+STR_6090    :{STRING} hat den Park geöffnet.
+STR_6091    :{STRING} hat den Park geschlossen.
+STR_6092    :{STRING} hat den Parkeintrittspreis auf {STRING} geändert.
+STR_6093    :{STRING} hat neue Szenerie platziert.
+STR_6094    :{STRING} hat Szenerie entfernt.
+STR_6095    :{STRING} hat Szenerie bearbeitet.
+STR_6096    :{STRING} hat einen Schildnamen auf '{STRING}' festgelegt.
+STR_6097    :{STRING} hat ein Streckenstück der Attraktion '{STRING}' platziert.
+STR_6098    :{STRING} hat ein Streckenstück einer Attraktion entfernt.
+STR_6099    :Sie haben sich mit dem Server verbunden.
+STR_6100    :Sie haben die Verbindung mit dem Server getrennt.
+STR_6101    :Attrakt. verlieren keinen Wert über Zeit
+STR_6102    :{SMALLFONT}{BLACK}Der Wert einer Attraktion wird mit der Zeit nicht sinken, sodass Besucher eine Attraktion nicht mehr plötzlich als{NEWLINE}zu teuer empfinden
+STR_6103    :{SMALLFONT}{BLACK}Diese Option ist im Mehrspielermodus deaktiviert
+STR_6104    :Korkenzieher-Achterbahn
+STR_6105    :Hyper-Achterbahn
+STR_6106    :Wagenbahn
+STR_6107    :Monster-Trucks
+STR_6108    :Stahl-Twister
+STR_6109    :Hyper-Twister
+STR_6110    :Kinder-Achterbahn
+STR_6111    :Klassische Miniachterbahn
+STR_6112    :Eine kompakte Stahlachterbahn, bei der der Zug durch Schrauben und Schleifen fährt
+STR_6113    :Eine große, nicht umgekehrte Achterbahn mit großen Gefällen, hoher Geschwindigkeit und komfortablen Zügen, die lediglich Beckenhalterungen aufweisen
+STR_6114    :Die Passagiere sitzen in langsam angetriebenen Wagen auf einer Schienenstrecke
+STR_6115    :Angetriebene, gigantische Trucks mit Allradantrieb, die steile Hänge bezwingen können
+STR_6116    :Breite Achterbahnzüge gleiten auf glatten Stahlschienen mit verdrehter Streckenführung
+STR_6117    :Die Fahrgäste sitzen in komfortablen Wagen mit einfachen Beckenhalterungen, in denen sie gigantische, gemäßigte Gefälle erleben, aber auch viel Zeit oben `in der Luft' verbringen
+STR_6118    :Eine gemäßigte Achterbahn für Leute, die noch nicht den Mut für längere Bahnen haben
+STR_6119    :Eine günstige und einfach zu bauende Achterbahn, jedoch mit begrenzter Höhe
+STR_6120    :{BABYBLUE}Neues Fahrzeug für {STRINGID} ist jetzt verfügbar:{NEWLINE}{STRINGID}
+STR_6121    :{SMALLFONT}{BLACK}Erweitert die Landrechte des Parks{NEWLINE}bis zum Rand der Karte
+STR_6122    :Dieses Szenario enthält zu wenige Achterbahnen!
 
 #############
 # Scenarios #

data/language/en-GB.txt

@@ -3762,13 +3762,13 @@ STR_5420    :Rotate{MOVE_X}{87}{COMMA16}
 STR_5421    :Zoom
 STR_5422    :Zoom{MOVE_X}{87}{COMMA16}
 STR_5423    :Wait
-STR_5424    :Wait{MOVE_X}{87}{COMMA16}
+STR_5424    :Wait{MOVE_X}{87}{UINT16}
 STR_5425    :Restart
 STR_5426    :End
 STR_5427    :Coordinates:
 STR_5428    :Anticlockwise rotations:
 STR_5429    :Zoom level:
-STR_5430    :Seconds to wait:
+STR_5430    :Milliseconds to wait:
 STR_5431    :Save to load:
 STR_5432    :Command:
 STR_5433    :Title Sequences
@@ -4180,7 +4180,7 @@ STR_5868    :{WINDOW_COLOUR_2}Provider E-mail: {BLACK}{STRING}
 STR_5869    :{WINDOW_COLOUR_2}Provider Website: {BLACK}{STRING}
 STR_5870    :{SMALLFONT}{BLACK}Show server information
 STR_5871    :Plants don't age
-STR_5872    :{SMALLFONT}{BLACK}Disable plant aging such that they don't wilt.
+STR_5872    :{SMALLFONT}{BLACK}Disable plant ageing such that they don't wilt.
 STR_5873    :Allow chain lifts on all track pieces
 STR_5874    :{SMALLFONT}{BLACK}Allows any piece of track to be made into a chain lift
 STR_5875    :Drawing Engine:
@@ -4367,6 +4367,78 @@ STR_6055    :OpenRCT2 Heightmap File
 STR_6056    :{SMALLFONT}{BLACK}Mute
 STR_6057    :{SMALLFONT}{BLACK}Show a separate button for the Mute Option in the toolbar
 STR_6058    :Mute
+STR_6059    :{RIGHTGUILLEMET}
+STR_6060    :Show guest purchases as animation
+STR_6061    :{SMALLFONT}{BLACK}Show animated money effect{NEWLINE}when guests make purchases.
+STR_6062    :{OUTLINE}{GREEN}+ {CURRENCY2DP}
+STR_6063    :{OUTLINE}{RED}- {CURRENCY2DP}
+STR_6064    :Own all land
+STR_6065    :Log user actions
+STR_6066    :{SMALLFONT}{BLACK}Logs all user actions to files in your user directory.
+STR_6067    :Server started.
+STR_6068    :Server shutdown.
+STR_6069    :{STRING} was kicked from the server by {STRING}.
+STR_6070    :{STRING} was set to group '{STRING}' by {STRING}.
+STR_6071    :{STRING} created new player group '{STRING}'.
+STR_6072    :{STRING} deleted player group '{String}'.
+STR_6073    :{STRING} edited permissions for player group '{String}'.
+STR_6074    :{STRING} changed player group name from '{String}' to '{String}'.
+STR_6075    :{STRING} changed the default player group to '{String}'.
+STR_6076    :{STRING} used/toggled cheat '{STRING}'.
+STR_6077    :Add Money
+STR_6078    :{STRING} created ride '{STRING}'.
+STR_6079    :{STRING} demolished ride '{STRING}'.
+STR_6080    :{STRING} changed the appearance of ride '{STRING}'.
+STR_6081    :{STRING} changed the status of ride '{STRING}' to closed.
+STR_6082    :{STRING} changed the status of ride '{STRING}' to open.
+STR_6083    :{STRING} changed the status of ride '{STRING}' to testing.
+STR_6084    :{STRING} changed the vehicle settings of ride '{STRING}'.
+STR_6085    :{STRING} changed the ride settings of ride '{STRING}'.
+STR_6086    :{STRING} renamed the ride '{STRING}' to '{STRING}'.
+STR_6087    :{STRING} changed the price of ride '{STRING}' to {STRING}
+STR_6088    :{STRING} changed the secondary price of ride '{STRING}' to {STRING}
+STR_6089    :{STRING} renamed the park from '{STRING}' to '{STRING}'.
+STR_6090    :{STRING} opened the park.
+STR_6091    :{STRING} closed the park.
+STR_6092    :{STRING} changed the park entrance fee to {STRING}
+STR_6093    :{STRING} placed new scenery.
+STR_6094    :{STRING} removed scenery.
+STR_6095    :{STRING} edited scenery.
+STR_6096    :{STRING} set sign name to '{STRING}'.
+STR_6097    :{STRING} placed a track of ride '{STRING}'.
+STR_6098    :{STRING} removed a track of ride.
+STR_6099    :You connected to the server.
+STR_6100    :You disconnected from the server.
+STR_6101    :Rides don't decrease in value over time
+STR_6102    :{SMALLFONT}{BLACK}The value of a ride won't decrease over time, so guests will not suddenly think that a ride is too expensive.
+STR_6103    :{SMALLFONT}{BLACK}This option is disabled during network play.
+STR_6104    :Corkscrew Roller Coaster
+STR_6105    :Hypercoaster
+STR_6106    :Car Ride
+STR_6107    :Monster Trucks
+STR_6108    :Steel Twister
+STR_6109    :Hyper-Twister
+STR_6110    :Junior Roller Coaster
+STR_6111    :Classic Mini Roller Coaster
+STR_6112    :A compact steel-tracked roller coaster where the train travels through corkscrews and loops
+STR_6113    :A tall non-inverting roller coaster with large drops, high speed, and comfortable trains with only lap bar restraints
+STR_6114    :Riders travel slowly in powered vehicles along a track-based route
+STR_6115    :Powered giant 4 x 4 trucks which can climb steep slopes
+STR_6116    :Wide roller coaster trains glide along smooth steel track, traveling through a variety of inversions
+STR_6117    :Sitting in comfortable trains with only simple lap restraints riders enjoy giant smooth drops and twisting track as well as plenty of 'air time' over the hills
+STR_6118    :A gentle roller coaster for people who haven't yet got the courage to face the larger rides
+STR_6119    :A cheap and easy to build roller coaster, but with a limited height
+STR_6120    :{BABYBLUE}New vehicle now available for {STRINGID}:{NEWLINE}{STRINGID}
+STR_6121    :{SMALLFONT}{BLACK}Extends the park's land rights all the way to the edges of the map
+STR_6122    :There are not enough roller coasters in this scenario!
+STR_6123    :Error loading objects for park
+STR_6124    :Object name
+STR_6125    :Object type
+STR_6126    :Unknown type
+STR_6127    :File: {STRING}
+STR_6128    :The file could not be loaded as some of the objects referenced in it are missing or corrupt. A list of these objects is given below.
+STR_6129    :Copy selected item to clipboard
+STR_6130    :Copy entire list to clipboard
 
 #############
 # Scenarios #

data/language/es-ES.txt

@@ -839,8 +839,15 @@ STR_0834    :{SMALLFONT}{BLACK}Opciones de juego
 STR_0835    :Falló la inicialización del juego
 STR_0836    :No se ha podido iniciar el juego en estado minimizado
 STR_0837    :No se ha podido iniciar el sistema gráfico
+STR_0838    :<removed string - do not use>
 STR_0839    :{UINT16} x {UINT16}
 STR_0840    :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{UINT16} x {UINT16}
+STR_0841    :<removed string - do not use>
+STR_0842    :<removed string - do not use>
+STR_0843    :<removed string - do not use>
+STR_0844    :<removed string - do not use>
+STR_0845    :<removed string - do not use>
+STR_0846    :<removed string - do not use>
 # The following six strings were used for display resolutions, but have been replaced.
 STR_0847    :Sobre 'OpenRCT2'
 STR_0848    :RollerCoaster Tycoon 2
@@ -885,6 +892,7 @@ STR_0886    :Salir del juego
 STR_0887    :Salir del editor de escenarios
 STR_0888    :Salir del editor de Montañas Rusas
 STR_0889    :Salir del editor de Vías
+STR_0890    :<removed string - do not use>
 STR_0891    :Tomar captura de pantalla
 STR_0892    :Captura de pantalla guardada como '{STRINGID}'
 STR_0893    :¡No se pudo tomar la Captura de pantalla!
@@ -1645,6 +1653,8 @@ STR_1647    :
 STR_1648    :{SMALLFONT}{OPENQUOTES}¡Ayuda! ¡Bájame!{ENDQUOTES}
 STR_1649    :{SMALLFONT}{OPENQUOTES}¡Me estoy quedando sin dinero!{ENDQUOTES}
 STR_1650    :{SMALLFONT}{OPENQUOTES}¡Wow! ¡Están construyendo una nueva atracción!{ENDQUOTES}
+STR_1651    :<removed string - do not use>
+STR_1652    :<removed string - do not use>
 STR_1653    :{SMALLFONT}{OPENQUOTES}... ¡y aquí estamos en {STRINGID}!{ENDQUOTES}
 STR_1654    :{WINDOW_COLOUR_2}Pensamientos recientes:
 STR_1655    :{SMALLFONT}{BLACK}Construir camino a nivel del suelo.
@@ -1884,6 +1894,8 @@ STR_1888    :{WINDOW_COLOUR_2}Tiempo desde la última inspección: {BLACK}más d
 STR_1889    :{WINDOW_COLOUR_2}Tiempo averiado: {MOVE_X}{255}{BLACK}{COMMA16}%
 STR_1890    :{SMALLFONT}{BLACK}Selecciona con qué frecuencia un mecánico debe inspeccionar esta atracción
 STR_1891    :¡Ningún {STRINGID} en el parque todavía!
+STR_1892    :<removed string - do not use>
+STR_1893    :<removed string - do not use>
 STR_1894    :{WINDOW_COLOUR_2}{STRINGID} vendidos: {BLACK}{COMMA32}
 STR_1895    :{SMALLFONT}{BLACK}Construir nueva atracción
 STR_1896    :{WINDOW_COLOUR_2}Gastos/Ingresos
@@ -2307,6 +2319,10 @@ STR_2313    :{WINDOW_COLOUR_2}Nivel de náuseas: {BLACK}{COMMA2DP32} (aprox.)
 STR_2314    :{WINDOW_COLOUR_2}Longitud de vía: {BLACK}{STRINGID}
 STR_2315    :{WINDOW_COLOUR_2}Coste: {BLACK}alrededor de {CURRENCY}
 STR_2316    :{WINDOW_COLOUR_2}Espacio requerido: {BLACK}{COMMA16} x {COMMA16} bloques
+STR_2317    :<removed string - do not use>
+STR_2318    :<removed string - do not use>
+STR_2319    :<removed string - do not use>
+STR_2320    :<removed string - do not use>
 STR_2321    :{WINDOW_COLOUR_2}Número de atracciones: {BLACK}{COMMA16}
 STR_2322    :{WINDOW_COLOUR_2}Empleados: {BLACK}{COMMA16}
 STR_2323    :{WINDOW_COLOUR_2}Extensión del parque: {BLACK}{COMMA32}m{SQUARED}
@@ -2423,6 +2439,12 @@ STR_2433    :{BLACK}Cupones para {STRINGID} gratis
 STR_2434    :{BLACK}Campaña de publicidad de {STRINGID}
 STR_2435    :{BLACK}Campaña de publicidad de {STRINGID}
 STR_2436    :1 semana
+STR_2437    :<removed string - do not use>
+STR_2438    :<removed string - do not use>
+STR_2439    :<removed string - do not use>
+STR_2440    :<removed string - do not use>
+STR_2441    :<removed string - do not use>
+STR_2442    :<removed string - do not use>
 STR_2443    :{WINDOW_COLOUR_2}Coste por semana: {BLACK}{CURRENCY2DP}
 STR_2444    :{WINDOW_COLOUR_2}Coste total: {BLACK}{CURRENCY2DP}
 STR_2445    :Lanzar esta campaña de márketing
@@ -2662,6 +2684,8 @@ STR_2678    :???
 STR_2679    :???
 STR_2680    :Investigación Completa
 STR_2681    :{MEDIUMFONT}{BLACK}Incrementa tu dinero en {CURRENCY}
+STR_2682    :<removed string - do not use>
+STR_2683    :<removed string - do not use>
 STR_2684    :{SMALLFONT}{BLACK}Llega un gran grupo de visitantes
 STR_2685    :Simplex Noise Parameters
 STR_2686    :Bajo:
@@ -2721,7 +2745,7 @@ STR_2739    :Ninguna
 STR_2740    :RollerCoaster Tycoon 1
 STR_2741    :RollerCoaster Tycoon 2
 STR_2742    :css50.dat no encontrado
-STR_2743    :Copia data\css17.dat de tu instalación de RCT1 en data\css50.dat de tu instalación de RCT2, o asegúrate de que la carpeta de RCT1 en la sección "Otras Opciones" esté establecido correctamente.
+STR_2743    :Copia 'data/css17.dat' de tu instalación de RCT1 en 'data/css50.dat' de tu instalación de RCT2, o asegúrate de que la carpeta de RCT1 en la sección "Otras Opciones" esté establecido correctamente.
 STR_2744    :[
 STR_2745    :\
 STR_2746    :]
@@ -2740,7 +2764,10 @@ STR_2758    :Forzar tormenta
 STR_2759    :Zero Clearance
 # New strings used in the cheats window previously these were ???
 STR_2760    :+{CURRENCY}
+STR_2761    :<removed string - do not use>
+STR_2762    :<removed string - do not use>
 STR_2763    :???
+STR_2764    :<removed string - do not use>
 STR_2765    :Grupo de visitantes
 STR_2766    :Ganar escenario
 STR_2767    :Mantener clima
@@ -2946,6 +2973,8 @@ STR_2965    :{WINDOW_COLOUR_2}
 STR_2966    :
 STR_2967    :
 STR_2968    :
+STR_2969    :<removed string - do not use>
+STR_2970    :<removed string - do not use>
 STR_2971    :Esquema de color principal
 STR_2972    :Esquema de color alternativo 1
 STR_2973    :Esquema de color alternativo 2
@@ -3136,6 +3165,7 @@ STR_3157    :mapa
 STR_3158    :gráfica
 STR_3159    :lista
 STR_3160    :{SMALLFONT}{BLACK}Selecciona el número de circuitos por paseo.
+STR_3161    :<removed string - do not use>
 STR_3162    :No se puede asignar memoria suficiente
 STR_3163    :Instalar nuevo dato: 
 STR_3164    :{BLACK}{COMMA16} seleccionados (máximo {COMMA16})
@@ -3311,6 +3341,7 @@ STR_3333    :Exportar complementos al guardar el juego
 STR_3334    :{SMALLFONT}{BLACK}Selecciona si los complementos adicionales (datos no distribuídos con el juego principal) utilizados en un escenario deben exportarse al guardar el juego, lo que permite que otros jugadores que no tengan esos complementos puedan abrirlo.
 STR_3335    :Diseñador de Montañas Rusas - Selecciona el tipo de Atracción y Vehículo
 STR_3336    :Gestor de Diseños de vías - Elige tipo de atracción 
+STR_3337    :<removed string - do not use>
 STR_3338    :{BLACK}Recorrido personalizado
 STR_3339    :{BLACK}{COMMA16} diseño disponible, o recorrido personalizado
 STR_3340    :{BLACK}{COMMA16} diseños disponibles, o recorrido personalizado
@@ -3335,6 +3366,8 @@ STR_3358    :No se puede eliminar el diseño da vía...
 STR_3359    :{BLACK}Sin diseños de vías para esta atracción
 STR_3360    :¡Advertencia!
 STR_3361    :Demasiados diseños de vía - Algunos no se listarán.
+STR_3362    :<removed string - do not use>
+STR_3363    :<removed string - do not use>
 STR_3364    :Avanzado
 STR_3365    :{SMALLFONT}{BLACK}Permitir la selección de escenario además de grupos de escenarios.
 STR_3366    :{BLACK}= Atracción
@@ -3426,6 +3459,7 @@ STR_5120    :Finanzas
 STR_5121    :Investigación
 STR_5122    :Selecciona atracciones por tipo (como en RCT1)
 STR_5123    :Renueva atracciones
+STR_5124    :<removed string - do not use>
 STR_5125    :Todo editable
 STR_5126    :Música aleatoria
 STR_5127    :{SMALLFONT}{BLACK}Pintar el terreno en lugar de cambiar la elevación mientras se arrastra.
@@ -3725,7 +3759,7 @@ STR_5420    :Rotar{MOVE_X}{87}{COMMA16}
 STR_5421    :Enfocar
 STR_5422    :Enfocar{MOVE_X}{87}{COMMA16}
 STR_5423    :Esperar
-STR_5424    :Esperar{MOVE_X}{87}{COMMA16}
+STR_5424    :Esperar{MOVE_X}{87}{UINT16}
 STR_5425    :Reiniciar
 STR_5426    :Fin
 STR_5427    :Coordenadas:
@@ -3795,6 +3829,7 @@ STR_5490    :Silenciar al perder el foco
 STR_5491    :Lista de inventos
 STR_5492    :Opciones de escenario
 STR_5493    :Enviar mensaje
+STR_5494    :<removed string - do not use>
 STR_5495    :Lista de jugadores
 STR_5496    :Jugador:
 STR_5497    :Ping:
@@ -4129,6 +4164,7 @@ STR_5856    :{SMALLFONT}{BLACK}Establece la resolución del juego usada en el mo
 STR_5857    :{SMALLFONT}{BLACK}Opciones del juego
 STR_5858    :{SMALLFONT}{BLACK}Utilizar el GPU para la visualización en lugar del CPU. Esto mejora la compatibilidad con el software para la captura de pantalla. Esto puede disminuir ligeramente el rendimiento del juego.
 STR_5859    :{SMALLFONT}{BLACK}Permite la interpolación de{NEWLINE}los FPS (Fotograma por segundo) para un juego visualmente más suave. Si se encuentra desactivado el juego funcionará a 40 FPS como máximo.
+STR_5860    :Cambiar dibujado vía orig./decomp.
 STR_5861    :Error en la comprobación de la clave.
 STR_5862    :Bloquear jugadores desconocidos.
 STR_5863    :{SMALLFONT}{BLACK}Sólo se permite unirse a jugadores con claves conocidas.
@@ -4302,6 +4338,7 @@ STR_6030    :{SMALLFONT}{BLACK}Selector de Escenario. Haz clic en cualquier esce
 STR_6031    :Descripción Servidor:
 STR_6032    :Msg. de Bienvenida:
 STR_6033    :Ruta de Instalación RCT1:
+STR_6034    :{SMALLFONT}{BLACK}{STRING}
 STR_6035    :Por favor selecciona la carpeta de RCT1
 STR_6036    :{SMALLFONT}{BLACK}Borrar
 STR_6037    :Por favor selecciona una carpeta válida con una instalación de RCT1
@@ -4322,6 +4359,52 @@ STR_6051    :El ancho y la altura deben ser la misma.
 STR_6052    :El mapa de altura es muy grande, será cortado.
 STR_6053    :El mapa de altura no puede ser normalizado.
 STR_6054    :Sólo bitmaps de 24-bits son soportados
+STR_6055    :Mapa de altura de OpenRCT2
+STR_6056    :{SMALLFONT}{BLACK}Silenciar
+STR_6057    :{SMALLFONT}{BLACK}Mostrar un botón separado para la Opción "Silenciar" en la barra de herramientas.
+STR_6058    :Silenciar
+STR_6059    :{RIGHTGUILLEMET}
+STR_6060    :Mostrar compras de visitantes con animación
+STR_6061    :{SMALLFONT}{BLACK}Mostrar un efecto animado de dinero{NEWLINE}cuando los visitantes realizan compras.
+STR_6062    :{OUTLINE}{GREEN}+ {CURRENCY2DP}
+STR_6063    :{OUTLINE}{RED}- {CURRENCY2DP}
+STR_6064    :Adquirir todo el mapa
+STR_6065    :Registrar acciones de usuario.
+STR_6066    :{SMALLFONT}{BLACK}Registrar todas las acciones de los usuarios en archivos en tu directorio de usuario.
+STR_6067    :Servidor iniciado.
+STR_6068    :Servidor apagado.
+STR_6069    :{STRING} fue expulsado del servidor por {STRING}.
+STR_6070    :{STRING} fue establecido en el grupo '{STRING}' por {STRING}.
+STR_6071    :{STRING} creó un nuevo grupo '{STRING}'.
+STR_6072    :{STRING} eliminó el grupo '{String}'.
+STR_6073    :{STRING} editó los permisos del grupo '{String}'.
+STR_6074    :{STRING} cambió el nombre del grupo de '{String}' a '{String}'.
+STR_6075    :{STRING} cambió el grupo por defecto a '{String}'.
+STR_6076    :{STRING} usó/alternó el truco '{STRING}'.
+STR_6077    :Añadir Dinero
+STR_6078    :{STRING} creó la atracción '{STRING}'.
+STR_6079    :{STRING} demolió la atracción '{STRING}'.
+STR_6080    :{STRING} cambió la apariencia de la atracción '{STRING}'.
+STR_6081    :{STRING} cambió el estado de la atracción '{STRING}' a cerrado.
+STR_6082    :{STRING} cambió el estado de la atracción '{STRING}' a abierto.
+STR_6083    :{STRING} cambió el estado de la atracción '{STRING}' a en prueba.
+STR_6084    :{STRING} cambió la configuración de vehículo de la atracción '{STRING}'.
+STR_6085    :{STRING} cambió la configuración de atracción de la atracción '{STRING}'.
+STR_6086    :{STRING} renombró la atracción '{STRING}' a '{STRING}'.
+STR_6087    :{STRING} cambió el costo de la atracción '{STRING}' a {STRING}
+STR_6088    :{STRING} cambió el costo secundario de la atracción '{STRING}' a {STRING}
+STR_6089    :{STRING} renombró el parque de '{STRING}' a '{STRING}'.
+STR_6090    :{STRING} abrió el parque.
+STR_6091    :{STRING} cerró el parque.
+STR_6092    :{STRING} changed the park entrance fee to {STRING}
+STR_6093    :{STRING} colocó un nuevo escenario.
+STR_6094    :{STRING} removió escenario.
+STR_6095    :{STRING} editó escenario.
+STR_6096    :{STRING} estableció el nombre del letrero a '{STRING}'.
+STR_6097    :{STRING} colocó una pieza de vía de la atracción '{STRING}'.
+STR_6098    :{STRING} removió una pieza de la atracción.
+STR_6099    :Te has conectado al servidor.
+STR_6100    :Te has desconectado del servidor.
 
 ##############
 # Escenarios #

data/language/fi-FI.txt

@@ -3172,7 +3172,7 @@ STR_3156    :
 STR_3157    :kartta
 STR_3158    :graph
 STR_3159    :lista
-
+STR_3160    :{SMALLFONT}{BLACK}Select the number of circuits per ride
 STR_3161    :<not used anymore>
 STR_3162    :Unable to allocate enough memory
 STR_3163    :Installing new data: 
@@ -3766,7 +3766,7 @@ STR_5420    :Käännä{MOVE_X}{87}{COMMA16}
 STR_5421    :Zoom
 STR_5422    :Zoom{MOVE_X}{87}{COMMA16}
 STR_5423    :Odota
-STR_5424    :Odota{MOVE_X}{87}{COMMA16}
+STR_5424    :Odota{MOVE_X}{87}{UINT16}
 STR_5425    :Uudelleen käynnistä
 STR_5426    :Lopeta
 STR_5427    :Koordinaatit:

data/language/fr-FR.txt

@@ -2749,7 +2749,7 @@ STR_2739    :Aucun
 STR_2740    :RollerCoaster Tycoon 1
 STR_2741    :RollerCoaster Tycoon 2
 STR_2742    :css50.dat introuvable
-STR_2743    :Copiez data\css17.dat depuis votre installation de RCT1 en data\css50.dat dans celui de RCT2, ou vérifiez que le chemin vers l'installation de RCT1 dans les options diverses est défini correctement.
+STR_2743    :Copiez 'data/css17.dat' depuis votre installation de RCT1 en 'data/css50.dat' dans celui de RCT2, ou vérifiez que le chemin vers l'installation de RCT1 dans les options diverses est défini correctement.
 STR_2744    :[
 STR_2745    :\
 STR_2746    :]
@@ -3763,7 +3763,7 @@ STR_5420    :Tourner{MOVE_X}{87}{COMMA16}
 STR_5421    :Zoomer
 STR_5422    :Zoomer{MOVE_X}{87}{COMMA16}
 STR_5423    :Attendre
-STR_5424    :Attendre{MOVE_X}{87}{COMMA16}
+STR_5424    :Attendre{MOVE_X}{87}{UINT16}
 STR_5425    :Redémarrer
 STR_5426    :Fin
 STR_5427    :Coordonnées :
@@ -4343,6 +4343,7 @@ STR_6030    :{SMALLFONT}{BLACK}Sélectionneur de décor. Cliquez sur un décor s
 STR_6031    :Description du serveur:
 STR_6032    :Message de bienvenue du serveur:
 STR_6033    :Chemin vers l'installation de RCT1:
+STR_6034    :{SMALLFONT}{BLACK}{STRING}
 STR_6035    :Veuillez choisir votre installation de RCT1
 STR_6036    :{SMALLFONT}{BLACK}Vider
 STR_6037    :Veuillez choisir une installation valide de RCT1
@@ -4350,6 +4351,65 @@ STR_6038    :{SMALLFONT}{BLACK}Si vous avez une installation de RCT1, définisse
 STR_6039    :{SMALLFONT}{BLACK}Démolir le manège rapidement.
 STR_6040    :Modifier les options de scénario. 
 STR_6041    :{BLACK}Pas de mécanicien à embaucher !
+STR_6042    :Charger champ de hauteur
+STR_6043    :Sélectionner champ de hauteur
+STR_6044    :Lisser champ de hauteur
+STR_6045    :Force
+STR_6046    :Normaliser le champ de hauteur
+STR_6047    :Lisser les cases
+STR_6048    :Erreur champ de hauteur
+STR_6049    :Erreur lors du chargement du PNG
+STR_6050    :Erreur lors du chargement du bitmap
+STR_6051    :La largeur et la hauteur doivent correspondre
+STR_6052    :Ce champ de hauteur est trop grand, et sera coupé
+STR_6053    :Ce champ de hauteur ne peut pas être normalisé
+STR_6054    :Seuls les bitmaps 24 bits sont supportés
+STR_6055    :Fichier Champ de hauteur OpenRCT2
+STR_6056    :{SMALLFONT}{BLACK}Muet
+STR_6057    :{SMALLFONT}{BLACK}Afficher un bouton séparer dans la barre d'outils pour la fonction Muet
+STR_6058    :Muet
+STR_6059    :{RIGHTGUILLEMET}
+STR_6060    :Afficher des animations d'achats des visiteurs
+STR_6061    :{SMALLFONT}{BLACK}Affiche un effet d'argent animé{NEWLINE}quand les visiteurs font des achats.
+STR_6062    :{OUTLINE}{GREEN}+ {CURRENCY2DP}
+STR_6063    :{OUTLINE}{RED}- {CURRENCY2DP}
+STR_6064    :Posséder tout le terrain
+STR_6065    :Journaliser les actions utilisateurs
+STR_6066    :{SMALLFONT}{BLACK}Journalise toutes les actions utilisateurs dans votre répertoire utilisateur.
+STR_6067    :Serveur démarré.
+STR_6068    :Serveur arrêté.
+STR_6069    :{STRING} a été expulsé(e) du serveur par {STRING}.
+STR_6070    :{STRING} fait maintenant parti(e) du groupe '{STRING}' par {STRING}.
+STR_6071    :{STRING} a créée le groupe de joueurs '{STRING}'.
+STR_6072    :{STRING} a supprimé le groupe de joueurs '{STRING}'.
+STR_6073    :{STRING} a changé les permissions du groupe de joueurs '{STRING}'.
+STR_6074    :{STRING} a changé le nom du groupe de joueurs '{STRING}' en '{STRING}'.
+STR_6075    :{STRING} a changé le groupe de joueurs par défaut à '{STRING}'.
+STR_6076    :{STRING} a utilisé/activé ou désactivé la triche '{STRING}'.
+STR_6077    :Ajouter argent
+STR_6078    :{STRING} a créée l'attraction '{STRING}'.
+STR_6079    :{STRING} a détruit l'attraction '{STRING}'.
+STR_6080    :{STRING} a changé l'apparence de l'attraction '{STRING}'.
+STR_6081    :{STRING} a fermé l'attraction '{STRING}'.
+STR_6082    :{STRING} a ouvert l'attraction '{STRING}' au public.
+STR_6083    :{STRING} a ouvert l'attraction '{STRING}' pour les tests.
+STR_6084    :{STRING} a changé les paramètres des véhicules de l'attraction '{STRING}'.
+STR_6085    :{STRING} a changé les paramètres de l'attraction '{STRING}'.
+STR_6086    :{STRING} a renommé l'attraction '{STRING}' à '{STRING}'.
+STR_6087    :{STRING} a changé le prix de l'attraction '{STRING}' à {STRING}
+STR_6088    :{STRING} a changé le prix secondaire de l'attraction '{STRING}' à {STRING}
+STR_6089    :{STRING} a renommé le park de '{STRING}' vers '{STRING}'.
+STR_6090    :{STRING} a ouvert le parc.
+STR_6091    :{STRING} a fermé le parc.
+STR_6092    :{STRING} a changé le prix du parc à {STRING}
+STR_6093    :{STRING} a placé du nouveau décor.
+STR_6094    :{STRING} a détruit du décor.
+STR_6095    :{STRING} a changé le décor.
+STR_6096    :{STRING} a définit le texte d'un panneau à '{STRING}'.
+STR_6097    :{STRING} a placé une pièce pour l'attraction '{STRING}'.
+STR_6098    :{STRING} a détruit une pièce d'attraction.
+STR_6099    :Vous êtes connecté(e) au serveur.
+STR_6100    :Vous êtes déconnecté(e) du serveur.
 
 #############
 # Scenarios #

data/language/it-IT.txt

@@ -1,4 +1,4 @@
-# STR_XXXX part is read and XXXX becomes the string id number.
+# STR_XXXX part is read and XXXX becomes the string id number.
 # Everything after the colon and before the new line will be saved as the string.
 # Use # at the beginning of a line to leave a comment.
 STR_0000    :
@@ -14,7 +14,7 @@ STR_0009    :Mini-attrazione sospesa
 STR_0010    :Noleggio barche
 STR_0011    :Topo tutto matto
 STR_0012    :Corsa ad ostacoli
-STR_0013    :Attrazione su carrozza
+STR_0013    :Corsa in auto
 STR_0014    :Caduta libera con lancio
 STR_0015    :Ottovolante su bob
 STR_0016    :Torre d'osservazione
@@ -59,9 +59,9 @@ STR_0054    :Ottovolante di legno
 STR_0055    :Ottov. a frizione laterale
 STR_0056    :Topo tutto matto
 STR_0057    :Ottov. multi-dimensionale
-STR_0058    :Unknown Ride (38)
+STR_0058    :Attrazione sconosciuta (38)
 STR_0059    :Ottovolante aereo invertito
-STR_0060    :Unknown Ride (3A)
+STR_0060    :Attrazione sconosciuta (3A)
 STR_0061    :Virginia Reel
 STR_0062    :Barche con lo schizzo
 STR_0063    :Mini-elicotteri
@@ -75,7 +75,7 @@ STR_0070    :Giga Coaster
 STR_0071    :Roto-Drop
 STR_0072    :Flying Saucers
 STR_0073    :Casa distorta
-STR_0074    :Monorail Cycles
+STR_0074    :Biciclette su monorotaia
 STR_0075    :Ottovolante invertito compatto
 STR_0076    :Attrazione acquatica
 STR_0077    :Ottovolante verticale ad aria
@@ -526,83 +526,83 @@ STR_0521    :Un ottovolante veloce e snodato con curve strette e discese ripide.
 STR_0522    :Un piccolo ottovolante dove i passeggeri siedono sopra al percorso senza un vagone attorno
 STR_0523    :I passeggeri viaggiano lentamente su veicoli elettrici lungo un percorso basato su un circuito
 STR_0524    :I carrelli sono lanciati pneumaticamente su un'alta torre di acciaio e poi sono lasciati cadere liberamente
-STR_0525    :Riders career down a twisting track guided only by the curvature and banking of the semi-circular track
+STR_0525    :I passeggeri viaggiano lungo un percorso tortuoso, guidati soltanto dalle curvature e dalle inclinazioni del tracciato semi-circolare
 STR_0526    :I passeggeri viaggiano in una cabina di osservazione rotante mentre salgono su un'alta torre
 STR_0527    :Un rapido ottovolante d'acciaio caratterizzato da cadute verticali
-STR_0528    :Riders travel in inflatable dinghies down a twisting semi-circular or completely enclosed tube track
+STR_0528    :I passeggeri viaggiano su canotti gonfiabili lungo un tortuoso percorso a forma di tubo, dalla sezione completamente chiusa o semi-circolare
 STR_0529    :Il treno della miniera è una montagna russa a tema fatta in acciaio realizzata per ricordare una vecchia ferrovia
 STR_0530    :Le carrozze pendono da un cavo d'acciaio che fa avanti e indietro per tutto il tracciato
-STR_0531    :A compact steel-tracked roller coaster where the train travels through corkscrews and loops
+STR_0531    :Un ottovolante compatto su un tracciato d'acciaio nel quale i treni viaggiano lungo avvitamenti e inversioni
-STR_0532    :
+STR_0532    :Il labirinto è costituito da siepi o muri alti due metri, e al suo interno i visitatori cercano la via d'uscita
-STR_0533    :
+STR_0533    :Un edificio di legno con una scala interna e uno scivolo a spirale esterno, da discendere utilizzando appositi tappetini
-STR_0534    :Go-kart guidati con motore a benzina
+STR_0534    :Go-kart a motore a benzina guidati dai visitatori
 STR_0535    :Delle barche a forma di tronchi viaggiano lungo un canale d'acqua, schizzando i passeggeri mentre volano giù per ripide discese
 STR_0536    :Delle barche rotonde scorrono lungo un largo canale d'acqua, schizzando attraverso cascate e spaventando i passeggeri con delle rapide schiumose
-STR_0537    :
+STR_0537    :Autoscontri con veicoli guidabili
-STR_0538    :
+STR_0538    :Nave dei pirati grande
-STR_0539    :
+STR_0539    :La nave è appesa a un braccio dotato di un contrappeso al lato opposto, e oscilla in un intero giro a 360 gradi
-STR_0540    :
+STR_0540    :Un chiosco presso il quale i visitatori acquistano cibo
-STR_0541    :
+STR_0541    :<removed string - do not use>
-STR_0542    :
+STR_0542    :Un chiosco presso il quale i visitatori acquistano bevande
-STR_0543    :
+STR_0543    :<removed string - do not use>
-STR_0544    :
+STR_0544    :Un chiosco che vende souvenir
-STR_0545    :
+STR_0545    :Una tradizionale giostra, con cavalli di legno scolpiti a mano
-STR_0546    :
+STR_0546    :<removed string - do not use>
-STR_0547    :
+STR_0547    :Un chiosco presso il quale i visitatori acquisiscono mappe del parco e ombrelli
-STR_0548    :
+STR_0548    :Un bagno pubblico
-STR_0549    :
+STR_0549    :Una grande ruota con sedili aperti
-STR_0550    :
+STR_0550    :I visitatori guardano un film all'interno del simulatore, il quale si muove e ruota tramite un braccio idraulico
-STR_0551    :
+STR_0551    :Un cinema che proietta film in 3D all'interno di un edificio a forma di globo
-STR_0552    :
+STR_0552    :I passeggeri si trovano su una imbarcazione appesa a grandi bracci rotanti, che la muovono avanti e indietro, e a testa in giù
-STR_0553    :
+STR_0553    :Anelli che ruotano su tutti gli assi permettono ai passeggeri di roteare in ogni direzione
 STR_0554    :La carrozza acquista velocità a partire dalla stazione attraverso un lungo tratto pianeggiante grazie a dei motori a induzione lineare, quindi percorre una salita ripida per poi scendere in caduta libera e tornare alla stazione
 STR_0555    :Gli ospiti della attrazione usano l'ascensore su una torre verticale per andare da un livello all'altro
-STR_0556    :Extra-wide cars descend completely vertical sloped track for the ultimate freefall roller coaster experience
+STR_0556    :Carrelli molto larghi discendono lungo un percorso completamente verticale, per far vivere un'incredibile esperienza di caduta libera
-STR_0557    :
+STR_0557    :Un Bancomat che permette ai visitatori al verde di prelevare ulteriore denaro
-STR_0558    :
+STR_0558    :Coppie di passeggeri su sedili doppi ruotano lungo le estremità di tre lunghi bracci rotanti
-STR_0559    :
+STR_0559    :Un largo edificio tematizzato che contiene corridoi paurosi e stanze spaventose
-STR_0560    :
+STR_0560    :Un posto nel quale i visitatori nauseati possono guarire più velocemente
-STR_0561    :
+STR_0561    :Spettacolo circense di animali all'interno di un tendone
-STR_0562    :Powered cars travel along a multi-level track past spooky scenery and special effects
+STR_0562    :Carrelli a motore viaggiano lungo un tracciato su più livelli attraversando scenari spaventosi ed effetti speciali
-STR_0563    :Seduti comodamente - il solo limite è che si può effettuare un solo giro alla volta - i passeggeri sperimentano dolci discese e numerose curve, sperimentando una piacevole sensazione di assenza di peso
+STR_0563    :Seduti comodamente - il solo limite è che si può effettuare un solo giro alla volta - i passeggeri sperimentano dolci discese e numerose curve, provando una piacevole sensazione di assenza di peso
 STR_0564    :Quest'attrazione, in cui si viaggia lungo un tracciato di legno, è veloce, ricca di imprevisti, rumorosa e dà al passeggero la sensazione di essere senza controllo, oltre che quella di una grande libertà
 STR_0565    :Un semplice ottovolante di legno, adatto solo a curve e declivi  lenti, in cui le carrozze sono tenute in pista solo dalla frizione delle ruote sui i bordi della pista e dalla gravità
 STR_0566    :Carrozze individuali sfrecciano per uno stretto percorso a zig-zag con curve molto strette e corte e ripide discese
 STR_0567    :Seduti su sedili sospesi a entrambi i lati del tracciato, i passeggeri vengono capovolti mentre si tuffano per rapide discese e sperimentano numerose inversioni 
-STR_0568    :
+STR_0568    :<removed string - do not use>
 STR_0569    :I passeggeri, cinti da speciali imbracature al di sotto il tracciato, sperimentano la sensazione del volo quando vengono fatti oscillare nell'aria
-STR_0570    :
+STR_0570    :<removed string - do not use>
-STR_0571    :Circular cars spin around as they travel along the zig-zagging wooden track
+STR_0571    :Carrelli circolari ruotano su sé stessi mentre viaggiano lungo il percorso di legno a zig-zag
-STR_0572    :Large capacity boats travel along a wide water channel, propelled up slopes by a conveyer belt, accelerating down steep slopes to soak the riders with a gaint splash
+STR_0572    :Barche molto capienti viaggiano lungo un ampio canale d'acqua, trasportate in salita da una catena e lasciate accelerare lungo rapide discese in modo da bagnare i passeggeri con un grande spruzzo
-STR_0573    :Powered helicoper shaped cars running on a steel track, controlled by the pedalling of the riders
+STR_0573    :Carrelli a motore a forma di elicottero viaggiano lungo un percorso di acciaio, controllati dai pedali dei passeggeri
-STR_0574    :Riders are held in special harnesses in a lying-down position, travlling through twisted track and inversions either on their backs or facing the ground
+STR_0574    :I passeggeri, mantenuti orizzontali tramite uno speciale sistema di ritenuta, viaggiano lungo un tracciato tortuoso e numerose inversioni, sia supini che rivolti verso il terreno
 STR_0575    :Dei treni elettrici sospesi sotto una singola rotaia trasportano i passeggeri per tutto il parco
-STR_0576    :
+STR_0576    :<removed string - do not use>
-STR_0577    :Bogied cars run on wooden tracks, turning around on special reversing sections
+STR_0577    :Carrelli corrono lungo tracciati di legno, ruotando su sé stessi in speciali sezioni di inversione
 STR_0578    :Le carrozze corrono per il tracciato caratterizzato da vari giri,  ripide discese e curve ondulanti
-STR_0579    :
+STR_0579    :Un tranquillo gioco di golf in miniatura
-STR_0580    :A giant steel roller coaster capable of smooth drops and hills of over 300ft
+STR_0580    :Un gigante ottovolante di acciaio in grado di offrire morbide cadute e risalite a più di 90 metri di altezza
 STR_0581    :Un anello di sedie è posizionato in cima alla torre mentre ruota piano, quindi precipita fermandosi gentilmente alla base tramite freni magnetici
-STR_0582    :
+STR_0582    :Veicoli galleggianti liberamente guidabili
-STR_0583    :
+STR_0583    :Un edificio contenente stanze distorte e corridoi ad angolo che disorientano i visitatori che vi camminano all'interno
-STR_0584    :Special bicycles run on a steel monorail track, propelled by the pedalling of the riders
+STR_0584    :Speciali biciclette viaggiano lungo un percorso a monorotaia di acciaio, spinte soltanto dalle pedalate dei passeggeri
-STR_0585    :Riders sit in pairs of seats suspended beneath the track as they loop and twist through tight inversions
+STR_0585    :I passeggeri viaggiano su coppie di sedili sospesi sotto al percorso, mentre viaggiano attraverso numerose inversioni e inclinazioni
 STR_0586    :Carrozze a forma di barca viaggiano lungo l'ottovolante, caratterizzato da ripide discese, curve avvitate e tuffi in sezioni acquatiche più tranquille.
-STR_0587    :After an exhilarating air-powered launch, the train speeds up a vertical track, over the top, and vertically down the other side to return to the station
+STR_0587    :Dopo un euforico lancio ad aria compressa il treno sale lungo un tracciato verticale, fino alla vetta della collina, e poi giù in verticale dal lato opposto per far ritorno alla stazione
-STR_0588    :Individual cars run beneath a zig-zagging track with hairpin turns and sharp drops
+STR_0588    :Carrozze singole corrono sotto a un percorso a zig-zag ricco di tornanti e cadute ripide
-STR_0589    :
+STR_0589    :Una grande carrozza a forma di tappeto volante si muove su e giù su quattro bracci
 STR_0590    :I visitatori viaggiano in un sottomarino attraverso un percorso subacqueo
-STR_0591    :Raft-shaped boats gently meander around a river track
+STR_0591    :Imbarcazioni a forma di zattera serpeggiano lungo un percorso a fiume
-STR_0592    :
+STR_0592    :<removed string - do not use>
-STR_0593    :
+STR_0593    :Una ruota con navicelle che inizia a girare e successivamente si piega tramite un braccio di supporto
-STR_0594    :
+STR_0594    :<removed string - do not use>
-STR_0595    :
+STR_0595    :<removed string - do not use>
-STR_0596    :
+STR_0596    :<removed string - do not use>
-STR_0597    :
+STR_0597    :<removed string - do not use>
-STR_0598    :Inverted roller coaster trains are accelerated out of the station to travel up a vertical spike of track, then reverse back through the station to travel backwards up another vertical spike of track
+STR_0598    :Treni dell'ottovolante invertito accelerano dalla stazione lungo un tratto in salita, per poi tornare indietro, attraversare la stazione e salire su un altro tratto di percorso
 STR_0599    :Un ottovolante compatto con carrozze individuali e rapide curve in discesa
 STR_0600    :I treni della miniera motorizzati scorrono lungo un percorso fluido e pieno di curve
-STR_0601    :
+STR_0601    :<removed string - do not use>
 STR_0602    :I treni dell'ottovolante sono spinti fuori dalla stazione tramite motori a induzione lineare per correre lungo avvitamenti e inversioni
 STR_0603    :Visitatore {INT32}
 STR_0604    :Visitatore {INT32}
@@ -947,7 +947,7 @@ STR_0941    :Nascondi pareti verticali
 STR_0942    :Attrazioni trasparenti
 STR_0943    :Scenario trasparente
 STR_0944    :Salva
-STR_0945    :Non salv.
+STR_0945    :Non salvare
 STR_0946    :Annulla
 STR_0947    :Salvare prima di caricare?
 STR_0948    :Salvare prima di uscire?
@@ -1521,32 +1521,32 @@ STR_1514    :{SMALLFONT}{OPENQUOTES}Bello scenario!{ENDQUOTES}
 STR_1515    :{SMALLFONT}{OPENQUOTES}Questo parco è davvero pulito e ordinato{ENDQUOTES}
 STR_1516    :{SMALLFONT}{OPENQUOTES}Le fontane zampillanti sono fantastiche{ENDQUOTES}
 STR_1517    :{SMALLFONT}{OPENQUOTES}La musica qui è gradevole{ENDQUOTES}
-STR_1518    :{SMALLFONT}{OPENQUOTES}Questo palloncino comprato da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1518    :{SMALLFONT}{OPENQUOTES}Questo palloncino comprato da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1519    :{SMALLFONT}{OPENQUOTES}Questo peluche comprato da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1519    :{SMALLFONT}{OPENQUOTES}Questo peluche comprato da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1520    :{SMALLFONT}{OPENQUOTES}Questa mappa del parco comprata da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1520    :{SMALLFONT}{OPENQUOTES}Questa mappa del parco comprata da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1521    :{SMALLFONT}{OPENQUOTES}Questa foto-in-corsa comprata da  {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1521    :{SMALLFONT}{OPENQUOTES}Questa foto-in-corsa comprata da  {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1522    :{SMALLFONT}{OPENQUOTES}Quest'ombrello comprato da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1522    :{SMALLFONT}{OPENQUOTES}Quest'ombrello comprato da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1523    :{SMALLFONT}{OPENQUOTES}Questa bevanda comprata da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1523    :{SMALLFONT}{OPENQUOTES}Questa bevanda comprata da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1524    :{SMALLFONT}{OPENQUOTES}Questo panino comprato da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1524    :{SMALLFONT}{OPENQUOTES}Questo panino comprato da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1525    :{SMALLFONT}{OPENQUOTES}Queste patatine comprate da {STRINGID} valgono quanto costa{ENDQUOTES}
+STR_1525    :{SMALLFONT}{OPENQUOTES}Queste patatine comprate da {STRINGID} costano davvero poco{ENDQUOTES}
-STR_1526    :{SMALLFONT}{OPENQUOTES}Questo gelato comprato da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1526    :{SMALLFONT}{OPENQUOTES}Questo gelato comprato da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1527    :{SMALLFONT}{OPENQUOTES}Questo zucchero filato comprato da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1527    :{SMALLFONT}{OPENQUOTES}Questo zucchero filato comprato da {STRINGID} costa davvero poco{ENDQUOTES}
 STR_1528    :
 STR_1529    :
 STR_1530    :
-STR_1531    :{SMALLFONT}{OPENQUOTES}Questa pizza comprata da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1531    :{SMALLFONT}{OPENQUOTES}Questa pizza comprata da {STRINGID} costa davvero poco{ENDQUOTES}
 STR_1532    :
-STR_1533    :{SMALLFONT}{OPENQUOTES}Questi pop-corn comprati da {STRINGID} valgono quanto costa{ENDQUOTES}
+STR_1533    :{SMALLFONT}{OPENQUOTES}Questi pop-corn comprati da {STRINGID} costano davvero poco{ENDQUOTES}
-STR_1534    :{SMALLFONT}{OPENQUOTES}Questo hot dog comprato da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1534    :{SMALLFONT}{OPENQUOTES}Questo hot dog comprato da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1535    :{SMALLFONT}{OPENQUOTES}Questo tentacolo comprato da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1535    :{SMALLFONT}{OPENQUOTES}Questo tentacolo comprato da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1536    :{SMALLFONT}{OPENQUOTES}Questo cappellino comprato da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1536    :{SMALLFONT}{OPENQUOTES}Questo cappellino comprato da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1537    :{SMALLFONT}{OPENQUOTES}Questa mela caramellata comprata da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1537    :{SMALLFONT}{OPENQUOTES}Questa mela caramellata comprata da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1538    :{SMALLFONT}{OPENQUOTES}Questa maglietta comprata da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1538    :{SMALLFONT}{OPENQUOTES}Questa maglietta comprata da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1539    :{SMALLFONT}{OPENQUOTES}Questa ciambella comprata da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1539    :{SMALLFONT}{OPENQUOTES}Questa ciambella comprata da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1540    :{SMALLFONT}{OPENQUOTES}Questo caffè comprato da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1540    :{SMALLFONT}{OPENQUOTES}Questo caffè comprato da {STRINGID} costa davvero poco{ENDQUOTES}
 STR_1541    :
-STR_1542    :{SMALLFONT}{OPENQUOTES}Questo pollo fritto comprato da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1542    :{SMALLFONT}{OPENQUOTES}Questo pollo fritto comprato da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1543    :{SMALLFONT}{OPENQUOTES}Questa limonata comprata da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1543    :{SMALLFONT}{OPENQUOTES}Questa limonata comprata da {STRINGID} costa davvero poco{ENDQUOTES}
 STR_1544    :
 STR_1545    :
 STR_1546    :
@@ -1555,59 +1555,59 @@ STR_1548    :
 STR_1549    :
 STR_1550    :{SMALLFONT}{OPENQUOTES}Wow!{ENDQUOTES}
 STR_1551    :{SMALLFONT}{OPENQUOTES}Ho la strana sensazione che qualcuno mi stia osservando{ENDQUOTES}
-STR_1552    :{SMALLFONT}{OPENQUOTES}Non pagherò quella cifra per un palloncino da {STRINGID}{ENDQUOTES}
+STR_1552    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto un palloncino da {STRINGID}{ENDQUOTES}
-STR_1553    :{SMALLFONT}{OPENQUOTES}Non pagherò quella cifra per un peluche da {STRINGID}{ENDQUOTES}
+STR_1553    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto un peluche da {STRINGID}{ENDQUOTES}
-STR_1554    :{SMALLFONT}{OPENQUOTES}Non pagherò quella cifra per una mappa del parco da {STRINGID}{ENDQUOTES}
+STR_1554    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto una mappa del parco da {STRINGID}{ENDQUOTES}
-STR_1555    :{SMALLFONT}{OPENQUOTES}Non pagherò quella cifra per una foto-in-corsa da {STRINGID}{ENDQUOTES}
+STR_1555    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto una foto-in-corsa da {STRINGID}{ENDQUOTES}
-STR_1556    :{SMALLFONT}{OPENQUOTES}Non pagherò quella cifra per un ombrello da {STRINGID}{ENDQUOTES}
+STR_1556    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto un ombrello da {STRINGID}{ENDQUOTES}
-STR_1557    :{SMALLFONT}{OPENQUOTES}Non pagherò quella cifra per una bevanda da {STRINGID}{ENDQUOTES}
+STR_1557    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto una bevanda da {STRINGID}{ENDQUOTES}
-STR_1558    :{SMALLFONT}{OPENQUOTES}Non pagherò quella cifra per un panino da {STRINGID}{ENDQUOTES}
+STR_1558    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto un panino da {STRINGID}{ENDQUOTES}
-STR_1559    :{SMALLFONT}{OPENQUOTES}Non pagherò quella cifra per delle patatine da {STRINGID}{ENDQUOTES}
+STR_1559    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto delle patatine da {STRINGID}{ENDQUOTES}
-STR_1560    :{SMALLFONT}{OPENQUOTES}Non pagherò quella cifra per un gelato da {STRINGID}{ENDQUOTES}
+STR_1560    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto un gelato da {STRINGID}{ENDQUOTES}
-STR_1561    :{SMALLFONT}{OPENQUOTES}Non pagherò quella cifra per dello zucchero filato da {STRINGID}{ENDQUOTES}
+STR_1561    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto dello zucchero filato da {STRINGID}{ENDQUOTES}
 STR_1562    :
 STR_1563    :
 STR_1564    :
-STR_1565    :{SMALLFONT}{OPENQUOTES}Non pagherò quella cifra per una pizza da {STRINGID}{ENDQUOTES}
+STR_1565    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto per una pizza da {STRINGID}{ENDQUOTES}
 STR_1566    :
-STR_1567    :{SMALLFONT}{OPENQUOTES}Non pagherò quella cifra per dei pop-corn da {STRINGID}{ENDQUOTES}
+STR_1567    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto dei pop-corn da {STRINGID}{ENDQUOTES}
-STR_1568    :{SMALLFONT}{OPENQUOTES}Non pagherò quella cifra per un hot dog da {STRINGID}{ENDQUOTES}
+STR_1568    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto un hot dog da {STRINGID}{ENDQUOTES}
-STR_1569    :{SMALLFONT}{OPENQUOTES}Non pagherò quella cifra per un tentacolo da {STRINGID}{ENDQUOTES}
+STR_1569    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto un tentacolo da {STRINGID}{ENDQUOTES}
-STR_1570    :{SMALLFONT}{OPENQUOTES}Non pagherò quella cifra per un cappellino da {STRINGID}{ENDQUOTES}
+STR_1570    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto un cappellino da {STRINGID}{ENDQUOTES}
-STR_1571    :{SMALLFONT}{OPENQUOTES}Non pagherò quella cifra per una mela caramellata da {STRINGID}{ENDQUOTES}
+STR_1571    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto una mela caramellata da {STRINGID}{ENDQUOTES}
-STR_1572    :{SMALLFONT}{OPENQUOTES}Non pagherò quella cifra per una maglietta da {STRINGID}{ENDQUOTES}
+STR_1572    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto una maglietta da {STRINGID}{ENDQUOTES}
-STR_1573    :{SMALLFONT}{OPENQUOTES}Non pagherò quella cifra per una ciambella da {STRINGID}{ENDQUOTES}
+STR_1573    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto una ciambella da {STRINGID}{ENDQUOTES}
-STR_1574    :{SMALLFONT}{OPENQUOTES}Non pagherò quella cifra per un caffè da {STRINGID}{ENDQUOTES}
+STR_1574    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto un caffè da {STRINGID}{ENDQUOTES}
 STR_1575    :
-STR_1576    :{SMALLFONT}{OPENQUOTES}Non pagherò quella cifra per del pollo fritto da {STRINGID}{ENDQUOTES}
+STR_1576    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto del pollo fritto da {STRINGID}{ENDQUOTES}
-STR_1577    :{SMALLFONT}{OPENQUOTES}Non pagherò quella cifra per della limonata da {STRINGID}{ENDQUOTES}
+STR_1577    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto della limonata da {STRINGID}{ENDQUOTES}
 STR_1578    :
 STR_1579    :
 STR_1580    :
 STR_1581    :
 STR_1582    :
 STR_1583    :
-STR_1584    :{SMALLFONT}{OPENQUOTES}Questa foto-in-corsa comprata da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1584    :{SMALLFONT}{OPENQUOTES}Questa foto-in-corsa comprata da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1585    :{SMALLFONT}{OPENQUOTES}Questa foto-in-corsa comprata da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1585    :{SMALLFONT}{OPENQUOTES}Questa foto-in-corsa comprata da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1586    :{SMALLFONT}{OPENQUOTES}Questa foto-in-corsa comprata da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1586    :{SMALLFONT}{OPENQUOTES}Questa foto-in-corsa comprata da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1587    :{SMALLFONT}{OPENQUOTES}Questo biscottino comprato da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1587    :{SMALLFONT}{OPENQUOTES}Questo biscottino comprato da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1588    :{SMALLFONT}{OPENQUOTES}Questa cioccolata calda comprata da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1588    :{SMALLFONT}{OPENQUOTES}Questa cioccolata calda comprata da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1589    :{SMALLFONT}{OPENQUOTES}Questo tè freddo comprato da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1589    :{SMALLFONT}{OPENQUOTES}Questo tè freddo comprato da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1590    :{SMALLFONT}{OPENQUOTES}Questa torta a ciambella comprata da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1590    :{SMALLFONT}{OPENQUOTES}Questa torta a ciambella comprata da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1591    :{SMALLFONT}{OPENQUOTES}Questi occhiali da sole comprati da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1591    :{SMALLFONT}{OPENQUOTES}Questi occhiali da sole comprati da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1592    :{SMALLFONT}{OPENQUOTES}Questi spaghetti al ragù comprati da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1592    :{SMALLFONT}{OPENQUOTES}Questi spaghetti al ragù comprati da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1593    :{SMALLFONT}{OPENQUOTES}Questi spaghetti di riso fritto comprati da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1593    :{SMALLFONT}{OPENQUOTES}Questi spaghetti di riso fritto comprati da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1594    :{SMALLFONT}{OPENQUOTES}Questa zuppa di wonton comprata da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1594    :{SMALLFONT}{OPENQUOTES}Questa zuppa di wonton comprata da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1595    :{SMALLFONT}{OPENQUOTES}Queste polpette in salsa comprate da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1595    :{SMALLFONT}{OPENQUOTES}Queste polpette in salsa comprate da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1596    :{SMALLFONT}{OPENQUOTES}Questo succo di frutta comprato da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1596    :{SMALLFONT}{OPENQUOTES}Questo succo di frutta comprato da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1597    :{SMALLFONT}{OPENQUOTES}Questo latte di soia comprato da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1597    :{SMALLFONT}{OPENQUOTES}Questo latte di soia comprato da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1598    :{SMALLFONT}{OPENQUOTES}Questo sujongkwa {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1598    :{SMALLFONT}{OPENQUOTES}Questo sujongkwa {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1599    :{SMALLFONT}{OPENQUOTES}Questo sandwich comprato da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1599    :{SMALLFONT}{OPENQUOTES}Questo sandwich comprato da {STRINGID} costa davvero poco{ENDQUOTES}
-STR_1600    :{SMALLFONT}{OPENQUOTES}Questo biscotto comprato da {STRINGID} vale quanto costa{ENDQUOTES}
+STR_1600    :{SMALLFONT}{OPENQUOTES}Questo biscotto comprato da {STRINGID} costa davvero poco{ENDQUOTES}
 STR_1601    :
 STR_1602    :
 STR_1603    :
-STR_1604    :{SMALLFONT}{OPENQUOTES}Queste salsicce comprate da {STRINGID} valgono il loro prezzo{ENDQUOTES}
+STR_1604    :{SMALLFONT}{OPENQUOTES}Queste salsicce comprate da {STRINGID} costano davvero poco{ENDQUOTES}
 STR_1605    :
 STR_1606    :
 STR_1607    :
@@ -1619,27 +1619,27 @@ STR_1612    :
 STR_1613    :
 STR_1614    :
 STR_1615    :
-STR_1616    :{SMALLFONT}{OPENQUOTES}Non pagherò quel prezzo per una foto-in-corsa da {STRINGID}{ENDQUOTES}
+STR_1616    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto una foto-in-corsa da {STRINGID}{ENDQUOTES}
-STR_1617    :{SMALLFONT}{OPENQUOTES}Non pagherò quel prezzo per una foto-in-corsa da {STRINGID}{ENDQUOTES}
+STR_1617    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto una foto-in-corsa da {STRINGID}{ENDQUOTES}
-STR_1618    :{SMALLFONT}{OPENQUOTES}Non pagherò quel prezzo per una foto-in-corsa da {STRINGID}{ENDQUOTES}
+STR_1618    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto una foto-in-corsa da {STRINGID}{ENDQUOTES}
-STR_1619    :{SMALLFONT}{OPENQUOTES}Non pagherò quel prezzo per un biscottino da {STRINGID}{ENDQUOTES}
+STR_1619    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto un biscottino da {STRINGID}{ENDQUOTES}
-STR_1620    :{SMALLFONT}{OPENQUOTES}Non pagherò quel prezzo per una cioccolata calda da {STRINGID}{ENDQUOTES}
+STR_1620    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto una cioccolata calda da {STRINGID}{ENDQUOTES}
-STR_1621    :{SMALLFONT}{OPENQUOTES}Non pagherò quel prezzo per del tè freddo da {STRINGID}{ENDQUOTES}
+STR_1621    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto del tè freddo da {STRINGID}{ENDQUOTES}
-STR_1622    :{SMALLFONT}{OPENQUOTES}Non pagherò quel prezzo per una torta a ciambella da {STRINGID}{ENDQUOTES}
+STR_1622    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto una torta a ciambella da {STRINGID}{ENDQUOTES}
-STR_1623    :{SMALLFONT}{OPENQUOTES}Non pagherò quel prezzo per un paio di occhiali da sole da {STRINGID}{ENDQUOTES}
+STR_1623    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto un paio di occhiali da sole da {STRINGID}{ENDQUOTES}
-STR_1624    :{SMALLFONT}{OPENQUOTES}Non pagherò quel prezzo per degli spaghetti al ragù da {STRINGID}{ENDQUOTES}
+STR_1624    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto degli spaghetti al ragù da {STRINGID}{ENDQUOTES}
-STR_1625    :{SMALLFONT}{OPENQUOTES}Non pagherò quel prezzo per degli spaghetti di riso fritto da {STRINGID}{ENDQUOTES}
+STR_1625    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto degli spaghetti di riso fritto da {STRINGID}{ENDQUOTES}
-STR_1626    :{SMALLFONT}{OPENQUOTES}Non pagherò quel prezzo per della zuppa di wonton da {STRINGID}{ENDQUOTES}
+STR_1626    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto della zuppa di wonton da {STRINGID}{ENDQUOTES}
-STR_1627    :{SMALLFONT}{OPENQUOTES}Non pagherò quel prezzo per delle polpette in salsa da {STRINGID}{ENDQUOTES}
+STR_1627    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto delle polpette in salsa da {STRINGID}{ENDQUOTES}
-STR_1628    :{SMALLFONT}{OPENQUOTES}Non pagherò quel prezzo per un succo di frutta da {STRINGID}{ENDQUOTES}
+STR_1628    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto un succo di frutta da {STRINGID}{ENDQUOTES}
-STR_1629    :{SMALLFONT}{OPENQUOTES}Non pagherò quel prezzo per del latte di soia da {STRINGID}{ENDQUOTES}
+STR_1629    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto del latte di soia da {STRINGID}{ENDQUOTES}
-STR_1630    :{SMALLFONT}{OPENQUOTES}Non pagherò quel prezzo per un sujongkwa da {STRINGID}{ENDQUOTES}
+STR_1630    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto un sujongkwa da {STRINGID}{ENDQUOTES}
-STR_1631    :{SMALLFONT}{OPENQUOTES}Non pagherò quel prezzo per un sandwich da {STRINGID}{ENDQUOTES}
+STR_1631    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto un sandwich da {STRINGID}{ENDQUOTES}
-STR_1632    :{SMALLFONT}{OPENQUOTES}Non pagherò quel prezzo per un biscotto da {STRINGID}{ENDQUOTES}
+STR_1632    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto un biscotto da {STRINGID}{ENDQUOTES}
 STR_1633    :
 STR_1634    :
 STR_1635    :
-STR_1636    :{SMALLFONT}{OPENQUOTES}Non pagherò quel prezzo per delle salsicce da {STRINGID}{ENDQUOTES}
+STR_1636    :{SMALLFONT}{OPENQUOTES}Non ho intenzione di pagare così tanto delle salsicce da {STRINGID}{ENDQUOTES}
 STR_1637    :
 STR_1638    :
 STR_1639    :
@@ -1654,7 +1654,6 @@ STR_1647    :
 STR_1648    :{SMALLFONT}{OPENQUOTES}Aiuto! Voglio scendere!{ENDQUOTES}
 STR_1649    :{SMALLFONT}{OPENQUOTES}Sto finendo i soldi!{ENDQUOTES}
 STR_1650    :{SMALLFONT}{OPENQUOTES}Wow! Presto ci sarà una nuova attrazione!{ENDQUOTES}
-# Two removed inside jokes about Intamin and Phoenix
 STR_1651    :<removed string - do not use>
 STR_1652    :<removed string - do not use>
 STR_1653    :{SMALLFONT}{OPENQUOTES}...e qui siamo su {STRINGID}!{ENDQUOTES}
@@ -1671,7 +1670,7 @@ STR_1663    :{WINDOW_COLOUR_2}Nausea:
 STR_1664    :{WINDOW_COLOUR_2}Energia:
 STR_1665    :{WINDOW_COLOUR_2}Fame:
 STR_1666    :{WINDOW_COLOUR_2}Sete:
-STR_1667    :{WINDOW_COLOUR_2}Toilet:
+STR_1667    :{WINDOW_COLOUR_2}Bagno:
 STR_1668    :{WINDOW_COLOUR_2}Soddisfazione: {BLACK}Ignota
 STR_1669    :{WINDOW_COLOUR_2}Soddisfazione: {BLACK}{COMMA16}%
 STR_1670    :{WINDOW_COLOUR_2}Totale clienti: {BLACK}{COMMA32}
@@ -1721,7 +1720,7 @@ STR_1713    :{INLINE_SPRITE}{248}{19}{00}{00}{WINDOW_COLOUR_2}Annaffia i fiori
 STR_1714    :{INLINE_SPRITE}{249}{19}{00}{00}{WINDOW_COLOUR_2}Svuota i cestini
 STR_1715    :{INLINE_SPRITE}{250}{19}{00}{00}{WINDOW_COLOUR_2}Taglia l'erba
 STR_1716    :Non è un nome valido per il parco
-STR_1717    :Impossibile ribattezzare il parco...
+STR_1717    :Impossibile rinominare il parco...
 STR_1718    :Nome del parco
 STR_1719    :Digita il nome del parco:
 STR_1720    :{SMALLFONT}{BLACK}Battezza il parco
@@ -2368,7 +2367,7 @@ STR_2358    :Unità
 STR_2359    :Valori reali
 STR_2360    :{WINDOW_COLOUR_2}Risoluzione:
 STR_2361    :Addolcimento del paesaggio
-STR_2362    :{SMALLFONT}{BLACK}Attiva/disattiva l'addolcimento degli spigoli delle mattonelle del paesaggio
+STR_2362    :{SMALLFONT}{BLACK}Attiva/disattiva l'addolcimento degli spigoli delle celle del paesaggio
 STR_2363    :Griglia sovrapposta al paesaggio
 STR_2364    :{SMALLFONT}{BLACK}Attiva/disattiva la griglia sovrapposta al paesaggio
 STR_2365    :La banca si rifiuta di concedere altri prestiti!
@@ -2706,7 +2705,7 @@ STR_2696    :Colloca alberi
 STR_2697    :???
 STR_2698    :???
 STR_2699    :???
-STR_2700    :Frequenza di autosalvataggio:
+STR_2700    :Salvataggio automatico:
 STR_2701    :Ogni minuto
 STR_2702    :Ogni 5 minuti
 STR_2703    :Ogni 15 minuti
@@ -2724,8 +2723,8 @@ STR_2714    :-
 STR_2715    :.
 STR_2716    :/
 STR_2717    :'
-STR_2718    :(up)
+STR_2718    :Sali di livello
-STR_2719    :(new file)
+STR_2719    :Crea nuovo
 STR_2720    :{UINT16}sec
 STR_2721    :{UINT16}sec
 STR_2722    :{UINT16}min:{UINT16}sec
@@ -3102,7 +3101,7 @@ STR_3091    :Non ti è permesso cancellare questa sezione!
 STR_3092    :Non ti è permesso spostare o modificare la stazione di quest'attrazione!
 STR_3093    :{WINDOW_COLOUR_2}Preferito: {BLACK}{STRINGID}
 STR_3094    :N/A
-STR_3095    :{WINDOW_COLOUR_2}Vel. catena di traino:
+STR_3095    :{WINDOW_COLOUR_2}Velocità catena di traino:
 STR_3096    :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{VELOCITY}
 STR_3097    :{SMALLFONT}{BLACK}Seleziona la velocità della catena di traino sulla salita
 STR_3098    :Impossibile modificare la velocità della catena di traino sulla salita...
@@ -3119,7 +3118,7 @@ STR_3108    :Prova
 STR_3109    :Apri
 STR_3110    :{WINDOW_COLOUR_2}Blocca le sezioni: {BLACK}{COMMA16}
 STR_3111    :{SMALLFONT}{BLACK}Clicca sul progetto per costruirlo
-STR_3112    :{SMALLFONT}{BLACK}Clicca sul progetto per ribattezzarlo o cancellarlo
+STR_3112    :{SMALLFONT}{BLACK}Clicca sul progetto per rinominarlo o cancellarlo
 STR_3113    :Scegli un altro progetto
 STR_3114    :{SMALLFONT}{BLACK}Torna alla finestra della scelta dei progetti
 STR_3115    :{SMALLFONT}{BLACK}Salva il progetto del tracciato
@@ -3268,9 +3267,9 @@ STR_3257    :{SMALLFONT}{BLACK}Stabilisci se i visitatori in generale dovrebbero
 STR_3258    :Attrazioni più intense preferite
 STR_3259    :{SMALLFONT}{BLACK}Stabilisci se i visitatori in generale dovrebbero preferire solo attrazioni più intense
 STR_3260    :{WINDOW_COLOUR_2}Denaro per visitatore (media):
-STR_3261    :{WINDOW_COLOUR_2}Felicità iniziale visitat.:
+STR_3261    :{WINDOW_COLOUR_2}Felicità iniziale visitatori:
-STR_3262    :{WINDOW_COLOUR_2}Fame iniziale visitat.:
+STR_3262    :{WINDOW_COLOUR_2}Fame iniziale visitatori:
-STR_3263    :{WINDOW_COLOUR_2}Sete iniziale visitat.:
+STR_3263    :{WINDOW_COLOUR_2}Sete iniziale visitatori:
 STR_3264    :Impossibile aumentarlo ulteriormente!
 STR_3265    :Impossibile ridurlo ulteriormente!
 STR_3266    :{SMALLFONT}{BLACK}Stabilisci il prezzo dell'ingresso e delle attrazioni
@@ -3302,7 +3301,7 @@ STR_3291    :Temperato
 STR_3292    :Caldo e secco
 STR_3293    :Freddo
 STR_3294    :Modifica...
-STR_3295    :{SMALLFONT}{BLACK}Ribattezza il parco
+STR_3295    :{SMALLFONT}{BLACK}Rinomina il parco
 STR_3296    :{SMALLFONT}{BLACK}Modifica il nome dello scenario
 STR_3297    :{SMALLFONT}{BLACK}Modifica le informazioni sul parco/scenario
 STR_3298    :{WINDOW_COLOUR_2}Nome parco: {BLACK}{STRINGID}
@@ -3355,11 +3354,11 @@ STR_3344    :Strumento di progettazione degli ottovolanti
 STR_3345    :Strumento di gestione dei progetti di tracciato
 STR_3346    :Impossibile salvare il progetto di tracciato...
 STR_3347    :L{GREEN}attrazione è troppo grande, contiene troppi elementi o lo scenario è sparso su un'area troppo vasta
-STR_3348    :Ribattezza
+STR_3348    :Rinomina
 STR_3349    :Cancella
 STR_3350    :Battezza il progetto di tracciato
 STR_3351    :Digita il nome di questo progetto di tracciato:
-STR_3352    :Impossibile ribattezzare il  progetto di tracciato...
+STR_3352    :Impossibile rinominare il progetto di tracciato...
 STR_3353    :Il nuovo nome contiene dei caratteri non validi
 STR_3354    :Esiste già un altro file con quel nome, o il file è protetto dalla scrittura
 STR_3355    :Il file è protetto dalla scrittura o è chiuso all'accesso
@@ -3463,14 +3462,14 @@ STR_5121    :Ricerca
 STR_5122    :Attrazioni in base al tipo di percorso (come in RCT1)
 STR_5123    :Rinnova attrazioni
 STR_5124    :<not used anymore>
-STR_5125    :Tutti distruttibili
+STR_5125    :Tutte distruttibili
 STR_5126    :Musica iniziale casuale
 STR_5127    :{SMALLFONT}{BLACK}Trascinando, modifica il paesaggio anziché cambiare altezza
 STR_5128    :Dimensione selezione
 STR_5129    :Inserire la dimensione della selezione tra {COMMA16} e {COMMA16}
 STR_5130    :Dimensione mappa
 STR_5131    :Inserire dimensione mappa tra {COMMA16} e {COMMA16}
-STR_5132    :Aggiusta tutte le attrazioni
+STR_5132    :Aggiusta attrazioni
 STR_5133    :{SMALLFONT}{BLACK}Modifica un'area più piccola dei terreni del parco
 STR_5134    :{SMALLFONT}{BLACK}Modifica un'area più grande dei terreni del parco
 STR_5135    :{SMALLFONT}{BLACK}Acquista nuovi terreni o permessi di costruzione
@@ -3498,7 +3497,7 @@ STR_5154    :Rendering hardware
 STR_5155    :Permetti di testare percorsi non finiti
 STR_5156    :{SMALLFONT}{BLACK}Permette di effettuare il test della maggior parte dei percorsi anche quando il percorso non è un circuito completo, non si applica alla modalità sezioni a blocchi
 STR_5157    :Sblocca tutti i prezzi
-STR_5158    :Torna al menù
+STR_5158    :Torna al menu
 STR_5159    :Esci da OpenRCT2
 STR_5160    :{POP16}{MONTH} {PUSH16}{PUSH16}{STRINGID}, anno {POP16}{COMMA16}
 STR_5161    :Formato data:
@@ -3602,7 +3601,7 @@ STR_5256    :Create a new theme to make changes to
 STR_5257    :{SMALLFONT}{BLACK}Create a new theme based on the current one
 STR_5258    :{SMALLFONT}{BLACK}Delete the current theme
 STR_5259    :{SMALLFONT}{BLACK}Rename the current theme
-STR_5260    :Screenshot Gigante
+STR_5260    :Schermata gigante
 STR_5261    :Filtro
 STR_5262    :Wacky Worlds
 STR_5263    :Time Twister
@@ -3620,15 +3619,15 @@ STR_5274    :{SMALLFONT}{BLACK}Percorso
 STR_5275    :Cerca per oggetti
 STR_5276    :Inserisci il nome di un oggetto da cercare
 STR_5277    :Pulisci
-STR_5278    :Modalità Sandbox
+STR_5278    :Modalità sandbox
 STR_5279    :Disattiva modalità sandbox
 STR_5280    :{SMALLFONT}{BLACK}Permetti la modifica delle impostazioni del terreno tramite la finestra Mappa e altre opzioni che sono solitamente non disponibili nella modifica Scenario
 STR_5281    :{SMALLFONT}{BLACK}Feature
 STR_5282    :RCT1 Ride Open/Close Lights
 STR_5283    :RCT1 Park Open/Close Lights
 STR_5284    :RCT1 Selezione Font Scenario
-STR_5285    :ESPLODE!!!
+STR_5285    :ESPLODI!!!
-STR_5286    :{SMALLFONT}{BLACK}Qualche visitatore esplode
+STR_5286    :{SMALLFONT}{BLACK}Fa esplodere alcuni visitatori
 STR_5287    :L'attrazione è già partita
 STR_5288    :Corsa chiusa
 STR_5289    :Nessun guasto per questa attrazione
@@ -3646,7 +3645,7 @@ STR_5300    :{SMALLFONT}{BLACK}Licenzia velocemente il personale
 STR_5301    :{MEDIUMFONT}{BLACK}Cancella il prestito
 STR_5302    :Azzera prestito
 STR_5303    :Permetti la costruzione in pausa
-STR_5304    :Sequenza Titolo:
+STR_5304    :Sequenza del titolo:
 STR_5305    :RollerCoaster Tycoon 1
 STR_5306    :RollerCoaster Tycoon 1 (AA)
 STR_5307    :RollerCoaster Tycoon 1 (AA + LL)
@@ -3685,12 +3684,12 @@ STR_5339    :{SMALLFONT}{BLACK}Altezza base
 STR_5340    :{SMALLFONT}{BLACK}Clearance height
 STR_5341    :<removed string - do not use>
 STR_5342    :<removed string - do not use>
-STR_5343    :Posiziona personale automaticamente
+STR_5343    :Colloca automaticamente il personale
 STR_5344    :Changelog
-STR_5345    :Trucchi Finanziari
+STR_5345    :Trucchi finanziari
-STR_5346    :Trucchi Visitatori
+STR_5346    :Trucchi visitatori
-STR_5347    :Trucchi Parco
+STR_5347    :Trucchi parco
-STR_5348    :Trucchi Attrazione
+STR_5348    :Trucchi attrazioni
 STR_5349    :{SMALLFONT}{BLACK}Tutte le attrazioni
 STR_5350    :Max
 STR_5351    :Min
@@ -3699,22 +3698,22 @@ STR_5353    :{BLACK}Energia:
 STR_5354    :{BLACK}Fame:
 STR_5355    :{BLACK}Sete:
 STR_5356    :{BLACK}Nausea:
-STR_5357    :{BLACK}Tolleranza Nausea:
+STR_5357    :{BLACK}Tolleranza nausea:
-STR_5358    :{BLACK}Necessità Bagno:
+STR_5358    :{BLACK}Bagno:
-STR_5359    :Rimuovi Visitatori
+STR_5359    :Rimuovi visitatori
 STR_5360    :{SMALLFONT}{BLACK}Rimuovi tutti i visitatori dalla mappa
-STR_5361    :Su titti i visitatori:
+STR_5361    :Dai a tutti i visitatori:
 STR_5362    :{BLACK}Imposta ai visitatori l'intensità attrazione:
 STR_5363    :Più di 1
 STR_5364    :Meno di 15
 STR_5365    :{BLACK}Velocità personale:
 STR_5366    :Normale
 STR_5367    :Veloce
-STR_5368    :Resetta lo stato dei crash
+STR_5368    :Reset stato incidenti
-STR_5369    :Parametri Parco...
+STR_5369    :Parametri parco...
 STR_5370    :{SMALLFONT}{BLACK}Clicca questo pulsante per modificare il parco{NEWLINE}parametri come restrizione,{NEWLINE}generazione visitatori e soldi.
 STR_5371    :Selezione oggetti
-STR_5372    :Inverti il drag destra del mouse
+STR_5372    :Inverti direzione trascinamento con clic destro
 STR_5373    :Nome {STRINGID}
 STR_5374    :Data {STRINGID}
 STR_5375    :{UP}
@@ -3766,7 +3765,7 @@ STR_5420    :Ruota{MOVE_X}{87}{COMMA16}
 STR_5421    :Zoom
 STR_5422    :Zoom{MOVE_X}{87}{COMMA16}
 STR_5423    :Aspetta
-STR_5424    :Aspetta{MOVE_X}{87}{COMMA16}
+STR_5424    :Aspetta{MOVE_X}{87}{UINT16}
 STR_5425    :Riavvia
 STR_5426    :Fine
 STR_5427    :Coordinate:
@@ -3778,11 +3777,11 @@ STR_5432    :Comando:
 STR_5433    :Sequenza Titoli
 STR_5434    :Editor Comandi
 STR_5435    :Rinomina salvataggio
-STR_5436    :Modifica Sequenza dei Titoli...
+STR_5436    :Modifica sequenza titolo...
 STR_5437    :Nessun salvataggio selezionato
 STR_5438    :Non puoi fare modifiche mentre l'editor dei comandi è aperto
 STR_5439    :A wait command with at least 4 seconds is required with a restart command
-STR_5440    :Minimizza la schermata a tutto quando si perde il focus
+STR_5440    :Riduci schermo intero se il gioco perde il focus
 STR_5441    :{SMALLFONT}{BLACK}Identifica le attrazioni in base al percorso{NEWLINE}in modo che si possano sostituirne successivamente{NEWLINE}i veicoli (come in RCT1)
 STR_5442    :Voto del parco:
 STR_5443    :Velocità{MOVE_X}{87}{STRINGID}
@@ -3798,14 +3797,14 @@ STR_5452    :Visibilità della barra
 STR_5453    :Selezione altra corsa
 STR_5454    :FPS senza limiti
 STR_5455    :Abilita modalità sandbox
-STR_5456    :Disabilita verifiche di pulizia
+STR_5456    :Disabilita controlli distanze
 STR_5457    :Disabilita limite supporti
 STR_5458    :Ruota senso orario
 STR_5459    :Ruota antiorario
 STR_5460    :Ruota visuale antiorario
 STR_5461    :Imposta parametri visitatori
 STR_5462    :{CURRENCY}
-STR_5463    :Obiettivo: {OPENQUOTES}Divertirsi!{ENDQUOTES}
+STR_5463    :Obiett. "Divertiti"
 STR_5464    :Generale
 STR_5465    :Clima
 STR_5466    :Personale
@@ -3815,7 +3814,7 @@ STR_5469    :Scorri la mappa in alto
 STR_5470    :Scorri la mappa a sinistra
 STR_5471    :Scorri la mappa in basso
 STR_5472    :Scorri la mappa a destra
-STR_5473    :Ciclo giorno / notte
+STR_5473    :Ciclo giorno/notte
 STR_5474    :Mostra testo nei cartelli in maiuscolo
 STR_5475    :{COMMA16} settimane
 STR_5476    :Hardware
@@ -3849,12 +3848,12 @@ STR_5503    :Inserisci hostname o indirizzo IP:
 STR_5504    :{SMALLFONT}{BLACK}Show multiplayer status
 STR_5505    :Impossibile connettersi al server.
 STR_5506    :I visitatori ignorano l'intensità
-STR_5507    :Il tuttofare taglia l'erba in modo predefinito
+STR_5507    :I tuttofare tagliano l'erba di default
 STR_5508    :Permetti caricamento file con checksum errato
 STR_5509    :{SMALLFONT}{BLACK}Permetti il caricamento di scenari e salvataggi{NEWLINE}che hanno un codice di controllo errato,{NEWLINE}come ad esempio gli scenari della demo{NEWLINE}o i salvataggi danneggiati.
 STR_5510    :Scheda audio predefinita
 STR_5511    :(UNKNOWN)
-STR_5512    :Salva gioco con nome...
+STR_5512    :Salva partita con nome...
 STR_5513    :Salvataggio veloce
 STR_5514    :Disattiva vandalismi
 STR_5515    :{SMALLFONT}{BLACK}Impedisce ai visitatori di vandalizzare il parco quando sono arrabbiati
@@ -3896,12 +3895,12 @@ STR_5550    :{POP16}{POP16}Anno {COMMA16}, {PUSH16}{PUSH16}{MONTH} {PUSH16}{PUSH
 STR_5551    :Anno/Giorno/Mese
 STR_5552    :{POP16}{POP16}Anno {COMMA16}, {PUSH16}{PUSH16}{PUSH16}{STRINGID} {MONTH}
 STR_5553    :Gioco in pausa quando l'overlay di Steam è aperto
-STR_5554    :{SMALLFONT}{BLACK}Enable mountain tool
+STR_5554    :{SMALLFONT}{BLACK}Attiva lo strumento montagna
 STR_5555    :Mostra i veicoli di altre attrazioni
 STR_5556    :{SMALLFONT}{BLACK}Caccia giocatore
 STR_5557    :Rimani connesso in caso di asincronia (multigiocatore)
 STR_5558    :È necessario riavviare il gioco per attivare questa opzione
-STR_5559    :Ispezioni ogni 10 minuti
+STR_5559    :Ispezioni ogni 10 min.
 STR_5560    :{SMALLFONT}{BLACK}Imposta l'intervallo di ispezione a {OPENQUOTES}Ogni 10 minuti{ENDQUOTES} su tutte le attrazioni
 STR_5561    :Caricamento lingua fallito
 STR_5562    :ATTENZIONE!
@@ -3921,7 +3920,7 @@ STR_5575    :Massimo numero giocatori:
 STR_5576    :Porta:
 STR_5577    :Won sudcoreani (W)
 STR_5578    :Rubli russi (R)
-STR_5579    :Window scale factor:
+STR_5579    :Fattore di scala:
 STR_5580    :Corona ceca (Kc)
 STR_5581    :Mostra FPS
 STR_5582    :Blocca il mouse nella finestra
@@ -4042,7 +4041,7 @@ STR_5729    :{SMALLFONT}{BLACK}Richiede il rendering hardware
 STR_5730    :Nearest Neighbour
 STR_5731    :Lineare
 STR_5732    :Anisotropico
-STR_5733    :Scala con N. Neighbour a valori interi
+STR_5733    :Scala con "Nearest Neighbour" a valori interi
 # tooltip for tab in options window
 STR_5734    :{SMALLFONT}{BLACK}Rendering
 STR_5735    :Stato della rete
@@ -4050,8 +4049,8 @@ STR_5736    :Giocatore
 STR_5737    :Chiuso, ma {COMMA16} persone sono sull'attrazione
 STR_5738    :Chiuso, ma {COMMA16} persone sono sull'attrazione
 STR_5739    :{WINDOW_COLOUR_2}Clienti nelle attrazioni: {BLACK}{COMMA16}
-STR_5740    :Rimuovi scadenza da campagne di marketing
+STR_5740    :Campagne di marketing infinite
-STR_5741    :{SMALLFONT}{BLACK}Permette di creare campagne di marketing infinite
+STR_5741    :{SMALLFONT}{BLACK}Permette di creare campagne di marketing senza scadenza
 STR_5742    :Autenticazione...
 STR_5743    :Connessione...
 STR_5744    :Risoluzione indirizzo...
@@ -4098,7 +4097,7 @@ STR_5784    :{BLACK}Completare gli scenari precedenti per sbloccare questo.
 STR_5785    :Impossibile rinominare il gruppo...
 STR_5786    :Nome di gruppo non valido
 STR_5787    :{COMMA32} giocatori connessi
-STR_5788    :Tempo ispezioni predefinito:
+STR_5788    :Ispeziona attrazioni:
 STR_5789    :Disattiva effetto fulmine
 STR_5790    :{SMALLFONT}{BLACK}Attiva/disattiva i prezzi di RCT1{NEWLINE}(es. sia prezzo di ingresso che prezzo sulle attrazioni)
 STR_5791    :{SMALLFONT}{BLACK}Imposta l'affidabilità di tutte le attrazioni a 100%{NEWLINE}e reimposta la loro data di costruzione a {OPENQUOTES}quest'anno{ENDQUOTES}
@@ -4147,14 +4146,14 @@ STR_5832    :{SMALLFONT}{BLACK}Mostra l'altezza in unità generiche invece del f
 STR_5833    :{SMALLFONT}{BLACK}Cambia il formato della data utilizzato
 STR_5834    :{SMALLFONT}{BLACK}Seleziona il dispositivo audio utilizzato da OpenRCT2
 STR_5835    :{SMALLFONT}{BLACK}Disattiva l'audio del gioco se la finestra perde il focus
-STR_5836    :{SMALLFONT}{BLACK}Imposta la musica da utilizzare nel menù principale.{NEWLINE}Selezionando RCT1 sarà necessario copiare il file 'data/css17.dat' dalla cartella di RCT1 a 'data/css50.dat' nella cartella di RCT2, oppure impostare il percorso di RCT1 nella scheda "Altro".
+STR_5836    :{SMALLFONT}{BLACK}Imposta la musica da utilizzare nel menu principale.{NEWLINE}Selezionando RCT1 sarà necessario copiare il file 'data/css17.dat' dalla cartella di RCT1 a 'data/css50.dat' nella cartella di RCT2, oppure impostare il percorso di RCT1 nella scheda "Altro".
 STR_5837    :{SMALLFONT}{BLACK}Crea e gestisci i temi dell'interfaccia
 STR_5838    :{SMALLFONT}{BLACK}Mostra un pulsante differente per le finanze nella barra degli strumenti
 STR_5839    :{SMALLFONT}{BLACK}Mostra un pulsante differente per le ricerche e sviluppo nella barra degli strumenti
 STR_5840    :{SMALLFONT}{BLACK}Mostra un pulsante differente per i trucchi nella barra degli strumenti
 STR_5841    :{SMALLFONT}{BLACK}Mostra un pulsante differente per le novità nella barra degli strumenti
 STR_5842    :{SMALLFONT}{BLACK}Mostra scenari divisi per difficoltà (come in RCT2) o per gioco di origine (come in RCT1)
-STR_5843    :{SMALLFONT}{BLACK}Abilita lo sblocco degli scenari (RCT1)
+STR_5843    :{SMALLFONT}{BLACK}Abilita lo sblocco degli scenari come in RCT1
 STR_5844    :{SMALLFONT}{BLACK}Connettiti al server multigiocatore{NEWLINE}anche in caso di asincronia o errori
 STR_5845    :{SMALLFONT}{BLACK}Aggiungi un pulsante{NEWLINE}per debuggare nella barra.{NEWLINE}Abilita le shortcut nellatastiera per la console sviluppatori
 STR_5846    :{SMALLFONT}{BLACK}Imposta i salvataggi automatici di OpenRCT2 spesso
@@ -4184,12 +4183,12 @@ STR_5869    :{WINDOW_COLOUR_2}Sito provider: {BLACK}{STRING}
 STR_5870    :{SMALLFONT}{BLACK}Mostra le informazioni del server
 STR_5871    :Le piante non invecchiano
 STR_5872    :{SMALLFONT}{BLACK}Disabilità l'invecchiamento delle piante.
-STR_5873    :Permetti catena di traino su tutti i pezzi del tracciato
+STR_5873    :Permetti catena di traino su tutti i pezzi
 STR_5874    :{SMALLFONT}{BLACK}Permette di rendere qualsiasi pezzo del tracciato una catena di traino
 STR_5875    :Motore di rendering:
 STR_5876    :{SMALLFONT}{BLACK}Il motore grafico usato per mostrare la grafica del gioco.
 STR_5877    :Software
-STR_5878    :Software (rendering hardware)
+STR_5878    :Rendering hardware
 STR_5879    :OpenGL (sperimentale)
 STR_5880    :Solo selezionati
 STR_5881    :Solo non selezionati
@@ -4217,7 +4216,7 @@ STR_5902    :Mostra i bounding box
 STR_5903    :Mostra la finestra di debug del rendering
 STR_5904    :Reimposta data
 STR_5905    :{SMALLFONT}{BLACK}Uno strumento di generazione mappe che crea automaticamente un paesaggio personalizzato
-STR_5906    :Zoom alla posizione del cursore
+STR_5906    :Zoom rispetto alla posizione del cursore
 STR_5907    :{SMALLFONT}{BLACK}Se abilitato, effettuando lo zoom l'ingrandimento avverrà centrato sul cursore anziché al centro dello schermo.
 STR_5908    :Permetti qualsiasi cambio di tipo percorso
 STR_5909    :{SMALLFONT}{BLACK}Permette di cambiare liberamente il tipo di percorso. Potrebbe causare blocchi del gioco.
@@ -4314,7 +4313,7 @@ STR_5998    :Aggiungi denaro
 STR_5999    :Imposta denaro
 STR_6000    :Inserire il nuovo valore
 STR_6001    :Attiva effetti luce (sperimentale)
-STR_6002    :{SMALLFONT}{BLACK}Le attrazioni e i lampioni saranno illuminati di notte.{NEWLINE}Richiede il motore di rendering hardware.
+STR_6002    :{SMALLFONT}{BLACK}Le attrazioni e i lampioni saranno illuminati di notte. Richiede il motore di rendering hardware.
 STR_6003    :Vista sezionata
 STR_6004    :Vista sezionata
 STR_6005    :Attiva la vista sezionata
@@ -4345,7 +4344,8 @@ STR_6029    :Costruzione percorso - Demolisci attuale
 STR_6030    :{SMALLFONT}{BLACK}Contagocce scenario. Fare clic su un qualsiasi elemento dello scenario per attivare la costruzione di quel pezzo.
 STR_6031    :Descrizione server:
 STR_6032    :Messaggio di benvenuto server:
-STR_6033    :Percorso installazione di RCT1:
+STR_6033    :Cartella di RCT1:
+STR_6034    :{SMALLFONT}{BLACK}{STRING}
 STR_6035    :Selezionare la cartella di installazione di RCT1
 STR_6036    :{SMALLFONT}{BLACK}Pulisci
 STR_6037    :Selezionare una cartella di installazione di RCT1 valida
@@ -4367,6 +4367,73 @@ STR_6052    :La heightmap è troppo grande e sarà tagliata
 STR_6053    :La heightmap non può essere normalizzata
 STR_6054    :Sono supportate solo le bitmap a 24 bit
 STR_6055    :File di heightmap di OpenRCT2
+STR_6056    :{SMALLFONT}{BLACK}Muto
+STR_6057    :{SMALLFONT}{BLACK}Mostra un bottone separato per l'opzione Muto nella barra degli strumenti
+STR_6058    :Muto
+STR_6059    :{RIGHTGUILLEMET}
+STR_6060    :Mostra animazione per acquisti dei visitatori
+STR_6061    :{SMALLFONT}{BLACK}Mostra l'effetto dei soldi animato{NEWLINE}quando i visitatori effettuano acquisti.
+STR_6062    :{OUTLINE}{GREEN}+ {CURRENCY2DP}
+STR_6063    :{OUTLINE}{RED}- {CURRENCY2DP}
+STR_6064    :Possiedi tutto il terreno
+STR_6065    :Registra azioni degli utenti
+STR_6066    :{SMALLFONT}{BLACK}Crea un log di tutte le azioni degli utenti nella propria cartella utente.
+STR_6067    :Server avviato.
+STR_6068    :Server fermato.
+STR_6069    :{STRING} è stato escluso dal server da {STRING}.
+STR_6070    :{STRING} è stato impostato nel gruppo "{STRING}" da {STRING}.
+STR_6071    :{STRING} ha creato il nuovo gruppo di giocatori "{STRING}".
+STR_6072    :{STRING} ha eliminato il gruppo di giocatori "{String}".
+STR_6073    :{STRING} ha modificato i permessi per il gruppo di giocatori "{String}".
+STR_6074    :{STRING} ha rinominato il gruppo di giocatori da "{String}" a "{String}".
+STR_6075    :{STRING} ha cambiato il gruppo di giocatori predefinito in "{String}".
+STR_6076    :{STRING} ha usato/disattivato il trucco "{STRING}".
+STR_6077    :Aggiungi soldi
+STR_6078    :{STRING} ha creato l'attrazione "{STRING}".
+STR_6079    :{STRING} ha demolito l'attrazione "{STRING}".
+STR_6080    :{STRING} ha cambiato l'aspetto dell'attrazione "{STRING}".
+STR_6081    :{STRING} ha cambiato lo stato dell'attrazione "{STRING}" a chiuso.
+STR_6082    :{STRING} ha cambiato lo stato dell'attrazione "{STRING}" ad aperto.
+STR_6083    :{STRING} ha cambiato lo stato dell'attrazione "{STRING}" a test.
+STR_6084    :{STRING} ha cambiato le impostazioni veicolo dell'attrazione "{STRING}".
+STR_6085    :{STRING} ha cambiato le impostazioni dell'attrazione "{STRING}".
+STR_6086    :{STRING} ha rinominato l'attrazione "{STRING}" in "{STRING}".
+STR_6087    :{STRING} ha cambiato il prezzo dell'attrazione "{STRING}" a {STRING}
+STR_6088    :{STRING} ha cambiato il prezzo secondario dell'attrazione "{STRING}" a {STRING}
+STR_6089    :{STRING} ha rinominato il parco da "{STRING}" a "{STRING}".
+STR_6090    :{STRING} ha aperto il parco.
+STR_6091    :{STRING} ha chiuso il parco.
+STR_6092    :{STRING} ha cambiato il prezzo di ingresso al parco a {STRING}
+STR_6093    :{STRING} ha piazzato del nuovo scenario.
+STR_6094    :{STRING} ha eliminato dello scenario.
+STR_6095    :{STRING} ha modificato lo scenario.
+STR_6096    :{STRING} ha impostato il cartello a "{STRING}".
+STR_6097    :{STRING} ha piazzato un tratto di percorso "{STRING}".
+STR_6098    :{STRING} ha rimosso un tratto di percorso.
+STR_6099    :Connesso al server.
+STR_6100    :Disconnesso dal server.
+STR_6101    :Le attrazioni non perdono valore con il tempo
+STR_6102    :{SMALLFONT}{BLACK}Il valore delle attrazioni non calerà con il tempo, in modo che i visitatori non pensino improvvisamente che il costo dell'attrazione sia troppo alto.
+STR_6103    :{SMALLFONT}{BLACK}Questa opzione è disabilitata durante il gioco online.
+STR_6104    :Ottovolante ad avvitamento
+STR_6105    :Hypercoaster
+STR_6106    :Corsa in auto
+STR_6107    :Monster truck
+STR_6108    :Ottovolante ad avvitamento in acciaio
+STR_6109    :Ottovolante grande ad avvitamento
+STR_6110    :Ottovolante per giovanissimi
+STR_6111    :Mini-ottovolante classico
+STR_6112    :Un ottovolante di acciaio compatto, nel quale i treni viaggiano attraverso avvitamenti e inversioni
+STR_6113    :Un ottovolante molto alto ma privo di inversioni, con grandi cadute, un'alta velocità e comodi treni dotati di una barra di protezione sul bacino
+STR_6114    :I passeggeri viaggiano con tranquillità su un tracciato a bordo di veicoli motorizzati
+STR_6115    :Enormi camion 4x4 motorizzati, in grado di scalare ripide salite
+STR_6116    :Un ottovolante molto largo che scorre lungo un percorso di acciaio, passando attraverso numerosi tipi di inversioni
+STR_6117    :I passeggeri, seduti su confortevoli treni e protetti soltanto da barre di protezione sul bacino, viaggiano lungo discese e avvitamenti, provando la sensazione di sollevarsi dal sedile
+STR_6118    :Un ottovolante tranquillo per i visitatori che non hanno ancora il coraggio di provare le attrazioni più estreme
+STR_6119    :Un piccolo ed economico ottovolante, la cui altezza è limitata
+STR_6120    :{BABYBLUE}È disponibile un nuovo veicolo per {STRINGID}:{NEWLINE}{STRINGID}
+STR_6121    :{SMALLFONT}{BLACK}Estende i terreni di proprietà del parco fino ai bordi della mappa
+STR_6122    :Non ci sono abbastanza ottovolanti in questo scenario!
 
 
 #############

data/language/ja-JP.txt

@@ -3762,7 +3762,7 @@ STR_5420    :Rotate{MOVE_X}{87}{COMMA16}
 STR_5421    :Zoom
 STR_5422    :Zoom{MOVE_X}{87}{COMMA16}
 STR_5423    :Wait
-STR_5424    :Wait{MOVE_X}{87}{COMMA16}
+STR_5424    :Wait{MOVE_X}{87}{UINT16}
 STR_5425    :Restart
 STR_5426    :End
 STR_5427    :Coordinates:

data/language/ko-KR.txt

@@ -532,7 +532,7 @@ STR_0527    :수직 루프를 사용할 수 있는 부드러운 철제 트랙의
 STR_0528    :손님들이 공기를 넣은 고무 보트를 타고 반원이나 원형의 튜브 트랙을 따라 이동하는 놀이기구입니다.
 STR_0529    :오래된 기차 선로처럼 보이게 만든 철제 트랙을 따라 움직이는 탄광 열차 테마를 한 롤러코스터 차량입니다.
 STR_0530    :철제 케이블에 달린 차량이 연속적으로 놀이기구의 한쪽 끝에서 다른쪽 끝을 왕복 운행합니다.
-STR_0531    :차량이 코크스크류와 루프를 통과하는 알찬 구성의 철제 트랙 롤러코스터입니다.
+STR_0531    :차량이 나선 트랙과 루프를 통과하는 알찬 구성의 철제 트랙 롤러코스터입니다.
 STR_0532    :
 STR_0533    :
 STR_0534    :패트롤 엔진으로 움직이는 고 카트입니다.
@@ -555,55 +555,55 @@ STR_0550    :
 STR_0551    :
 STR_0552    :
 STR_0553    :
-STR_0554    :차량이 선형 유도 모터에 의해 긴 평지 트랙을 따라 가속된 뒤, 수직 상승 트랙에 의해 위로 상승한 뒤 다시 뒤로 자유낙하하여 탑승장에 돌아옵니다
+STR_0554    :차량이 선형 유도 모터에 의해 긴 평지 트랙을 따라 가속된 뒤, 수직 상승 트랙에 의해 위로 상승한 뒤 다시 뒤로 자유낙하하여 탑승장에 돌아옵니다.
-STR_0555    :손님은 엘리베이터에 탑승하여 한쪽에서 다른쪽으로 이동할 수 있습니다
+STR_0555    :손님은 엘리베이터에 탑승하여 한쪽에서 다른쪽으로 이동할 수 있습니다.
-STR_0556    :폭이 넓은 차량이 수직으로 기울어진 트랙을 따라 내려오면서 극강의 자유 낙하 롤러코스터를 경험하게 해줍니다
+STR_0556    :폭이 넓은 차량이 수직으로 기울어진 트랙을 따라 내려오면서 극강의 자유 낙하 롤러코스터를 경험하게 해줍니다.
 STR_0557    :
 STR_0558    :
 STR_0559    :
 STR_0560    :
 STR_0561    :
-STR_0562    :무서운 풍경과 특수 효과를 통과하며 여러 높이의 트랙을 따라 이동하는 전동 차량입니다
+STR_0562    :무서운 풍경과 특수 효과를 통과하며 여러 높이의 트랙을 따라 이동하는 전동 차량입니다.
-STR_0563    :탑승객들은 한 바퀴를 운행하는 편안한 좌석에 앉아 언덕을 오르면서 느낄 수 있는 '무중력 시간'뿐만이 아니라 크고 부드러운 낙하와 꼬인 트랙의 느낌을 즐길 수 있습니다
+STR_0563    :탑승객들은 한 바퀴를 운행하는 편안한 좌석에 앉아 언덕을 오르면서 느낄 수 있는 '무중력 시간'뿐만이 아니라 크고 부드러운 낙하와 꼬인 트랙의 느낌을 즐길 수 있습니다.
-STR_0564    :목재 트랙 위를 움직이는 이 롤러코스터는 빠르고, 거칠고, 시끄럽고, 많은 '무중력 시간'과 함께 '제어 불가능할 것 같은' 탑승감을 선사합니다
+STR_0564    :목재 트랙 위를 움직이는 이 롤러코스터는 빠르고, 거칠고, 시끄럽고, 많은 '무중력 시간'과 함께 '제어 불가능할 것 같은' 탑승감을 선사합니다.
-STR_0565    :완만한 경사와 커브만을 가진 간단한 목재 롤러코스터로, 이 롤러코스터의 차량은 오직 측면 마찰륜과 중력만으로 트랙 위에 얹혀진 상태로 운행합니다
+STR_0565    :완만한 경사와 커브만을 가진 간단한 목재 롤러코스터로, 이 롤러코스터의 차량은 오직 측면 마찰륜과 중력만으로 트랙 위에 얹혀진 상태로 운행합니다.
-STR_0566    :개별적인 롤러코스터 차량이 급커브와 짧고 급한 경사를 가진 지그재그 모양의 트랙을 어지럽게 돌아다닙니다
+STR_0566    :개별적인 롤러코스터 차량이 급커브와 짧고 급한 경사를 가진 지그재그 모양의 트랙을 어지럽게 돌아다닙니다.
-STR_0567    :트랙 반대편에 매달린 좌석에 앉아서, 탑승객들은 급강하와 여러 가지 반전 트랙을 통과하면서 거꾸러지는 동안 머리와 다리가 뒤집히게 됩니다
+STR_0567    :트랙 반대편에 매달린 좌석에 앉아서, 탑승객들은 급강하와 여러 가지 반전 트랙을 통과하면서 거꾸러지는 동안 머리와 다리가 뒤집히게 됩니다.
 STR_0568    :
-STR_0569    :차량 밑에 달린 특별한 마차에 탑승하여, 탑승객들은 공중으로 급강하면서 하늘을 나는 기분을 느끼게 만듭니다
+STR_0569    :차량 밑에 달린 특별한 마차에 탑승하여, 탑승객들은 공중으로 급강하면서 하늘을 나는 기분을 느끼게 만듭니다.
 STR_0570    :
-STR_0571    :원형의 차량이 나무 트랙을 지그재그로 이동하면서 회전합니다
+STR_0571    :원형의 차량이 나무 트랙을 지그재그로 이동하면서 회전하는 놀이기구입니다.
-STR_0572    :대형 보트가 넓은 수로를 따라 컨베이어 벨트에 의해 언덕을 올라간 뒤, 급강하하면서 큰 물보라를 일으켜 탑승객을 젖게 만듭니다
+STR_0572    :대형 보트가 넓은 수로를 따라 컨베이어 벨트에 의해 언덕을 올라간 뒤, 급강하하면서 큰 물보라를 일으켜 탑승객을 젖게 만듭니다.
-STR_0573    :탑승객이 직접 페달을 밟아 이동하는, 철제 트랙을 달리는 헬리콥터 모양의 전동 차량입니다
+STR_0573    :탑승객이 직접 페달을 밟아 이동하는, 철제 트랙을 달리는 헬리콥터 모양의 전동 차량입니다.
-STR_0574    :탑승객은 특수한 마차에 누운 자세로 매달려, 이리 저리 꼬이고 뒤집히는 트랙을 땅을 등지거나 마주보는 자세로 탑승하게 됩니다
+STR_0574    :탑승객은 특수한 마차에 누운 자세로 매달려, 이리 저리 꼬이고 뒤집히는 트랙을 땅을 등지거나 마주보는 자세로 탑승하게 됩니다.
-STR_0575    :공원 여기 저기로 사람들을 실어나르는, 단선 레일에 매달린 전동 열차입니다
+STR_0575    :공원 여기 저기로 사람들을 실어나르는, 단선 레일에 매달린 전동 열차입니다.
 STR_0576    :
 STR_0577    :특수한 반전 섹션에서 앞뒤가 바뀌는 목재 트랙을 달리는 보우기 차입니다
 STR_0578    :원형 고리로 둘러싸여 급강하와 하트라인 트위스트를 횡단하는 트랙을 달리는 차량입니다.
 STR_0579    :
-STR_0580    :90m 이상의 언덕을 부드럽게 오르내리는 거대한 철제 롤러코스터입니다
+STR_0580    :90m 이상의 언덕을 부드럽게 오르내리는 거대한 철제 롤러코스터입니다.
-STR_0581    :원형 모양의 좌석이 맨 위까지 끌어올려진 다음, 자유 낙하하며, 자기장에 의해 부드럽게 바닥에 정지합니다
+STR_0581    :원형 모양의 좌석이 맨 위까지 끌어올려진 다음, 자유 낙하하며, 자기장에 의해 부드럽게 바닥에 정지합니다.
 STR_0582    :
 STR_0583    :
-STR_0584    :탑승객이 스스로 페달을 밟아 이동해야 하는, 특별한 철제 모노레일 트랙 위를 이동하는 자전거입니다
+STR_0584    :탑승객이 스스로 페달을 밟아 이동해야 하는, 특별한 철제 모노레일 트랙 위를 이동하는 자전거입니다.
-STR_0585    :탑승객은 트랙 밑에 매달린 좌석 한 쌍에 앉아 루프와 트위스트를 급격히 통과합니다
+STR_0585    :탑승객은 트랙 밑에 매달린 좌석 한 쌍에 앉아 루프와 트위스트를 급격히 통과합니다.
-STR_0586    :보트 모양의 차량이 꼬인 커브와 급강하가 가능한 롤러코스터 트랙을 달리며, 강 섹션의 물에서는 물보라를 일으키며 감속합니다
+STR_0586    :보트 모양의 차량이 꼬인 커브와 급강하가 가능한 롤러코스터 트랙을 달리며, 강 섹션의 물에서는 물보라를 일으키며 감속합니다.
-STR_0587    :아주 짜릿한 공기 압축 방식으로 발진하여 차량이 수직 트랙을 향해 속력을 높인 뒤, 꼭대기에 다다르면 다시 수직으로 하강하며 다시 탑승장에 도착합니다
+STR_0587    :아주 짜릿한 공기 압축 방식으로 발진하여 차량이 수직 트랙을 향해 속력을 높인 뒤, 꼭대기에 다다르면 다시 수직으로 하강하며 다시 탑승장에 도착합니다.
-STR_0588    :개별적인 차량이 헤이펀 커브와 급강하를 포함한 지그재그 모양의 트랙 아래를 이동합니다
+STR_0588    :개별적인 차량이 헤이펀 커브와 급강하를 포함한 지그재그 모양의 트랙 아래를 이동합니다.
 STR_0589    :
-STR_0590    :탑승객들은 잠수가 가능한 잠수함을 타고 수중 코스를 돕니다
+STR_0590    :탑승객들은 잠수가 가능한 잠수함을 타고 수중 코스를 돕니다.
-STR_0591    :뗏목 모양의 보트가 강 모양의 트랙을 따라 얌전히 이동합니다
+STR_0591    :뗏목 모양의 보트가 강 모양의 트랙을 따라 얌전히 이동합니다.
 STR_0592    :
 STR_0593    :
 STR_0594    :
 STR_0595    :
 STR_0596    :
 STR_0597    :
-STR_0598    :뒤집힌 롤러코스터 차량이 탑승장을 나서 가속하여 높이 솟은 수직 트랙으로 솟아오르고, 다시 탑승장으로 후진하여 반대편의 수직 트랙을 향해 다시 솟아오릅니다
+STR_0598    :뒤집힌 롤러코스터 차량이 탑승장을 나서 가속하여 높이 솟은 수직 트랙으로 솟아오르고, 다시 탑승장으로 후진하여 반대편의 수직 트랙을 향해 다시 솟아오릅니다.
 STR_0599    :각각의 차량이 부드럽게 꼬인 채로 낙하하는 알찬 구성의 롤러코스터입니다.
-STR_0600    :부드럽게 꼬인 트랙 구조를 따라 이동하는 탄광 차량입니다
+STR_0600    :부드럽게 꼬인 트랙 구조를 따라 이동하는 탄광 차량입니다.
 STR_0601    :
-STR_0602    :롤러코스터 차량은 탑승장에서 선형 유도 모터에 의해 가속하여 트랙을 돌만한 속도까지 올라갑니다
+STR_0602    :롤러코스터 차량은 탑승장에서 선형 유도 모터에 의해 가속하여 트랙을 돌만한 속도까지 올라갑니다.
 STR_0603    :손님 {INT32}
 STR_0604    :손님 {INT32}
 STR_0605    :손님 {INT32}
@@ -2389,7 +2389,7 @@ STR_2380    :{SMALLFONT}{BLACK}물 편집 크기 줄이기
 STR_2381    :{SMALLFONT}{BLACK}물 편집 크기 늘이기
 STR_2382    :땅
 STR_2383    :물
-STR_2384    :{WINDOW_COLOUR_2}대상:
+STR_2384    :{WINDOW_COLOUR_2}목표:
 STR_2385    :{BLACK}없음
 STR_2386    :{BLACK}공원에 최소 {COMMA16}명 이상의 손님을 {MONTHYEAR}까지 유치하고, 공원 등급을 600 이상으로 유지하세요
 STR_2387    :{BLACK}최소 {POP16}{POP16}{CURRENCY} 이상의 공원 가치를 {PUSH16}{PUSH16}{PUSH16}{MONTHYEAR}까지 달성하세요
@@ -3761,13 +3761,13 @@ STR_5420    :{MOVE_X}{87}{COMMA16} 회전
 STR_5421    :확대
 STR_5422    :{MOVE_X}{87}{COMMA16} 확대
 STR_5423    :기다림
-STR_5424    :{MOVE_X}{87}{COMMA16} 동안 기다림
+STR_5424    :{MOVE_X}{87}{UINT16} 동안 기다림
 STR_5425    :재시작
 STR_5426    :끝
 STR_5427    :좌표:
 STR_5428    :반시계방향 회전:
 STR_5429    :확대 수준:
-STR_5430    :기다릴 시간:
+STR_5430    :기다릴 시간(밀리초):
 STR_5431    :불러올 세이브 파일:
 STR_5432    :명령:
 STR_5433    :타이틀 시퀀스
@@ -4340,6 +4340,7 @@ STR_6030    :{SMALLFONT}{BLACK}오브젝트 스포이드 기능입니다. 지도
 STR_6031    :서버 설명:
 STR_6032    :서버 인사말:
 STR_6033    :RCT1 설치 경로:
+STR_6034    :{SMALLFONT}{BLACK}{STRING}
 STR_6035    :RCT1이 설치된 폴더를 선택하세요
 STR_6036    :{SMALLFONT}{BLACK}초기화
 STR_6037    :RCT1이 설치된 폴더를 올바르게 선택해주세요
@@ -4364,6 +4365,78 @@ STR_6055    :OpenRCT2 높이맵
 STR_6056    :{SMALLFONT}{BLACK}음소거
 STR_6057    :{SMALLFONT}{BLACK}메인 메뉴에 음소거를 설정할 수 있는 별도의 버튼을 표시합니다.
 STR_6058    :음소거
+STR_6059    :{RIGHTGUILLEMET}
+STR_6060    :손님의 돈 사용을 애니메이션 효과로 표시
+STR_6061    :{SMALLFONT}{BLACK}손님들이 돈을 사용하면{NEWLINE}움직이는 효과로 표시해줍니다.
+STR_6062    :{OUTLINE}{GREEN}+ {CURRENCY2DP}
+STR_6063    :{OUTLINE}{RED}- {CURRENCY2DP}
+STR_6064    :모든 땅 소유
+STR_6065    :유저 행동 기록
+STR_6066    :{SMALLFONT}{BLACK}모든 유저의 행동을 사용자 폴더에 파일로 기록합니다.
+STR_6067    :서버 시작됨
+STR_6068    :서버가 종료됨
+STR_6069    :{STRING}, {STRING}에 의해 서버에서 추방됨
+STR_6070    :{STRING}, 플레이어 그룹이 '{STRING}'에서 {STRING}(으)로 변경됨
+STR_6071    :{STRING}, 새 플레이어 그룹 '{STRING}' 생성
+STR_6072    :{STRING}, 플레이어 그룹 '{String}' 삭제
+STR_6073    :{STRING}, 플레이어 그룹 '{String}'의 권한을 수정
+STR_6074    :{STRING}, 플레이어 그룹 '{String}'의 이름을 '{String}'(으)로 변경
+STR_6075    :{STRING}, 기본 플레이어 그룹을 '{String}'(으)로 변경
+STR_6076    :{STRING}, '{STRING}' 치트 사용/토글
+STR_6077    :돈 추가
+STR_6078    :{STRING}, '{STRING}' 놀이기구를 생성
+STR_6079    :{STRING}, '{STRING}' 놀이기구를 파괴
+STR_6080    :{STRING}, '{STRING}' 놀이기구의 외관을 변경.
+STR_6081    :{STRING}, '{STRING}' 놀이기구를 닫음
+STR_6082    :{STRING}, '{STRING}' 놀이기구를 엶
+STR_6083    :{STRING}, '{STRING}' 놀이기구를 테스트함
+STR_6084    :{STRING}, '{STRING}' 놀이기구의 차량 설정을 변경함.
+STR_6085    :{STRING}, '{STRING}' 놀이기구의 설정을 변경함.
+STR_6086    :{STRING}, '{STRING}' 놀이기구의 이름을 '{STRING}'(으)로 변경.
+STR_6087    :{STRING}, '{STRING}' 놀이기구의 가격을 {STRING}(으)로 변경
+STR_6088    :{STRING}, '{STRING}' 놀이기구의 부가격을 {STRING}(으)로 변경
+STR_6089    :{STRING}, 공원 이름을 '{STRING}'에서 '{STRING}'(으)로 변경
+STR_6090    :{STRING}, 공원 문을 엶
+STR_6091    :{STRING}, 공원 문을 닫음
+STR_6092    :{STRING}, 공원 입장료를 {STRING}(으)로 변경
+STR_6093    :{STRING}, 오브젝트를 설치함
+STR_6094    :{STRING}, 오브젝트를 제거함
+STR_6095    :{STRING}, 오브젝트를 수정함
+STR_6096    :{STRING}, 팻말 내용을 '{STRING}'(으)로 설정함
+STR_6097    :{STRING}, '{STRING}' 놀이기구의 트랙을 설치함
+STR_6098    :{STRING}, 놀이기구 트랙을 제거함
+STR_6099    :서버에 접속하였습니다
+STR_6100    :서버와의 접속이 종료되었습니다
+STR_6101    :놀이기구 가치가 떨어지지 않게 만들기
+STR_6102    :{SMALLFONT}{BLACK}놀이기구의 가치가 시간이 지남에 따라 떨어지지 않게 만들어서, 손님들이 갑자기 놀이기구가 너무 비싸다고 생각하지 않도록 만듭니다.
+STR_6103    :{SMALLFONT}{BLACK}이 설정은 멀티 플레이 도중에 변경할 수 없습니다.
+STR_6104    :나선 롤러코스터
+STR_6105    :하이퍼코스터
+STR_6106    :카 라이드
+STR_6107    :몬스터 트럭
+STR_6108    :스틸 트위스터
+STR_6109    :하이퍼 트위스터
+STR_6110    :주니어 롤러코스터
+STR_6111    :클래식 미니 롤러코스터
+STR_6112    :차량이 나선 트랙과 루프를 통과하는 알찬 구성의 철제 트랙 롤러코스터입니다.
+STR_6113    :큰 낙하, 높은 속도, 그리고 무릎 안전바만 있는 편안한 차량을 가진 높고 뒤집어질 수 없는 롤러코스터입니다.
+STR_6114    :정해진 트랙을 따라 천천히 움직이는 놀이기구입니다.
+STR_6115    :급경사를 오를 수 있는 거대한 4 x 4 트럭 차량입니다.
+STR_6116    :여러 가지 반전 트랙을 통과하면서 부드러운 강철 트랙을 따라서 활강하는, 폭이 넓은 롤러코스터입니다.
+STR_6117    :탑승객들은 한 바퀴를 운행하는 편안한 좌석에 앉아 언덕을 오르면서 느낄 수 있는 '무중력 시간'뿐만이 아니라 크고 부드러운 낙하와 꼬인 트랙의 느낌을 즐길 수 있습니다.
+STR_6118    :큰 놀이기구를 탈 용기가 없는 사람들을 위한 얌전한 롤러코스터입니다.
+STR_6119    :높이 제한이 있지만 값 싸고 건설하기 쉬운 롤러코스터입니다.
+STR_6120    :{BABYBLUE}{STRINGID}에 새로운 차량이 추가되었습니다:{NEWLINE}{STRINGID}
+STR_6121    :{SMALLFONT}{BLACK}공원이 소유한 땅을 맵 끝까지 모든 방향으로 확장시켜줍니다.
+STR_6122    :이 시나리오에 롤러코스터가 충분히 많이 있지 않습니다!
+STR_6123    :공원에 사용된 오브젝트 불러오기 오류
+STR_6124    :오브젝트 이름
+STR_6125    :오브젝트 종류
+STR_6126    :알 수 없는 종류
+STR_6127    :파일: {STRING}
+STR_6128    :사용된 오브젝트 중에 빠져있거나 손상된 오브젝트를 불러올 수 없습니다. 해당 오브젝트 목록은 아래와 같습니다.
+STR_6129    :선택한 항목을 클립보드에 복사
+STR_6130    :전체 목록을 클립보드에 복사
 
 #############
 # Scenarios #

data/language/nb-NO.txt

@@ -3762,7 +3762,7 @@ STR_5420    :Rotate{MOVE_X}{87}{COMMA16}
 STR_5421    :Zoom
 STR_5422    :Zoom{MOVE_X}{87}{COMMA16}
 STR_5423    :Wait
-STR_5424    :Wait{MOVE_X}{87}{COMMA16}
+STR_5424    :Wait{MOVE_X}{87}{UINT16}
 STR_5425    :Restart
 STR_5426    :End
 STR_5427    :Coordinates:
@@ -4342,6 +4342,7 @@ STR_6030    :{SMALLFONT}{BLACK}Pyntvelger. Klikk hvilken som helst pynt på kart
 STR_6031    :Serverbeskrivelse:
 STR_6032    :Server-velkomstbeskjed:
 STR_6033    :Sti til RCT1 insallasjonsmappe:
+STR_6034    :{SMALLFONT}{BLACK}{STRING}
 STR_6035    :Velg din RCT1-mappe
 STR_6036    :{SMALLFONT}{BLACK}Visk ut
 STR_6037    :Vennligst velg en gyldig RCT1 mappe
@@ -4362,6 +4363,11 @@ STR_6051    :Bredden og høyden må være like
 STR_6052    :Høydekartet er for stort og vil bli kuttet av
 STR_6053    :Høydekartet kunne ikke normaliseres
 STR_6054    :Kun 24-bit bitmaps er støttet
+STR_6055    :OpenRCT2 høydekartfil
+STR_6056    :{SMALLFONT}{BLACK}Demp lyd
+STR_6057    :{SMALLFONT}{BLACK}Show a separate button for the Mute Option in the toolbar
+STR_6057    :{SMALLFONT}{BLACK}Vis en separat knapp for lyddemping i verktøylinjen
+STR_6058    :Demp lyd
 
 #############
 # Scenarios #

data/language/nl-NL.txt

@@ -1800,7 +1800,7 @@ STR_1796    :Is defect en moet worden gerepareerd
 STR_1797    :Deze optie kan niet worden aangepast bij deze attractie
 STR_1798    :Draaikolk
 STR_1799    :{POP16}{POP16}{POP16}{POP16}{POP16}{CURRENCY2DP}
-STR_1800    :Veiligheidsvergrendeling
+STR_1800    :Noodstop
 STR_1801    :Veiligheidsbeugel gaat niet open
 STR_1802    :Veiligheidsbeugel gaat niet dicht
 STR_1803    :Deuren gaan niet open
@@ -2863,7 +2863,7 @@ STR_2857    :{WINDOW_COLOUR_2}(Druk op een toets of muisknop om de controle over
 STR_2858    :Kan marketingcampagne niet starten...
 STR_2859    :OpenRCT2 draait al
 STR_2860    :Credits voor Infogrames Interactive...
-STR_2861    :{WINDOW_COLOUR_2}In licentie geven aan Infogrames Interactive Inc.
+STR_2861    :{WINDOW_COLOUR_2}In licentie gegeven aan {NEWLINE}Infogrames Interactive Inc.
 STR_2862    :Muziekdankwoord...
 STR_2863    :Muziekdankwoord
 STR_2864    :{WINDOW_COLOUR_2}March - Children of the Regiment:   (Fucik) geen copyright
@@ -3275,10 +3275,10 @@ STR_3269    :Verbied veranderen landschap
 STR_3270    :{SMALLFONT}{BLACK}Verbied het veranderen van het landschap
 STR_3271    :Verbied hoog bouwen
 STR_3272    :{SMALLFONT}{BLACK}Verbied bouwen boven boomhoogte
-STR_3273    :Hogere moeilijkheid parkwaardering
+STR_3273    :Hogere eisen voor goede parkwaardering
-STR_3274    :{SMALLFONT}{BLACK}Maak het krijgen van een goede parkwaardering uitdagender
+STR_3274    :{SMALLFONT}{BLACK}Maakt het krijgen van een goede parkwaardering uitdagender
-STR_3275    :Hogere moeilijkheid bezoekersgeneratie
+STR_3275    :Hogere eisen voor trekken bezoekers
-STR_3276    :{SMALLFONT}{BLACK}Maak het moeilijker om bezoekers aan te trekken
+STR_3276    :{SMALLFONT}{BLACK}Maakt het moeilijker om bezoekers aan te trekken
 STR_3277    :{WINDOW_COLOUR_2}Prijs landaankoop:
 STR_3278    :{WINDOW_COLOUR_2}Prijs bouwrechten:
 STR_3279    :Gratis entree / Per rit betalen
@@ -3757,13 +3757,13 @@ STR_5420    :Draai{MOVE_X}{87}{COMMA16}
 STR_5421    :Zoom
 STR_5422    :Zoom{MOVE_X}{87}{COMMA16}
 STR_5423    :Wacht
-STR_5424    :Wacht{MOVE_X}{87}{COMMA16}
+STR_5424    :Wacht{MOVE_X}{87}{UINT16}
 STR_5425    :Herstarten
 STR_5426    :Einde
 STR_5427    :Coördinaten:
 STR_5428    :Aant. draaiingen tegen de klok:
 STR_5429    :Zoomniveau:
-STR_5430    :Te wachten seconden:
+STR_5430    :Te wachten milliseconden:
 STR_5431    :Te laden opgeslagen spel:
 STR_5432    :Commando:
 STR_5433    :Titelpresentaties
@@ -4335,6 +4335,7 @@ STR_6030    :{SMALLFONT}{BLACK}Decorselector. Klik op een al geplaatst decorstuk
 STR_6031    :Serverbeschrijving:
 STR_6032    :Welkomstboodschap:
 STR_6033    :Locatie RCT1-bestanden:
+STR_6034    :{SMALLFONT}{BLACK}{STRING}
 STR_6035    :Selecteer de map waar je RCT1-bestanden staan
 STR_6036    :{SMALLFONT}{BLACK}Wissen
 STR_6037    :Selecteer een geldige RCT1-map.
@@ -4356,6 +4357,81 @@ STR_6052    :De hoogtekaart is te groot en zal worden bijgesneden
 STR_6053    :De hoogtekaart kan niet worden genormaliseerd
 STR_6054    :Alleen 24-bit bitmaps worden ondersteund
 STR_6055    :Hoogtekaart voor OpenRCT2
+STR_6056    :{SMALLFONT}{BLACK}Dempen
+STR_6057    :{SMALLFONT}{BLACK}Toon een knop in de werkbalk om het geluid te dempen
+STR_6058    :Dempen
+STR_6059    :{RIGHTGUILLEMET}
+STR_6060    :Animatie tonen als bezoeker iets koopt
+STR_6061    :{SMALLFONT}{BLACK}Toont een geanimeerd bedrag{NEWLINE}als een bezoeker iets koopt.
+STR_6062    :{OUTLINE}{GREEN}+ {CURRENCY2DP}
+STR_6063    :{OUTLINE}{RED}- {CURRENCY2DP}
+STR_6064    :Land toe-eigenen
+STR_6065    :Spelersacties loggen
+STR_6066    :{SMALLFONT}{BLACK}Schrijft alle acties van spelers naar een logbestand in de gebruikersmap.
+STR_6067    :Server gestart.
+STR_6068    :Server afgesloten.
+STR_6069    :{STRING} is uit de server gezet door {STRING}.
+STR_6070    :{STRING} is in de groep '{STRING}' geplaatst door {STRING}.
+STR_6071    :{STRING} heeft de nieuwe spelersgroep '{STRING}' aangemaakt.
+STR_6072    :{STRING} heeft de spelersgroep '{String}' verwijderd.
+STR_6073    :{STRING} heeft de rechten van spelersgroep '{String}' aangepast.
+STR_6074    :{STRING} heeft de naam van spelersnaam '{String}' veranderd in '{String}'.
+STR_6075    :{STRING} heeft de standaardspelersgroep veranderd in '{String}'.
+STR_6076    :{STRING} heeft de cheat '{STRING}' gebruikt, ingeschakeld of uitgeschakeld.
+STR_6077    :Geld toevoegen
+STR_6078    :{STRING} heeft de attractie '{STRING}' aangemaakt.
+STR_6079    :{STRING} heeft de attractie '{STRING}' gesloopt.
+STR_6080    :{STRING} heeft het uiterlijk van de attractie '{STRING}' aangepast.
+STR_6081    :{STRING} heeft de attractie '{STRING}' gesloten.
+STR_6082    :{STRING} heeft de attractie '{STRING}' geopend.
+STR_6083    :{STRING} heeft de attractie '{STRING}' in testmodus gezet.
+STR_6084    :{STRING} heeft de voertuiginstellingen van de attractie '{STRING}' aangepast.
+STR_6085    :{STRING} heeft de attractieinstellingen van de attractie '{STRING}' aangepast.
+STR_6086    :{STRING} heeft de attractie '{STRING}' hernoemd naar '{STRING}'.
+STR_6087    :{STRING} heeft de prijs van de attractie '{STRING}' aangepast naar {STRING}.
+STR_6088    :{STRING} heeft de tweede prijs van de attractie '{STRING}' aangepast naar {STRING}.
+STR_6089    :{STRING} heeft het park hernoemd van '{STRING}' naar '{STRING}'.
+STR_6090    :{STRING} heeft het park geopend.
+STR_6091    :{STRING} heeft het park gesloten.
+STR_6092    :{STRING} heeft de entreeprijs aangepast naar {STRING}.
+STR_6093    :{STRING} heeft nieuw decor geplaatst.
+STR_6094    :{STRING} heeft decor verwijderd.
+STR_6095    :{STRING} heeft bestaand decor aangepast.
+STR_6096    :{STRING} heeft het opschrift van een bord of lichtkrant veranderd in '{STRING}'.
+STR_6097    :{STRING} heeft een baanonderdeel voor '{STRING}' geplaatst.
+STR_6098    :{STRING} heeft een baanonderdeel verwijderd.
+STR_6099    :Je verbond met de server.
+STR_6100    :Je verbrak de verbinding met de server.
+STR_6101    :Attracties verliezen geen waarde
+STR_6102    :{SMALLFONT}{BLACK}Voorkomt dat attracties waarde verliezen, waardoor bezoekers er minder voor willen betalen. 
+STR_6103    :{SMALLFONT}{BLACK}Deze optie is niet aan te passen tijdens multiplayer.
+STR_6104    :Stalen schroefachtbaan
+STR_6105    :Hypercoaster
+STR_6106    :Autorondrit
+STR_6107    :Monstertrucks
+STR_6108    :Stalen twisterachtbaan
+STR_6109    :Hyper-twister
+STR_6110    :Juniorachtbaan
+STR_6111    :Klassieke mini-achtbaan
+STR_6112    :Een compacte stalen achtbaan waar de trein door schroeven en loopings gaat.
+STR_6113    :Een achtbaan zonder omkeringen met grote heuvels, een hoge snelheid, en comfortabele treinen met enkel schootbeugels.
+STR_6114    :Bezoekers rijden langzaam over een baan in aangedreven karretjes.
+STR_6115    :Gigantische elektrische 4x4-trucks die steile hellingen kunnen nemen.
+STR_6116    :Brede achtbaantrein die langs de soepele stalen baan glijdt en door diverse soorten omkeringen gaat.
+STR_6117    :Bezoekers zitten in comfortabele treinen met enkel een schootbeugel en gaan soepel door grote afdalingen en kronkelende stukken baan, met veel 'airtime' in de heuvels.
+STR_6118    :Een rustige achtbaan voor bezoekers die nog niet in engere attracties durven.
+STR_6119    :Goedkoop en makkelijk te bouwen, maar kan niet zo hoog gebouwd worden.
+STR_6120    :{BABYBLUE}Nieuw voertuig beschikbaar voor {STRINGID}:{NEWLINE}{STRINGID}
+STR_6121    :{SMALLFONT}{BLACK}Neem al het land op de kaart in bezit
+STR_6122    :Er zijn te weinig achtbanen in het scenario!
+STR_6123    :Fout bij het laden van objecten in het park
+STR_6124    :Objectnaam
+STR_6125    :Objecttype
+STR_6126    :Onbekend type
+STR_6127    :Bestand: {STRING}
+STR_6128    :Het bestand kon niet geladen worden omdat sommige objecten waar het naar verwijst beschadigd zijn of ontbreken. Hieronder staat een lijst van deze objecten.
+STR_6129    :Selectie naar klembord kopiëren
+STR_6130    :Hele lijst naar klembord kopiëren
 
 #############
 # Scenarios #
@@ -5907,7 +5983,7 @@ STR_DESC    :Omgekeerde achtbaantrein bestaande uit karretjes in de vorm van een
 STR_CPTY    :4 passagiers per karretje
 
 [VEKVAMP]
-STR_NAME    :Karretjes zonder bodem
+STR_NAME    :Karretjes zonder vloer
 STR_DESC    :Omgekeerde achtbaantrein bestaande uit stoeltjesliftachtige karretjes die vrijuit kunnen schommelen als de trein door een bocht gaat.
 STR_CPTY    :2 passagiers per karretje
 
@@ -6176,8 +6252,8 @@ STR_DESC    :Passagiers staan in de brede achtbaantrein met speciaal ontworpen b
 STR_CPTY    :4 passagiers per karretje
 
 [BMFL]
-STR_NAME    :Achtbaan zonder bodem
+STR_NAME    :Achtbaan zonder vloer
-STR_DESC    :Brede achtbaantreinen zonder bodem, die de passagiers het gevoel geeft in de open lucht te zijn terwijl ze langs de kronkelende baan en door meerdere omkeringen glijden.
+STR_DESC    :Brede achtbaantreinen zonder vloer, die de passagiers het gevoel geeft in de open lucht te zijn terwijl ze langs de kronkelende baan en door meerdere omkeringen glijden.
 STR_CPTY    :4 passagiers per karretje
 
 [GOLTR]

data/language/pt-BR.txt

@@ -3762,7 +3762,7 @@ STR_5420    :Rotacionar{MOVE_X}{87}{COMMA16}
 STR_5421    :Ampliar
 STR_5422    :Ampliar{MOVE_X}{87}{COMMA16}
 STR_5423    :Aguardar
-STR_5424    :Aguardar{MOVE_X}{87}{COMMA16}
+STR_5424    :Aguardar{MOVE_X}{87}{UINT16}
 STR_5425    :Reiniciar
 STR_5426    :Fim
 STR_5427    :Cordenadas:
@@ -4363,6 +4363,82 @@ STR_6051    :A largura e a altura precisam combinar
 STR_6052    :A altura do mapa é muito grande, e será cortada
 STR_6053    :A altura do mapa não pode ser normalizada
 STR_6054    :Apenas bitmaps de 24-bit são suportados
+STR_6055    :Arquivo OpenRCT2 de altura de mapa
+STR_6056    :{SMALLFONT}{BLACK}Mudo
+STR_6057    :{SMALLFONT}{BLACK}Mostrar na barra de ferramentas um botão separado para a opção Mudo
+STR_6058    :Mudo
+STR_6059    :{RIGHTGUILLEMET}
+STR_6060    :Mostrar compras do visitante como animação
+STR_6061    :{SMALLFONT}{BLACK}Mostra efeito animado de dinheiro{NEWLINE}quando visitantes fazem compras.
+STR_6062    :{OUTLINE}{GREEN}+ {CURRENCY2DP}
+STR_6063    :{OUTLINE}{RED}- {CURRENCY2DP}
+STR_6064    :Own all land
+STR_6065    :Registrar ações do usuário
+STR_6066    :{SMALLFONT}{BLACK}Registra todas as ações do usuário em arquivos no diretório do usuário.
+STR_6067    :Servidor iniciado.
+STR_6068    :Servidor desligado.
+STR_6069    :{STRING} foi chutado do servidor por {STRING}.
+STR_6070    :{STRING} foi definido para grupo'{STRING}' por {STRING}.
+STR_6071    :{STRING} criou novo grupo de jogadores '{STRING}'.
+STR_6072    :{STRING} deletou grupo de jogadores '{String}'.
+STR_6073    :{STRING} editou permissões para grupo de jogadores '{String}'.
+STR_6074    :{STRING} mudou nome do grupo de jogadores de '{String}' para '{String}'.
+STR_6075    :{STRING} mudou grupo de jogadores padrão para '{String}'.
+STR_6076    :{STRING} usou/alternou trapaça '{STRING}'.
+STR_6077    :Adicionar Dinheiro
+STR_6078    :{STRING} criou atração '{STRING}'.
+STR_6079    :{STRING} demoliu atração '{STRING}'.
+STR_6080    :{STRING} mudou aparência da atração '{STRING}'.
+STR_6081    :{STRING} mudou o status da atração '{STRING}' para fechado.
+STR_6082    :{STRING} mudou o status da atração '{STRING}' para aberto.
+STR_6083    :{STRING} mudou o status da atração '{STRING}' para testando.
+STR_6084    :{STRING} mudou configurações de veículo da atração '{STRING}'.
+STR_6085    :{STRING} mudou configurações de atração da atração '{STRING}'.
+STR_6086    :{STRING} renomeou atração de '{STRING}' para '{STRING}'.
+STR_6087    :{STRING} mudou preço da atração '{STRING}' para {STRING}
+STR_6088    :{STRING} mudou preço secundário da atração '{STRING}' para {STRING}
+STR_6089    :{STRING} renomeou o parque de '{STRING}' para '{STRING}'.
+STR_6090    :{STRING} abriu o parque.
+STR_6091    :{STRING} fechou o parque.
+STR_6092    :{STRING} mudou taxa de entrada do parque para {STRING}
+STR_6093    :{STRING} colocou novo cenário.
+STR_6094    :{STRING} removeu cenário.
+STR_6095    :{STRING} editou cenário.
+STR_6096    :{STRING} definiu nome da placa para '{STRING}'.
+STR_6097    :{STRING} adicionou uma pista da atração '{STRING}'.
+STR_6098    :{STRING} removeu uma pista da atração.
+STR_6099    :Você conectou ao servidor.
+STR_6100    :Você desconectou do servidor.
+STR_6101    :Atrações não perdem valor ao longo do tempo
+STR_6102    :{SMALLFONT}{BLACK}O valor de uma atração não diminuirá com o tempo, então visitantes não pensarão de repente que uma atração é muito cara.
+STR_6103    :{SMALLFONT}{BLACK}Esta opção é desabilitada durante jogo de rede.
+STR_6104    :Montanha-Russa Parafuso
+STR_6105    :Hipermontanha
+STR_6106    :Passeio de carro
+STR_6107    :Caminhões Monstruosos
+STR_6108    :Tornado de Aço
+STR_6109    :Hiper-Tornado
+STR_6110    :Montanha-Russa Júnior
+STR_6111    :Mini Montanha-Russa Clássica
+STR_6112    :Uma montanha russa de aço compacta onde trens viajam por parafusos e loops
+STR_6113    :Uma montanha russa alta que não inverte com grandes quedas, alta velocidade, e trens confortáveis com apenas uma trava de colo
+STR_6114    :Passageiros viajam devagar em veículos eletrizados ao longo de uma rota baseada em pista
+STR_6115    :Gigantes caminhões 4x4 eletrizados que podem subir colinas íngrimes
+STR_6116    :Trens largos de montanha russa deslizam ao longo de um trilho suave de aço, viajando por uma variedade de inversões
+STR_6117    :Sentados em trens confortáveis com apenas trava de colo, passageiros se divertem em gigantes quedas suaves e trilhos torcidos, bem como muitos "tempos no ar" pelas colinas.
+STR_6118    :Uma montanha russa suave para pessoas que ainda não criaram coragem para encarar atrações maiores
+STR_6119    :Uma montanha russa barata e fácil de construir, mas com um limite de altura
+STR_6120    :{BABYBLUE}Novo veículo disponível agora para {STRINGID}:{NEWLINE}{STRINGID}
+STR_6121    :{SMALLFONT}{BLACK}Extende o direito de terreno do parque até a borda do mapa
+STR_6122    :Não há montanhas-russas suficientes neste cenário!
+STR_6123    :Erro ao carregar objetos para o parque
+STR_6124    :Nome do objeto
+STR_6125    :Tipo do objeto
+STR_6126    :Tipo desconhecido
+STR_6127    :Arquivo: {STRING}
+STR_6128    :O arquivo não pode ser carregado pois alguns dos objetos referência dele estão faltando ou corrompidos. Uma lista desses objetos está disponível abaixo.
+STR_6129    :Copiar itens selecionados para o clipboard
+STR_6130    :Copiar lista inteira para o clipboard
 
 #############
 # Scenarios #
@@ -4810,8 +4886,20 @@ STR_DTLS    :
 # Rides/attractions # 
 #####################
 
+#RCT2
+[TOPSP1]
+STR_NAME    :Top Spin
+STR_DESC    :Passageiros brincam numa gôndola suspensa por grandes braços rotatórios, rodando de pernas para o ar para frente e para trás 
+STR_CPTY    :8 passageiros
+
 #WW
 [CONDORRD]
 STR_NAME    :Condor
-STR_DESC    :Montando em arreios especiais sob a pista, os passageiros experimentarão a sensação de voar pelo ar em uma estrutura na forma de Condor
+STR_DESC    :Montando em travas especiais sob a pista, os passageiros experimentarão a sensação de voar pelo ar em uma estrutura na forma de Condor
 STR_CPTY    :4 passageiros por carro
+
+#WW
+[CONGAEEL]
+STR_NAME    :Montanha-Russa Enguia Conger
+STR_DESC    :Uma montanha russa de aço compacta onde trens com formato de enguia viajam por parafusos e loops
+STR_CPTY    :4 passengers por carro

data/language/sv-SE.txt

@@ -1,3 +1,4 @@
+# Everyone is allowed to edit this document to benefit the language.
 # STR_XXXX part is read and XXXX becomes the string id number.
 # Everything after the colon and before the new line will be saved as the string.
 # Use # at the beginning of a line to leave a comment.
@@ -54,7 +55,7 @@ STR_0049    :Spökhuset
 STR_0050    :Första Hjälpen
 STR_0051    :Cirkusföreställning
 STR_0052    :Spöktåget
-STR_0053    :Hyper-snurr berg- och dalbana
+STR_0053    :Hyper- och dalbana
 STR_0054    :Berg- och dalbana i trä
 STR_0055    :Sidofriktion berg- och dalbana
 STR_0056    :Vilda Musen
@@ -71,7 +72,7 @@ STR_0066    :Okänd Åktur (40)
 STR_0067    :Vändberg- och dalbana
 STR_0068    :Skruvbana
 STR_0069    :Mini Golf
-STR_0070    :Giga-banan
+STR_0070    :Giga- och dalbana
 STR_0071    :Roto-Fall
 STR_0072    :Flygande Tefat
 STR_0073    :Lustiga Huset
@@ -1778,7 +1779,7 @@ STR_1773    :Bara en fotosektion tillåten per åktur
 STR_1774    :Bara en uppskjutskulle tillåten per åktur
 STR_1775    :Av
 STR_1776    :På
-STR_1777    :{WINDOW_COLOUR_2}Musik
+STR_1777    :{WINDOW_COLOUR_2}Åkturs-musik
 STR_1778    :{STRINGID} - - 
 STR_1779    :{INLINE_SPRITE}{254}{19}{00}{00} Pandadräkt
 STR_1780    :{INLINE_SPRITE}{255}{19}{00}{00} Tigerdräkt
@@ -1850,7 +1851,7 @@ STR_1845    :{MONTHYEAR}
 STR_1846    :{COMMA16} gäster
 STR_1847    :{INLINE_SPRITE}{11}{20}{00}{00}{COMMA16} gäster
 STR_1848    :{INLINE_SPRITE}{10}{20}{00}{00}{COMMA16} gäster
-STR_1849    :{WINDOW_COLOUR_2}Spela musik
+STR_1849    :{WINDOW_COLOUR_2}Spela musik{MOVE_X}{138}Tema till dekorationer	
 STR_1850    :{SMALLFONT}{BLACK}Välj om musik ska spelas på denna åktur
 STR_1851    :{WINDOW_COLOUR_2}Underhållskostnad: {BLACK}{CURRENCY2DP} per timme
 STR_1852    :{WINDOW_COLOUR_2}Underhållskostnad: {BLACK}Okänd
@@ -2744,7 +2745,7 @@ STR_2739    :Ingen
 STR_2740    :RollerCoaster Tycoon 1
 STR_2741    :RollerCoaster Tycoon 2
 STR_2742    :css50.dat hittades inte
-STR_2743    :Kopiera data\css17.dat från din RCT1-installation till data\css50.dat i din RCT2-installation.
+STR_2743    :Kopiera 'data/css17.dat' från din RCT1-installation till 'data/css50.dat' i din RCT2-installation eller kolla så att sökvägen till RCT1 i 'Diverse' fliken är korrekt.
 STR_2744    :[
 STR_2745    :\
 STR_2746    :]
@@ -3016,40 +3017,40 @@ STR_3008    :{PEARLAQUA}ABC
 STR_3009    :{PALESILVER}ABC
 STR_3010    :Kan inte ladda fil...
 STR_3011    :Filen innehåller ogiltig data
-STR_3012    :Dodgems beat (Dodgems beat)
+STR_3012    :Diskoteket{MOVE_X}{150}Abstrakt tema
-STR_3013    :Marknadsplatsorgel (Fairground organ)
+STR_3013    :Hästarnas vaggvisa
-STR_3014    :Romarriket (Roman fanfare)
+STR_3014    :Romarriket{MOVE_X}{150}Romanskt tema
-STR_3015    :Kina-Town (Oriental Style)
+STR_3015    :Chinatown{MOVE_X}{150}Pagod-tema
-STR_3016    :Det okända.. (Martian Style)
+STR_3016    :Det okända...{MOVE_X}{150}Rymd- och marstema
-STR_3017    :Djungelboken (Jungle drums)
+STR_3017    :Djungelboken{MOVE_X}{150}Djungeltema
-STR_3018    :Pyramiderna (Egyptian Style)
+STR_3018    :Pyramiderna{MOVE_X}{150}Egyptiskt tema
-STR_3019    :Leklandet (Toyland Style)
+STR_3019    :Leklandet{MOVE_X}{150}Underlandstema
 STR_3020    :
-STR_3021    :Rymden (Space Style)
+STR_3021    :Mörkret{MOVE_X}{150}Rymd- och marstema
-STR_3022    :Skräcken (Horror Style)
+STR_3022    :Frankenstein{MOVE_X}{150}Spök- och kräldjurstema
-STR_3023    :Techno (Techno Style)
+STR_3023    :Raveparty{MOVE_X}{150}Abstrakt tema
-STR_3024    :Mysteriet (Gentle Style)
+STR_3024    :Mysteriet
-STR_3025    :Sommartider (Summer Style)
+STR_3025    :Sommartider
-STR_3026    :Älven (Water Style)
+STR_3026    :Älven{MOVE_X}{150}Vattentema
-STR_3027    :Vilda västern (Wild west Style)
+STR_3027    :Skjutande Cowboys{MOVE_X}{150}Vilda västern-tema
-STR_3028    :Jurassic world (Jurassic Style)
+STR_3028    :Jurassic Park{MOVE_X}{150}Jurassic-tema
-STR_3029    :Rocka! (Rock 1)
+STR_3029    :Rocka!
-STR_3030    :Glade-Chapplie's Piano (Ragtime)
+STR_3030    :Glade-Chapplie's piano
-STR_3031    :Fantasin (Fantasy Style)
+STR_3031    :Ljuva drömmar
-STR_3032    :Rockare! (Rock 2)
+STR_3032    :Rockare!
-STR_3033    :Istiden (Ice style)
+STR_3033    :Istiden{MOVE_X}{150}Snö- och istema
-STR_3034    :Snön faller (Snow style)
+STR_3034    :Pudrade bergstoppar{MOVE_X}{150}Snö- och istema
-STR_3035    :Egen musik 1 (Custom music 1)
+STR_3035    :Egen musik 1
-STR_3036    :Egen musik 2 (Custom music 2)
+STR_3036    :Egen musik 2
-STR_3037    :Medeltidsmarknaden (Medieval style)
+STR_3037    :Medeltidsmarknaden{MOVE_X}{150}Medeltidstema
-STR_3038    :Stadslivet (Urban style)
+STR_3038    :Stadslivet{MOVE_X}{150}Stadstema
-STR_3039    :Ljusa orgeln (Organ style)
+STR_3039    :Kyrkans orgeln
-STR_3040    :Pumpande Mekare (Mechanical style)
+STR_3040    :Pumpande mekaniker{MOVE_X}{150}Mekaniktema
-STR_3041    :Luftäventyr (Modern style)
+STR_3041    :Luftäventyr
-STR_3042    :Sjörövare (Pirates style)
+STR_3042    :Sjörövare{MOVE_X}{150}Pirattema
-STR_3043    :Rockande! (Rock 3)
+STR_3043    :Rockande!
-STR_3044    :Gottegris (Candy style)
+STR_3044    :Gottegris{MOVE_X}{150}Godislandstema
-STR_3045    :{SMALLFONT}{BLACK}Välj musikstil som ska spelas
+STR_3045    :{SMALLFONT}{BLACK}Välj musikstil som ska spelas{NEWLINE}Teman på sånger och dekorationer går mixa utan problem
 STR_3046    :Denna åktur kan inte modifieras
 STR_3047    :Lokala myndigheter har förbjudit rivning och modifikation av denna Åktur
 STR_3048    :Kampanjer är förbjudna av lokala myndigheter
@@ -3612,7 +3613,7 @@ STR_5273    :{SMALLFONT}{BLACK}Stora Dekorationer
 STR_5274    :{SMALLFONT}{BLACK}Gångväg
 STR_5275    :Sök efter Objekt
 STR_5276    :Skriv in namnet på objektet du letar efter
-STR_5277    :Återbetala
+STR_5277    :Rensa
 STR_5278    :Sandlådeläge
 STR_5279    :Sandlådeläge av
 STR_5280    :{SMALLFONT}{BLACK}Tillåter ändring vid köp av mark genom Kartfönstret och andra inställningar som normalt är begränsat till Scenarioredigeraren
@@ -3759,13 +3760,13 @@ STR_5420    :Rotera{MOVE_X}{87}{COMMA16}
 STR_5421    :Zooma
 STR_5422    :Zooma{MOVE_X}{87}{COMMA16}
 STR_5423    :Vänta
-STR_5424    :Vänta{MOVE_X}{87}{COMMA16}
+STR_5424    :Vänta{MOVE_X}{87}{UINT16}
 STR_5425    :Börja om
 STR_5426    :Slut
 STR_5427    :Koordinater:
 STR_5428    :Moturs rotation:
 STR_5429    :Zoomnivå:
-STR_5430    :Sekunder att vänta:
+STR_5430    :Millisekunder att vänta:
 STR_5431    :Sparfil att ladda:
 STR_5432    :Kommando:
 STR_5433    :Titelsekvens
@@ -3792,7 +3793,7 @@ STR_5453    :Välj en annan åktur
 STR_5454    :Lås upp FPS
 STR_5455    :Aktivera Sandlådeläge
 STR_5456    :Placera föremål på varandra
-STR_5457    :Avaktivera Stödpelares Gränser
+STR_5457    :Ingen gräns för stödpelare
 STR_5458    :Rotera medurs
 STR_5459    :Rotera moturs
 STR_5460    :Rotera vyn moturs
@@ -4140,7 +4141,7 @@ STR_5832    :{SMALLFONT}{BLACK}Visa höjd som generella enheter istället för v
 STR_5833    :{SMALLFONT}{BLACK}Välj vilket datumformat du ska använda
 STR_5834    :{SMALLFONT}{BLACK}Välj vilken ljudenhet OpenRCT2 ska använda
 STR_5835    :{SMALLFONT}{BLACK}Tysta spelet om spelet tappar fokus
-STR_5836    :{SMALLFONT}{BLACK}Välj vilken musik som ska spelas på huvudmenyn.{NEWLINE}Val av RCT1 sången kräver att du kopierar 'data/css17.dat' från din RCT1-mapp till 'data/css50.dat' i din RCT2-mapp.
+STR_5836    :{SMALLFONT}{BLACK}Välj vilken musik som ska spelas på huvudmenyn.{NEWLINE}Val av RCT1 sången kräver att du kopierar 'data/css17.dat' från din RCT1-mapp till 'data/css50.dat' i din RCT2-mapp eller kolla så att sökvägen till RCT1 i 'Diverse' fliken är korrekt.
 STR_5837    :{SMALLFONT}{BLACK}Skapa och hantera egna UI-teman
 STR_5838    :{SMALLFONT}{BLACK}Visa en knapp för 'finans'-fönstret i verktygsfältet
 STR_5839    :{SMALLFONT}{BLACK}Visa en knapp för 'forskning & utveckling'-fönstret i verktygsfältet
@@ -4164,7 +4165,7 @@ STR_5856    :{SMALLFONT}{BLACK}Sätter spelets upplösning när du spelar i full
 STR_5857    :{SMALLFONT}{BLACK}Spelinställningar
 STR_5858    :{SMALLFONT}{BLACK}Använd GPU för grafiken istället för CPU. Ökar kompatibiliteten med skärminspelningsprogram som till exempel Fraps{NEWLINE}Kan försämra prestandan lite grand
 STR_5859    :{SMALLFONT}{BLACK}Aktiverar 'frame tweening' för en visuellt mjukare spelupplevelse.{NEWLINE}Om avaktiverad kommer spelet köras i 40 fps.
-STR_5860    :Växla mellan spelets originala/omskrivna spår på karuseller
+STR_5860    :Växla original/omskrivna koden för texturer 
 STR_5861    :Nyckelverifiering misslyckades.
 STR_5862    :Blockera okända spelare.
 STR_5863    :{SMALLFONT}{BLACK}Tillåt endast spelare med kända nycklar att ansluta.
@@ -4293,7 +4294,7 @@ STR_5985    :Ny mapp
 STR_5986    :Skriv in namnet på den nya mappen.
 STR_5987    :Kan inte skapa mappen
 STR_5988    :{SMALLFONT}{BLACK}Ingen mer mark till salu
-STR_5989    :{SMALLFONT}{BLACK}Inga mer bygglov till salu
+STR_5989    :{SMALLFONT}{BLACK}Inget mer bygglov till salu
 STR_5990    :{SMALLFONT}{BLACK}Ingen mer mark eller bygglov till salu
 STR_5991    :Kan inte klistra in ämnet...
 STR_5992    :Kartan har nått sin gräns
@@ -4301,8 +4302,8 @@ STR_5993    :{SMALLFONT}{BLACK}Kopiera valda ämne
 STR_5994    :{SMALLFONT}{BLACK}Klistra in kopierat ämne
 STR_5995    :Booster
 STR_5996    :Booster hastighet
-STR_5997    :Lägg till/Välj summa pengar
+STR_5997    :Addera/Välj summa pengar
-STR_5998    :Lägg till summa pengar
+STR_5998    :Addera pengar
 STR_5999    :Välj summa pengar
 STR_6000    :Skriv in nytt värde
 STR_6001    :Aktivera ljuseffekter (experiment)
@@ -4310,10 +4311,10 @@ STR_6002    :{SMALLFONT}{BLACK}Lampor och åkturer kommer lysa upp i natten.{NEW
 STR_6003    :Avskärnings-vy
 STR_6004    :Avskärnings-vy
 STR_6005    :Aktivera Avskärnings-vy
-STR_6006    :{SMALLFONT}{BLACK}Avskärnings-vyn kommer endast visa element på eller under den avskurna höjden
+STR_6006    :{SMALLFONT}{BLACK}Avskärnings-vyn kommer endast visa element på eller under den avskurna höjden, allt ovanför blir dolt
-STR_6007    :Avskärnings-höjd
+STR_6007    :Höjd
 STR_6008    :{SMALLFONT}{BLACK}Klicka för att växla råa-värden<->värden i måttenheter
-STR_6009    :{SMALLFONT}{BLACK}Välj avskärnings-höjd
+STR_6009    :{SMALLFONT}{BLACK}Välj höjd på avskärning
 STR_6010    :{COMMA2DP32}m
 STR_6011    :{COMMA1DP16}ft
 STR_6012    :{COMMA1DP16}
@@ -4327,7 +4328,7 @@ STR_6019    :Åkturkonstruktion - Sväng höger
 STR_6020    :Åkturkonstruktion - Rakt spår
 STR_6021    :Åkturkonstruktion - Lutning nedåt
 STR_6022    :Åkturkonstruktion - Lutning uppåt
-STR_6023    :Åkturkonstruktion - Växla kjedjelyft
+STR_6023    :Åkturkonstruktion - Växla lyftkjedjor
 STR_6024    :Åkturkonstruktion - Lutning vänster
 STR_6025    :Åkturkonstruktion - Lutning höger
 STR_6026    :Åkturkonstruktion - Föregående spår
@@ -4337,10 +4338,104 @@ STR_6029    :Åkturkonstruktion - Riv valda spår
 STR_6030    :{SMALLFONT}{BLACK}Dekorations-väljaren. Klicka på en dekoration på kartan för att välja samma del för konstruktion.
 STR_6031    :Server Beskrivning:
 STR_6032    :Server Hälsning:
-
+STR_6033    :Sökvägen till RCT1-mappen:
+STR_6034    :{SMALLFONT}{BLACK}{STRING}
+STR_6035    :Vänligen välj installationsmappen för RCT1
+STR_6036    :{SMALLFONT}{BLACK}Rensa
+STR_6037    :Vänligen välj en giltig sökväg till RCT1-mappen
+STR_6038    :{SMALLFONT}{BLACK}Om du har RCT1-installerat, navigera till den mappen för att ladda scenarion, musik, m.m.
 STR_6039    :{SMALLFONT}{BLACK}Demolera attraktioner snabbt
-STR_6040    :Redigera scenario inställningar
+STR_6040    :Redigera scenario-inställningar
-STR_6041    :{BLACK}Inga mekaniker är anställda! 
+STR_6041    :{BLACK}Inga mekaniker är anställda!
+STR_6042    :Ladda höjdkarta
+STR_6043    :Välj höjdkarta
+STR_6044    :Utjämna höjdkarta
+STR_6045    :Styrka
+STR_6046    :Normalisera höjdkarta
+STR_6047    :Utjämna rutor
+STR_6048    :Fel med höjdkarta 
+STR_6049    :Fel vid inläsning av PNG
+STR_6050    :Fel vid inläsning av bitmap
+STR_6051    :Höjden och bredden måste vara lika
+STR_6052    :Höjdkartan är för stor och kommer skäras av
+STR_6053    :Höjdkartan kan inte normaliseras
+STR_6054    :Endast 24-bit bitmaps stöds
+STR_6055    :OpenRCT2 Höjdkart-filer
+STR_6056    :{SMALLFONT}{BLACK}Tysta
+STR_6057    :{SMALLFONT}{BLACK}Visa en knapp för att 'Tysta' spelet i verktygsfältet
+STR_6058    :Tysta
+STR_6059    :{RIGHTGUILLEMET}
+STR_6060    :Visa animation när gäster spenderar pengar
+STR_6061    :{SMALLFONT}{BLACK}Visar en animerad effekt när gästerna gör ett köp.
+STR_6062    :{OUTLINE}{GREEN}+ {CURRENCY2DP}
+STR_6063    :{OUTLINE}{RED}- {CURRENCY2DP}
+STR_6064    :Ta all mark
+STR_6065    :Logga handlingar på användare
+STR_6066    :{SMALLFONT}{BLACK}Loggar allt användarna gör i multiplayer till filer i 'dina dokument'
+STR_6067    :Server startade.
+STR_6068    :Server avslutades.
+STR_6069    :{STRING} vart kickad från servern av {STRING}.
+STR_6070    :{STRING} fick grupp-behörigheten '{STRING}' av {STRING}.
+STR_6071    :{STRING} skapade en ny grupp-behörighet '{STRING}'.
+STR_6072    :{STRING} tog bort grupp-behörigheten '{String}'.
+STR_6073    :{STRING} redigerade behörigheterna på gruppen '{String}'.
+STR_6074    :{STRING} ändrade namn på grupp-behörigheten '{String}' till '{String}'.
+STR_6075    :{STRING} ändrade standardgruppen till '{String}'.
+STR_6076    :{STRING} använde/växlade fusk '{STRING}'.
+STR_6077    :Pengarna ändrades
+STR_6078    :{STRING} skapade åktur '{STRING}'.
+STR_6079    :{STRING} demolerade åktur '{STRING}'.
+STR_6080    :{STRING} ändrade utseendet på åktur '{STRING}'.
+STR_6081    :{STRING} ändrade status på åktur '{STRING}' till stängd.
+STR_6082    :{STRING} ändrade status på åktur '{STRING}' till öppen.
+STR_6083    :{STRING} ändrade status på åktur '{STRING}' till testa.
+STR_6084    :{STRING} ändrade vagnarnas inställningar på åktur '{STRING}'.
+STR_6085    :{STRING} ändrade inställningar på åkturen '{STRING}'.
+STR_6086    :{STRING} döpte om åktur '{STRING}' till '{STRING}'.
+STR_6087    :{STRING} ändrade priset på åktur '{STRING}' till {STRING}
+STR_6088    :{STRING} ändrade sekundära priset på åktur '{STRING}' till {STRING}
+STR_6089    :{STRING} ändrade parkens namn från '{STRING}' till '{STRING}'.
+STR_6090    :{STRING} öppnade parken.
+STR_6091    :{STRING} stängde parken.
+STR_6092    :{STRING} ändrade parkens biljettpris till {STRING}
+STR_6093    :{STRING} placerade en ny dekoration.
+STR_6094    :{STRING} tog bort dekoration.
+STR_6095    :{STRING} redigerade dekoration.
+STR_6096    :{STRING} valde namn '{STRING}' på en skylt .
+STR_6097    :{STRING} placerade ett spår på åkturen '{STRING}'.
+STR_6098    :{STRING} tog bort ett spår av en åktur.
+STR_6099    :Du anslöt till servern.
+STR_6100    :Du lämnade servern.
+STR_6101    :Åkturer minskar aldrig i värde 
+STR_6102    :{SMALLFONT}{BLACK}Värdet på åkturer minskar inte vid längre perioder, så gäster kommer inte tycka den helt plötsligt är för dyr.
+STR_6103    :{SMALLFONT}{BLACK}Denna inställning är avaktiverad i multiplayer.
+STR_6104    :Korkskruvs berg- och dalbana
+STR_6105    :Hyper berg- och dalbana
+STR_6106    :Bilåktur
+STR_6107    :Monster Truckar
+STR_6108    :Snurr berg- och dalbana
+STR_6109    :Hyper berg- och dalbana
+STR_6110    :Junior berg- och dalbana
+STR_6111    :Klassisk mini berg- och dalbana
+STR_6112    :En kompakt stål berg- och dalbana där tågen åker längs korkskruvar och loopar
+STR_6113    :En hög berg- och dalbana som inte vänder på sig med stora dropp, höga hastigheter, och bekväma tåg med endast säkerhetsbygel runt midjan
+STR_6114    :Passagerare åker sakta i motoriserade fordon på en spår-baserad väg
+STR_6115    :Motoriserade gigantiska 4 x 4 truckar som kan klättra över stora stockar
+STR_6116    :Bred berg- och dalbana tåg som glider efter ett mjukt stålspår, rusande genom en variation av inversioner
+STR_6117    :Sittandes i bekväma vagnar med endast säkerhetsbygel runt midjan njuter passagerare av enorma nedförsbackar och spännande svängar, samt mycket tid flygandes över topparna
+STR_6118    :En snäll berg- och dalbana för de som inte har mod nog att utmana större åkturer
+STR_6119    :En simpel och billig berg- och dalbana, men med en begränsad höjd
+STR_6120    :{BABYBLUE}Nya fordon är nu tillgängliga för {STRINGID}:{NEWLINE}{STRINGID}
+STR_6121    :{SMALLFONT}{BLACK}Utökar marken i parken hela vägen till kanterna av kartan
+STR_6122    :Det finns inte nog många berg- och dalbanor i detta scenario!
+STR_6123    :Fel vid inläsning av objekt för parken
+STR_6124    :Objektnamn
+STR_6125    :Objekttyp
+STR_6126    :Okänd typ
+STR_6127    :Fil: {STRING}
+STR_6128    :Filen kunde inte laddas eftersom objekt som filen hänvisar till saknas eller är skadade. En lista med dessa objekt visas nedanför.
+STR_6129    :Kopiera valda föremål till urklipp
+STR_6130    :Kopiera hela listan till urklipp
 
 #############
 # Scenarion #
@@ -4794,5 +4889,15 @@ STR_NAME    :Kondorhjulet
 STR_DESC    :Åkandes i speciella byglar under spåret känner passagerarna känslan av flygning när de sveper genom luften i kondorformade vagnar
 STR_CPTY    :4 passagerare per vagn
 
+##############
+# RCT Object #
+##############
+
+[SCGWWEST]
+STR_NAME    :Vilda västern-tema
+
+[SCGGIANT]
+STR_NAME    :Jätte trädgårds-tema
 
 #Maintainer: Nubbie
+#Everyone is allowed to edit this document

data/language/zh-CN.txt

@@ -3768,21 +3768,21 @@ STR_5420    :Rotate{MOVE_X}{87}{COMMA16}
 STR_5421    :放大
 STR_5422    :放大{MOVE_X}{87}{COMMA16}
 STR_5423    :等待
-STR_5424    :等待{MOVE_X}{87}{COMMA16}
+STR_5424    :等待{MOVE_X}{87}{UINT16}
 STR_5425    :重新开始
 STR_5426    :结束
 STR_5427    :坐标:
-STR_5428    :Anticlockwise rotations:
+STR_5428    :逆时针旋转次数:
 STR_5429    :放大级别:
 STR_5430    :等待秒数:
 STR_5431    :要读取的存档:
 STR_5432    :命令:
 STR_5433    :Title Sequences
-STR_5434    :Command Editor
+STR_5434    :命令编辑器
-STR_5435    :Rename save
+STR_5435    :重命名存档
 STR_5436    :编辑主菜单动画...
 STR_5437    :暂无存档被选中
-STR_5438    :Can't make changes while command editor is open
+STR_5438    :当命令编辑器打开时不能做出改变
 STR_5439    :A wait command with at least 4 seconds is required with a restart command
 STR_5440    :当焦点失去时最小化全屏幕的游戏
 STR_5441    :{SMALLFONT}{BLACK}根据轨道类型区分游乐设施{NEWLINE}使得车辆类型可以在建造后更改{NEWLINE}(过山车大亨1行为).
@@ -3790,9 +3790,9 @@ STR_5442    :Force park rating:
 STR_5443    :速度{MOVE_X}{87}{STRINGID}
 STR_5444    :速度:
 STR_5445    :速度
-STR_5446    :Get
+STR_5446    :取得
-STR_5447    :Type {STRINGID}
+STR_5447    :类型 {STRINGID}
-STR_5448    :Ride / Vehicle {STRINGID}
+STR_5448    :游乐设施/车辆 {STRINGID}
 STR_5449    :减慢游戏速度
 STR_5450    :加快游戏速度
 STR_5451    :打开作弊窗口
@@ -3819,6 +3819,7 @@ STR_5471    :向下滚动地图
 STR_5472    :向右滚动地图
 STR_5473    :日夜循环
 STR_5474    :横幅上显示全大写英文
+STR_5475    :{COMMA16} weeks
 STR_5476    :硬件
 STR_5477    :地图显示
 STR_5478    :控制
@@ -3858,7 +3859,7 @@ STR_5511    :(UNKNOWN)
 STR_5512    :另存游戏
 STR_5513    :(快速)保存游戏
 STR_5514    :禁止故意破坏
-STR_5515    :{SMALLFONT}{BLACK}Stops guests from vandalising your park when they're angry
+STR_5515    :{SMALLFONT}{BLACK}游客愤怒时阻止其可以毁坏公物
 STR_5516    :{SMALLFONT}{BLACK}黑色
 STR_5517    :{SMALLFONT}{BLACK}灰色
 STR_5518    :{SMALLFONT}{BLACK}白色
@@ -3909,17 +3910,17 @@ STR_5562    :警告！
 STR_5563    :此功能暂未稳定地使用，请多加留意.
 STR_5564    :插入已损坏元素
 STR_5565    :{SMALLFONT}{BLACK}在一个网格的最上插入一个已损坏的地图元素.此插入会隐藏其他元素.
-STR_5566    :Password:
+STR_5566    :密码:
 STR_5567    :Advertise
-STR_5568    :Password Required
+STR_5568    :需要密码
-STR_5569    :This server requires a password
+STR_5569    :此服务器需要密码
 STR_5570    :Fetch Servers
-STR_5571    :Join Game
+STR_5571    :加入游戏
-STR_5572    :Add To Favourites
+STR_5572    :添加至收藏
-STR_5573    :Remove From Favourites
+STR_5573    :从收藏中去除
-STR_5574    :Server Name:
+STR_5574    :服务器名称:
-STR_5575    :Max Players:
+STR_5575    :最大人数:
-STR_5576    :Port:
+STR_5576    :端口:
 STR_5577    :韩元 (W)
 STR_5578    :卢布 (R)
 STR_5579    :窗口缩放比例:
@@ -3957,11 +3958,11 @@ STR_5610    :{SMALLFONT}{BLACK}移除选中的地图元素. 使用时请注意.
 STR_5611    :G
 STR_5612    :{SMALLFONT}{BLACK}Ghost flag
 STR_5613    :B
-STR_5614    :{SMALLFONT}{BLACK}Broken flag
+STR_5614    :{SMALLFONT}{BLACK}损坏标记
 STR_5615    :L
-STR_5616    :{SMALLFONT}{BLACK}Last element for tile flag
+STR_5616    :{SMALLFONT}{BLACK}网格标记的最后一个元素
-STR_5617    :{SMALLFONT}{BLACK}Move selected element up.
+STR_5617    :{SMALLFONT}{BLACK}将选中的元素移至上方.
-STR_5618    :{SMALLFONT}{BLACK}Move selected element down.
+STR_5618    :{SMALLFONT}{BLACK}将选中的元素移至下方.
 STR_5619    :过山车大亨
 STR_5620    :过山车大亨：快乐天地
 STR_5621    :过山车大亨：极限反转
@@ -4075,7 +4076,7 @@ STR_5759    :下载地图中 ... ({INT32} / {INT32}) KB
 STR_5760    :港币 (HK$)
 STR_5761    :新台币 (NT$)
 STR_5762    :人民币 (CN{YEN})
-STR_5763    :All files
+STR_5763    :所有文件
 STR_5764    :不正确的游乐设施类型
 STR_5765    :无法修改类型不正确的游乐设施
 STR_5766    :<available string id>
@@ -4347,6 +4348,7 @@ STR_6030    :{SMALLFONT}{BLACK}景物选择器. 点击地图上任意景物来
 STR_6031    :服务器描述:
 STR_6032    :服务器欢迎信息:
 STR_6033    :过山车大亨1安装路径:
+STR_6034    :{SMALLFONT}{BLACK}{STRING}
 STR_6035    :请选择你的过山车大亨1的目录
 STR_6036    :{SMALLFONT}{BLACK}清除
 STR_6037    :请选择一个有效的过山车大亨1的目录
@@ -4354,6 +4356,24 @@ STR_6038    :{SMALLFONT}{BLACK}如果你安装了过山车大亨1, 设置此选
 STR_6039    :{SMALLFONT}{BLACK}快速拆除游乐设施
 STR_6040    :编辑剧情选项
 STR_6041    :{BLACK}没有雇佣机械师! 
+STR_6042    :载入高度图
+STR_6043    :选择高度图
+STR_6044    :平滑高度图
+STR_6045    :强度
+STR_6046    :归一化高度图
+STR_6047    :平滑网格
+STR_6048    :高度图错误
+STR_6049    :PNG读取错误
+STR_6050    :位图读取错误
+STR_6051    :宽度和高度需要相匹配
+STR_6052    :此高度图过大, 将被切开
+STR_6053    :此高度图不能被归一化
+STR_6054    :只支持24位的位图
+STR_6055    :OpenRCT2高度图文件
+STR_6056    :{SMALLFONT}{BLACK}静音
+STR_6057    :{SMALLFONT}{BLACK}在工具栏为静音选项显示一个单独的按钮
+STR_6058    :静音
+
 
 
 

data/language/zh-TW.txt

@@ -1554,32 +1554,32 @@ STR_1548    :
 STR_1549    :
 STR_1550    :{SMALLFONT}{OPENQUOTES}嘩!{ENDQUOTES}
 STR_1551    :{SMALLFONT}{OPENQUOTES}奇怪, 我覺得有人在悄悄地監視我{ENDQUOTES}
-STR_1552    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一個氣球{ENDQUOTES}
+STR_1552    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一個氣球{ENDQUOTES}
-STR_1553    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一隻毛公仔{ENDQUOTES}
+STR_1553    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一隻毛公仔{ENDQUOTES}
-STR_1554    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一份樂園地圖{ENDQUOTES}
+STR_1554    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一份樂園地圖{ENDQUOTES}
-STR_1555    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一張即時照片{ENDQUOTES}
+STR_1555    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一張即時照片{ENDQUOTES}
-STR_1556    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一把雨傘{ENDQUOTES}
+STR_1556    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一把雨傘{ENDQUOTES}
-STR_1557    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一杯飲料{ENDQUOTES}
+STR_1557    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一杯飲料{ENDQUOTES}
-STR_1558    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一個漢堡{ENDQUOTES}
+STR_1558    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一個漢堡{ENDQUOTES}
-STR_1559    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一客薯條{ENDQUOTES}
+STR_1559    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一客薯條{ENDQUOTES}
-STR_1560    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一個冰淇淋{ENDQUOTES}
+STR_1560    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一個冰淇淋{ENDQUOTES}
-STR_1561    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一球棉花糖{ENDQUOTES}
+STR_1561    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一球棉花糖{ENDQUOTES}
 STR_1562    :
 STR_1563    :
 STR_1564    :
-STR_1565    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一件批薩{ENDQUOTES}
+STR_1565    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一件批薩{ENDQUOTES}
 STR_1566    :
-STR_1567    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一客爆米花{ENDQUOTES}
+STR_1567    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一客爆米花{ENDQUOTES}
-STR_1568    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一隻熱狗{ENDQUOTES}
+STR_1568    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一隻熱狗{ENDQUOTES}
-STR_1569    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一隻觸手{ENDQUOTES}
+STR_1569    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一隻觸手{ENDQUOTES}
-STR_1570    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一頂帽子{ENDQUOTES}
+STR_1570    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一頂帽子{ENDQUOTES}
-STR_1571    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一個太妃蘋果糖{ENDQUOTES}
+STR_1571    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一個太妃蘋果糖{ENDQUOTES}
-STR_1572    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一件T恤{ENDQUOTES}
+STR_1572    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一件T恤{ENDQUOTES}
-STR_1573    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一件甜甜圈{ENDQUOTES}
+STR_1573    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一件甜甜圈{ENDQUOTES}
-STR_1574    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一杯咖啡{ENDQUOTES}
+STR_1574    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一杯咖啡{ENDQUOTES}
 STR_1575    :
-STR_1576    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一客炸雞{ENDQUOTES}
+STR_1576    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一客炸雞{ENDQUOTES}
-STR_1577    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一杯檸檬水{ENDQUOTES}
+STR_1577    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一杯檸檬水{ENDQUOTES}
 STR_1578    :
 STR_1579    :
 STR_1580    :
@@ -1618,27 +1618,27 @@ STR_1612    :
 STR_1613    :
 STR_1614    :
 STR_1615    :
-STR_1616    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一張即時照片{ENDQUOTES}
+STR_1616    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一張即時照片{ENDQUOTES}
-STR_1617    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一張即時照片{ENDQUOTES}
+STR_1617    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一張即時照片{ENDQUOTES}
-STR_1618    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一張即時照片{ENDQUOTES}
+STR_1618    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一張即時照片{ENDQUOTES}
-STR_1619    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一件椒鹽卷餅{ENDQUOTES}
+STR_1619    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一件椒鹽卷餅{ENDQUOTES}
-STR_1620    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一杯熱巧克力{ENDQUOTES}
+STR_1620    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一杯熱巧克力{ENDQUOTES}
-STR_1621    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一杯冰紅茶{ENDQUOTES}
+STR_1621    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一杯冰紅茶{ENDQUOTES}
-STR_1622    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一個漏斗蛋糕{ENDQUOTES}
+STR_1622    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一個漏斗蛋糕{ENDQUOTES}
-STR_1623    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一副太陽眼鏡{ENDQUOTES}
+STR_1623    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一副太陽眼鏡{ENDQUOTES}
-STR_1624    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一份牛肉麵{ENDQUOTES}
+STR_1624    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一份牛肉麵{ENDQUOTES}
-STR_1625    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一份炒米粉{ENDQUOTES}
+STR_1625    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一份炒米粉{ENDQUOTES}
-STR_1626    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一客湯雲吞{ENDQUOTES}
+STR_1626    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一客湯雲吞{ENDQUOTES}
-STR_1627    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一客肉丸湯{ENDQUOTES}
+STR_1627    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一客肉丸湯{ENDQUOTES}
-STR_1628    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一杯果汁{ENDQUOTES}
+STR_1628    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一杯果汁{ENDQUOTES}
-STR_1629    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一杯豆漿{ENDQUOTES}
+STR_1629    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一杯豆漿{ENDQUOTES}
-STR_1630    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一杯水正果{ENDQUOTES}
+STR_1630    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一杯水正果{ENDQUOTES}
-STR_1631    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一件潛艇三文治{ENDQUOTES}
+STR_1631    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一件潛艇三文治{ENDQUOTES}
-STR_1632    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一件曲奇{ENDQUOTES}
+STR_1632    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一件曲奇{ENDQUOTES}
 STR_1633    :
 STR_1634    :
 STR_1635    :
-STR_1636    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢去{STRINGID}購買一條烤香腸{ENDQUOTES}
+STR_1636    :{SMALLFONT}{OPENQUOTES}我不會花這麼多錢在{STRINGID}購買一條烤香腸{ENDQUOTES}
 STR_1637    :
 STR_1638    :
 STR_1639    :
@@ -3764,7 +3764,7 @@ STR_5420    :旋轉{MOVE_X}{87}{COMMA16}
 STR_5421    :放大
 STR_5422    :放大{MOVE_X}{87}{COMMA16}
 STR_5423    :等候
-STR_5424    :等候{MOVE_X}{87}{COMMA16}
+STR_5424    :等候{MOVE_X}{87}{UINT16}
 STR_5425    :重新開始
 STR_5426    :結束
 STR_5427    :座標:
@@ -4365,6 +4365,81 @@ STR_6052    :此高度點陣圖太大, 將被切割
 STR_6053    :此高度點陣圖不能進行平均化
 STR_6054    :只支援24位元的點陣圖
 STR_6055    :OpenRCT2 高度點陣圖檔案
+STR_6056    :{SMALLFONT}{BLACK}靜音
+STR_6057    :{SMALLFONT}{BLACK}在工具列上顯示單獨的靜音按鈕
+STR_6058    :靜音
+STR_6059    :{RIGHTGUILLEMET}
+STR_6060    :遊客購買東西時顯示動畫
+STR_6061    :{SMALLFONT}{BLACK}當遊客購買東西時{NEWLINE}顯示金錢動畫效果.
+STR_6062    :{OUTLINE}{GREEN}+ {CURRENCY2DP}
+STR_6063    :{OUTLINE}{RED}- {CURRENCY2DP}
+STR_6064    :擁有所有土地
+STR_6065    :記錄用戶操作
+STR_6066    :{SMALLFONT}{BLACK}記錄所有用戶的操作到你的使用者文件夾中.
+STR_6067    :伺服器已啟動.
+STR_6068    :伺服器關閉中.
+STR_6069    :{STRING} 已被 {STRING} 踢除於本伺服器外.
+STR_6070    :{STRING} 被設置成為組別 '{STRING}'的成員, 為 {STRING} 的設置.
+STR_6071    :{STRING} 已建立新的玩家組別 '{STRING}'.
+STR_6072    :{STRING} 刪除了玩家組別 '{String}'.
+STR_6073    :{STRING} 編輯了有關玩家組別 '{String}'的權限.
+STR_6074    :{STRING} 編輯了玩家組別的名字, 由 '{String}' 重新命名為 '{String}'.
+STR_6075    :{STRING} 設置了預設玩家組別為  '{String}'.
+STR_6076    :{STRING} 使用/開啟了密技 '{STRING}'.
+STR_6077    :添加金錢
+STR_6078    :{STRING} 建造了遊樂設施 '{STRING}'.
+STR_6079    :{STRING} 拆除了遊樂設施 '{STRING}'.
+STR_6080    :{STRING} changed the appearance of ride '{STRING}'.
+STR_6081    :{STRING} changed the status of ride '{STRING}' to closed.
+STR_6082    :{STRING} changed the status of ride '{STRING}' to open.
+STR_6083    :{STRING} changed the status of ride '{STRING}' to testing.
+STR_6084    :{STRING} changed the vehicle settings of ride '{STRING}'.
+STR_6085    :{STRING} changed the ride settings of ride '{STRING}'.
+STR_6086    :{STRING} renamed the ride '{STRING}' to '{STRING}'.
+STR_6087    :{STRING} changed the price of ride '{STRING}' to {STRING}
+STR_6088    :{STRING} changed the secondary price of ride '{STRING}' to {STRING}
+STR_6089    :{STRING} renamed the park from '{STRING}' to '{STRING}'.
+STR_6090    :{STRING} opened the park.
+STR_6091    :{STRING} closed the park.
+STR_6092    :{STRING} changed the park entrance fee to {STRING}
+STR_6093    :{STRING} placed new scenery.
+STR_6094    :{STRING} removed scenery.
+STR_6095    :{STRING} edited scenery.
+STR_6096    :{STRING} set sign name to '{STRING}'.
+STR_6097    :{STRING} placed a track of ride '{STRING}'.
+STR_6098    :{STRING} removed a track of ride.
+STR_6099    :你已連接到伺服器.
+STR_6100    :你已由伺服器中斷線.
+STR_6101    :遊樂設施的價值不會因隨時間下降
+STR_6102    :{SMALLFONT}{BLACK}遊樂設施的價值再不會因隨時間下降, 因此遊客並不會突然有'不想花那麼多錢乘坐某個遊樂設施'的想法.
+STR_6103    :{SMALLFONT}{BLACK}此選項於多人模式下被禁用.
+STR_6104    :Corkscrew Roller Coaster
+STR_6105    :Hypercoaster
+STR_6106    :Car Ride
+STR_6107    :Monster Trucks
+STR_6108    :Steel Twister
+STR_6109    :Hyper-Twister
+STR_6110    :Junior Roller Coaster
+STR_6111    :Classic Mini Roller Coaster
+STR_6112    :A compact steel-tracked roller coaster where the train travels through corkscrews and loops
+STR_6113    :A tall non-inverting roller coaster with large drops, high speed, and comfortable trains with only lap bar restraints
+STR_6114    :Riders travel slowly in powered vehicles along a track-based route
+STR_6115    :Powered giant 4 x 4 trucks which can climb steep slopes
+STR_6116    :Wide roller coaster trains glide along smooth steel track, traveling through a variety of inversions
+STR_6117    :Sitting in comfortable trains with only simple lap restraints riders enjoy giant smooth drops and twisting track as well as plenty of 'air time' over the hills
+STR_6118    :A gentle roller coaster for people who haven't yet got the courage to face the larger rides
+STR_6119    :A cheap and easy to build roller coaster, but with a limited height
+STR_6120    :{BABYBLUE}全新車廂種類可供使用於{STRINGID}:{NEWLINE}{STRINGID}
+STR_6121    :{SMALLFONT}{BLACK}擴張樂園的土地擁有權到整個地圖的邊界
+STR_6122    :此劇情沒有足夠的雲霄飛車!
+STR_6123    :樂園需要的物件載入錯誤
+STR_6124    :物件名稱
+STR_6125    :物件類別
+STR_6126    :未知類別
+STR_6127    :檔案: {STRING}
+STR_6128    :因為文件內需要的物件可能已損壞或遺失, 此樂園無法載入. 以下是那些物件的列表:
+STR_6129    :複製選中的物件到剪貼簿
+STR_6130    :複製整個清單到到剪貼簿
 
 #############
 # Scenarios #
@@ -4379,7 +4454,7 @@ STR_DTLS    :在隱藏於森林深處的清空範圍中, 建造一個很受歡
 <Dynamite Dunes>
 STR_SCNR    :Dynamite Dunes
 STR_PARK    :Dynamite Dunes
-STR_DTLS    :這個座立於沙漠中的樂園只有一座雲霄飛車, 但不缺乏可供擴充的位置
+STR_DTLS    :這個座立於沙漠中的樂園只有一座雲霄飛車, 但不缺乏可供擴充的區域
 
 <Leafy Lake>
 STR_SCNR    :Leafy Lake
@@ -4507,9 +4582,9 @@ STR_SCNR    :Funtopia
 STR_PARK    :Funtopia
 STR_DTLS    :這個被一條高速公路所分開的樂園已擁有幾個已在運行的遊樂設施
 
-<Haunted Harbor>
+<Haunted Harbour>
-STR_SCNR    :Haunted Harbor
+STR_SCNR    :Haunted Harbour
-STR_PARK    :Haunted Harbor
+STR_PARK    :Haunted Harbour
 STR_DTLS    :當地政府已同意將鄰近的土地以低廉的價格販賣給這個小型海邊樂園, 但條件是要保留某些遊樂設施
 
 <Fun Fortress>
@@ -4580,52 +4655,52 @@ STR_DTLS    :以添加遊樂設施及雲霄飛車發展這個羅馬主題的樂
 <Swamp Cove>
 STR_SCNR    :Swamp Cove
 STR_PARK    :Swamp Cove
-STR_DTLS    :Built partly on a series of small islands, this park already has a pair of large roller coasters as its centerpiece
+STR_DTLS    :此樂園已經有一對建造在數個小島嶼上的巨型雲霄飛車作為它的靈魂
 
 <Adrenaline Heights>
 STR_SCNR    :Adrenaline Heights
 STR_PARK    :Adrenaline Heights
-STR_DTLS    :Build a park to appeal to the high-intensity thrill-seeking local people
+STR_DTLS    :建造一個能吸引喜好高刺激度遊樂設施的當地遊客前往的樂園
 
 <Utopia Park>
 STR_SCNR    :Utopia Park
 STR_PARK    :Utopia Park
-STR_DTLS    :An oasis in the middle of the desert provides an unusual opportunity to build an amusement park
+STR_DTLS    :一個沙漠中的綠洲帶來了一個非比尋常的機會去建造一個主題樂園
 
 <Rotting Heights>
 STR_SCNR    :Rotting Heights
 STR_PARK    :Rotting Heights
-STR_DTLS    :Overgrown and dilapidated, can you resurrect this once-great amusement park?
+STR_DTLS    :你能拯救這個曾經輝煌過, 但現殘破又雜草叢生的主題樂園嗎?
 
 <Fiasco Forest>
 STR_SCNR    :Fiasco Forest
 STR_PARK    :Fiasco Forest
-STR_DTLS    :Full of badly designed and dangerous rides, you have a very limited budget and time to fix the problems and turn the park around
+STR_DTLS    :你只有非常有限的資金及時間去修復這一個充滿不同劣質設計及非常危險的遊樂設施的樂園
 
 <Pickle Park>
 STR_SCNR    :Pickle Park
 STR_PARK    :Pickle Park
-STR_DTLS    :The local authority will not allow any kind of advertising or promotion, so this park must succeed by reputation only
+STR_DTLS    :當地政府並不准許任何營銷活動, 所以這個樂園必須要以名譽來達至成功
 
 <Giggle Downs>
 STR_SCNR    :Giggle Downs
 STR_PARK    :Giggle Downs
-STR_DTLS    :A four lane steeplechase ride is the centerpiece of this expanding park
+STR_DTLS    :四座馬術障礙賽式雲霄飛車是這個需要擴張的樂園的靈魂
 
 <Mineral Park>
 STR_SCNR    :Mineral Park
 STR_PARK    :Mineral Park
-STR_DTLS    :Turn this abandoned stone quarry into a place to attract thrill-seeking tourists
+STR_DTLS    :將這個已廢棄的石礦轉型成一個能夠吸引喜好剌激的遊客前往的地方
 
 <Coaster Crazy>
 STR_SCNR    :Coaster Crazy
 STR_PARK    :Coaster Crazy
-STR_DTLS    :You have limited funds but unlimited time to turn this mountainside area into a vast roller coaster park
+STR_DTLS    :你擁有有限的金錢但無限的時間來將這個山區轉變成一個巨大的雲霄飛車樂園
 
 <Urban Park>
 STR_SCNR    :Urban Park
 STR_PARK    :Urban Park
-STR_DTLS    :A tiny park has done a deal with the nearby town to allow expansion through the town itself
+STR_DTLS    :這個微小的樂園已與鄰近城鎮商討好使用後者來擴充前者的交易
 
 <Geoffrey Gardens>
 STR_SCNR    :Geoffrey Gardens
@@ -4652,47 +4727,47 @@ STR_DTLS    :沒有任何財政上的限制, 你的挑戰是要發展這個沙
 <Razor Rocks>
 STR_SCNR    :Razor Rocks
 STR_PARK    :Razor Rocks
-STR_DTLS    :Your task is to build a massive coaster-filled park in amongst Razor Rocks
+STR_DTLS    :你的任務是於Razor Rocks之中建造一個擁有不同雲霄飛車的樂園
 
 <Crater Lake>
 STR_SCNR    :Crater Lake
 STR_PARK    :Crater Lake
-STR_DTLS    :A large lake in an ancient crater is the setting for this park
+STR_DTLS    :此樂園設定於一個沉睡火山口的湖之上
 
 <Vertigo Views>
 STR_SCNR    :Vertigo Views
 STR_PARK    :Vertigo Views
-STR_DTLS    :This large park already has an excellent hyper-coaster, but your task is to massively increase its profit
+STR_DTLS    :這個大型的樂園已經擁有一座很棒的Hyper式雲霄飛車, 但你的任務是要將他的利潤大幅增加
 
 <Paradise Pier 2>
 STR_SCNR    :Paradise Pier 2
 STR_PARK    :Paradise Pier 2
-STR_DTLS    :Paradise Pier has expanded its network of walkways over the sea, and your task is to expand the park to use the extra space
+STR_DTLS    :Paradise Pier 已向海中心擴張它的道路網絡, 你的任務是讓樂園使用那些新擴張的區域
 
 <Dragon's Cove>
 STR_SCNR    :Dragon's Cove
 STR_PARK    :Dragon's Cove
-STR_DTLS    :This sea-side cove is the setting for this coaster-building challenge
+STR_DTLS    :此建造雲霄飛車挑戰設定於一個處於海邊的洞穴之中
 
 <Good Knight Park>
 STR_SCNR    :Good Knight Park
 STR_PARK    :Good Knight Park
-STR_DTLS    :A castle with a pair of roller coasters needs developing into a larger theme park
+STR_DTLS    :一個擁有一對雲霄飛車的城堡需要發展成一個更大型的主題樂園
 
 <Wacky Warren>
 STR_SCNR    :Wacky Warren
 STR_PARK    :Wacky Warren
-STR_DTLS    :A park which has much of its footpaths and coasters underground
+STR_DTLS    :一個擁有很多道路及雲霄飛車於地下的樂園
 
 <Grand Glacier>
 STR_SCNR    :Grand Glacier
 STR_PARK    :Grand Glacier
-STR_DTLS    :A glacier-filled valley is yours to develop into a theme park
+STR_DTLS    :一個由冰川所填滿的峽谷現可由你任意發展成一個樂園
 
 <Crazy Craters>
 STR_SCNR    :Crazy Craters
 STR_PARK    :Crazy Craters
-STR_DTLS    :In a far-off world where money is not needed, you must build an entertainment centre to keep the people happy
+STR_DTLS    :在一個不用錢的遙遠的世界中, 你需要建造一個娛樂中心來讓遊客開心
 
 <Dusty Desert>
 STR_SCNR    :Dusty Desert
@@ -4702,7 +4777,7 @@ STR_DTLS    :你需要在此沙漠中的樂園完成未建好的5座雲霄飛車
 <Woodworm Park>
 STR_SCNR    :Woodworm Park
 STR_PARK    :Woodworm Park
-STR_DTLS    :This historical park is only allowed to build older-styled rides
+STR_DTLS    :這個很有歷史的樂園只能讓你建造一些古舊風格的遊樂設施
 
 <Icarus Park>
 STR_SCNR    :Icarus Park
@@ -4712,7 +4787,7 @@ STR_DTLS    :發展此外星樂園並將其利潤最大化
 <Sunny Swamps>
 STR_SCNR    :Sunny Swamps
 STR_PARK    :Sunny Swamps
-STR_DTLS    :This well-themed amusement park already has several rides, but has plenty of space for expansion
+STR_DTLS    :這個佈置得很好的主題樂園已經有數項遊樂設施, 但有很多擴張的空間
 
 <Frightmare Hills>
 STR_SCNR    :Frightmare Hills
@@ -4722,7 +4797,7 @@ STR_DTLS    :一個在中心擁有一座巨大的雲霄飛車的恐怖樂園
 <Thunder Rocks>
 STR_SCNR    :Thunder Rocks
 STR_PARK    :Thunder Rocks
-STR_DTLS    :Two large hunks of rock stick out of the sand, upon which the beginnings of a theme park are constructed
+STR_DTLS    :兩座屹立在沙地之上的巨型石將會作為建造一個主題樂園的初始環境
 
 <Octagon Park>
 STR_SCNR    :Octagon Park
@@ -4732,7 +4807,7 @@ STR_DTLS    :你需要在此大型樂園內建造十座雲霄飛車
 <Pleasure Island>
 STR_SCNR    :Pleasure Island
 STR_PARK    :Pleasure Island
-STR_DTLS    :A long thin island makes a challenging setting to build a selection of coasters
+STR_DTLS    :一個又長又窄的島嶼令到建造挑選好的雲霄飛車十分有挑戰性
 
 <Icicle Worlds>
 STR_SCNR    :Icicle Worlds

debian/changelog

@@ -1,4 +1,4 @@
-openrct2 (0.0.7-master-1) unstable; urgency=medium
+openrct2 (0.0.8-develop-1) unstable; urgency=medium
 
   * Sixth release. (Closes: #XXXXXX)
 

distribution/changelog.txt

@@ -1,3 +1,48 @@
+0.1.0 (in development)
+------------------------------------------------------------------------
+- Feature: [#1399 (partial), #5177] Add window that displays any missing/corrupt objects when loading a park
+- Feature: [#5056] Add cheat to own all land.
+- Feature: [#5133] Add option to display guest expenditure (as seen in RCTC).
+- Feature: [#5196] Add cheat to disable ride ageing.
+- Feature: [#5504] Group vehicles into ride groups
+- Feature: [#5576] Add a persistent 'display real names of guests' setting.
+- Feature: [#5611] Add support for Android
+- Feature: [#5706] Add support for OpenBSD
+- Feature: OpenRCT2 now starts up on the display it was last shown on.
+- Feature: Park entrance fee can now be set to amounts up to £200.
+- Improved: Construction rights can now be placed on park entrances.
+- Improved: Mouse can now be dragged to select scenery when saving track designs
+- Fix: [#259] Money making glitch involving swamps (original bug)
+- Fix: [#441] Construction rights over entrance path erased (original bug)
+- Fix: [#578] Ride ghosts show up in ride list during construction (original bug)
+- Fix: [#597] 'Finish 5 roller coasters' goal not properly checked (original bug)
+- Fix: [#667] Incorrect banner limit calculation (original bug)
+- Fix: [#739] Crocodile Ride (Log Flume) never allows more than five boats (original bug)
+- Fix: [#837] Can't move windows on title screen to where the toolbar would be (original bug)
+- Fix: [#1705] Time Twister's Medieval entrance has incorrect scrolling (original bug)
+- Fix: [#3178, #5456] Paths with non-ASCII characters not handled properly on macOS.
+- Fix: [#3346] Crash when extra long train breaks down at the back
+- Fix: [#3479] Building in pause mode creates too many floating numbers, crashing the game
+- Fix: [#3565] Multiplayer server crash
+- Fix: [#3681] Steel Twister rollercoaster always shows all track designs
+- Fix: [#3846, #5749] Crash when testing coaster with a diagonal lift in block brake mode
+- Fix: [#4054] Sorting rides by track type: Misleading research messages
+- Fix: [#4055] Sort rides by track type: Sorting rule is not really clear (inconsistent?)
+- Fix: [#4512] Invisible map edge tiles corrupted
+- Fix: [#5009] Ride rating calculations can overflow
+- Fix: [#5253] RCT1 park value conversion factor too high
+- Fix: [#5400] New Ride window does not focus properly on newly invented ride.
+- Fix: [#5489] Sprite index crash for car view on car ride.
+- Fix: [#5730] Unable to uncheck 'No money' in the Scenario Editor.
+- Fix: [#5750] Game freezes when ride queue linked list is corrupted.
+- Fix: [#5819] Vertical multi-dimension coaster tunnels drawn incorrectly
+- Fix: Non-invented vehicles can be used via track designs in select-by-track-type mode.
+- Fix: Track components added by OpenRCT2 are now usable in older scenarios.
+- Technical: [#5047] Add ride ratings tests
+- Technical: [#5458] Begin offering headless build with reduced compile- and run-time dependencies
+- Technical: [#5755] Title sequence wait periods use milliseconds
+- Technical: Fix many desync sources
+
 0.0.7 (2017-05-03)
 ------------------------------------------------------------------------
 - Feature: [#1730] Keyboard shortcuts for track construction.
@@ -77,6 +122,8 @@
 - Fix: [#5003] Able to remove entrance/exit of unedittable rides (such as in Volcania).
 - Fix: [#5096] Failure to open parks with out of bounds sprite coordinates.
 - Fix: [#5114] Some entertainer costumes never select-able.
+- Fix: [#5381] Game crashes in scenario editor when scenery or pathing is clicked on when no objects loaded.
+- Fix: [#5787] Opening an incomplete ride moves the viewport to unrelated place.
 
 0.0.5 (2016-12-27)
 ------------------------------------------------------------------------
@@ -98,7 +145,7 @@ This is the first fully implemented version of OpenRCT2. RCT2.EXE is no longer r
 - Feature: Assymmetric-key-based authorisation and assignment storage.
 - Feature: Add Norwegian translation.
 - Feature: Add cheat to disable littering.
-- Feature: Add Cheat to disable plant aging.
+- Feature: Add Cheat to disable plant ageing.
 - Feature: Add Cheat that allows any track piece to use a chain lift.
 - Feature: Add Console command to set vehicle friction.
 - Feature: Add console command to set scenario initial cash.

distribution/linux/openrct2.desktop

@@ -2,7 +2,7 @@
 [Desktop Entry]
 Type=Application
 Version=1.0
-Exec=openrct2
+Exec=openrct2 %u
 Icon=openrct2
 Name=OpenRCT2
 GenericName=Theme park management game

distribution/macos/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.0.7</string>
+	<string>0.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>ORCT</string>
 	<key>LSMinimumSystemVersion</key>

distribution/man/openrct2.6

@@ -0,0 +1,157 @@
+.Dd May 31, 2017
+.Dt OPENRCT2 6
+.Os
+.Sh NAME
+.Nm openrct2
+.Nd An open source re-implementation of \(lqRollerCoaster Tycoon 2\(rq.
+
+.Sh DESCRIPTION
+OpenRCT2 is an open-source re-implementation of RollerCoaster Tycoon 2 (RCT2).
+The gameplay revolves around building and maintaining an amusement park
+containing attractions, shops and facilities. The player must try to make a
+profit and maintain a good park reputation whilst keeping the guests happy.
+OpenRCT2 allows for both scenario and sandbox play. Scenarios require the
+player to complete a certain objective in a set time limit whilst sandbox
+allows the player to build a more flexible park with optionally no
+restrictions or finance.
+
+.Sh SYNOPSIS
+.Nm
+.Op Fl h | -help
+.Op Fl v | -version
+.Op Fl -verbose
+.Nm
+.Op uri
+.Nm
+.Ar edit
+.Op uri
+.Nm
+.Ar intro
+.Nm
+.Ar host
+uri
+.Op Fl -address Ar address
+.Op Fl -port Ar port
+.Op Fl -password Ar password
+.Op Fl -headless
+.Nm
+.Ar join
+hostname
+.Op Fl -port Ar port
+.Op Fl -password Ar password
+.Nm
+.Ar set-rct2
+path
+.Nm
+.Ar convert
+source
+destination
+.Nm
+.Ar scan-objects
+.Nm
+.Ar handle-uri
+openrct2://.../
+
+.Nm
+.Ar screenshot
+file output_image width height
+.Op x y zoom rotation
+.Nm
+.Ar screenshot
+file output_image
+.Ar giant
+zoom rotation
+
+.Nm
+.Ar sprite append
+spritefile input
+.Op x_offset y_offset
+.Op Fl m | -mode Ar default|closest|dithering
+.Nm
+.Ar sprite build
+spritefile json_path
+.Op silent
+.Nm
+.Ar sprite create
+spritefile
+.Nm
+.Ar sprite details
+spritefile
+.Op idx
+.Nm
+.Ar sprite export
+spritefile idx output
+.Nm
+.Ar sprite exportall
+spritefile output_directory
+
+.Sh OPTIONS
+.Bl -tag -width "-openrct-data-path path "
+
+.It Fl h | -help
+Print a summary of all options to stdout and exit.
+
+.It Fl v | -version
+Show version information and exit.
+
+.It Fl a | -all
+Show help for all commands.
+
+.It Fl -about
+Show information about
+.Nm .
+
+.It Fl -verbose
+Print diagnostic information to stdout.
+
+.It Fl -headless
+run
+.Nm
+without a graphical window.
+
+.It Fl -port Ar port
+Port to use for hosting or joining a server.
+
+.It Fl -address Ar address
+Address to bind to when hosting a server.
+
+.It Fl -password Ar password
+Password needed to join the server.
+
+.It Fl -user-data-path Ar path
+Path to the user data directory (containing
+.Pa config.ini )
+
+.It Fl -openrct-data-path Ar path
+Path to the OpenRCT2 data directory (containing
+.Pa languages )
+
+.It Fl -rct2-data-path Ar path
+Path to the RollerCoaster Tycoon 2 data directory (containing
+.Pa data/g1.dat )
+
+.Sh EXAMPLES
+.Bl -tag -width "openrct2 https://openrct2.website/files/SnowyPark.sv6 "
+.It openrct2 ./my_park.sv6
+Open a saved park.
+.It openrct2 https://openrct2.website/files/SnowyPark.sv6
+Download and open a saved park.
+.It openrct2 host ./my_park.sv6 --port 11753 --headless
+Run a headless server for a saved park.
+
+.Sh SEE ALSO
+.Lk https://openrct2.website "Offical site"
+
+.Lk https://github.com/OpenRCT2/OpenRCT2 "GitHub"
+.Sh HISTORY
+RollerCoaster Tycoon 2 was originally written by Chris Sawyer in x86 assembly
+and is the sequel to RollerCoaster Tycoon. The engine was based on
+Transport Tycoon, an older game which also has an equivalent open-source
+project, OpenTTD. OpenRCT2 attempts to provide everything from RCT2 as well as
+many improvements and additional features, some of these include support for
+modern platforms, an improved interface, improved guest and staff AI, more
+editing tools, increased limits, and cooperative multiplayer. It also
+re-introduces mechanics from RollerCoaster Tycoon that were not present in
+RollerCoaster Tycoon 2. Some of those include; mountain tool in-game, the
+"have fun" objective, launched coasters (not passing-through the station) and
+several buttons on the toolbar.

distribution/readme.txt

@@ -1,5 +1,5 @@
-Last updated:    2017-05-03
+Last updated:    2017-07-07
-Release version: 0.0.7.0
+Release version: 0.1.0
 ------------------------------------------------------------------------
 
 
@@ -57,19 +57,18 @@ following information in your bug report:
  * Platform (Windows, Linux, FreeBSD, ...) and compiler (including version) if
    you compiled OpenRCT2 yourself.
  * The processor architecture of your OS (32 bits Windows, 64 bits Windows,
-   Linux on an ARM, Mac OS X on a PowerPC, ...)
+   Android on an ARM, Linux on a PowerPC, ...)
  * The language and culture your operating system is using.
  * Attach a saved game *and* a screenshot if possible
  * If this bug only occurred recently please note the last version without
    the bug and the first version including the bug. That way we can fix it
    quicker by looking at the changes made.
- * Attach crash.dmp, crash.log and crash.sav. These files are usually created
+ * Attach a crash dump (if your game crashed or froze).
-   next to your openrct2.cfg. The crash handler will tell you the location.
 
 3.0) Supported platforms
 ---- -------------------
 OpenRCT2 is currently supported on Windows Vista and above, many distributions of
-Linux, macOS, and OS X 10.7 or higher. OpenRCT2 will only work on
+Linux, macOS 10.9 or higher, Android, FreeBSD and OpenBSD. OpenRCT2 will only work on
 little-endian architectures.
 Further instructions can be found on GitHub.
 
@@ -134,7 +133,7 @@ information about the project, its roadmap and how to compile the source code.
 6.0) Translation
 ---- -----------
 For more information about the game's translation and how to contribute, please
-visit the GitHub page and wiki at (https://github.com/OpenRCT2/OpenRCT2).
+visit the GitHub page and wiki at (https://github.com/OpenRCT2/Localisation).
 
 7.0) Troubleshooting
 ---- ---------------
@@ -156,7 +155,7 @@ libcURL  | MIT (or Modified BSD-style) licence.
 libspeex | BSD-style licence.
 libpng   | libpng licence.
 libzip   | BSD 3 clause licence.
-OpenSSL  | Apache Licence 1.0
+OpenSSL  | OpenSSL Licence
 SDL2     | zlib licence.
 SDL2 TTF | zlib licence.
 zlib     | zlib licence.

dockerfiles/ubuntu_amd64/Dockerfile

@@ -1,4 +1,18 @@
 FROM ubuntu:16.04
-RUN apt-get update
+# based on sstrakh/xenial-boost-clang but imported as source,
+# due to upstream image being obsolete and we don't need boost.
+RUN apt-get update \
+	&& apt-get install -y curl sudo \
+	&& curl http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - \
+	&& echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" > /etc/apt/sources.list.d/clang4.list \
+	&& apt-get update \
+	&& apt-get install -y \
+	clang-4.0 \
+	gcc \
+	g++ \
+	git-core \
+	&& ln -s /usr/bin/clang-4.0 /usr/bin/clang \
+	&& ln -s /usr/bin/clang++-4.0 /usr/bin/clang++
 RUN apt-get -y upgrade
-RUN apt-get install --no-install-recommends -y cmake libsdl2-dev libsdl2-ttf-dev pkg-config g++ gcc libjansson-dev libspeex-dev libspeexdsp-dev libcurl4-openssl-dev libcrypto++-dev libfontconfig1-dev libfreetype6-dev libpng-dev libzip-dev git libssl-dev clang
+# clang and gcc already installed
+RUN apt-get install --no-install-recommends -y cmake libsdl2-dev libsdl2-ttf-dev pkg-config libjansson-dev libspeex-dev libspeexdsp-dev libcurl4-openssl-dev libcrypto++-dev libfontconfig1-dev libfreetype6-dev libpng-dev libzip-dev git libssl-dev

openrct2.common.props

@@ -16,6 +16,7 @@
     <OutDir>$(SolutionDir)bin\</OutDir>
     <IntDir>$(SolutionDir)obj\$(ProjectName)\$(Configuration)_$(Platform)\</IntDir>
     <TargetName>$(ProjectName)</TargetName>
+    <ShowAllFiles>true</ShowAllFiles>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -27,8 +28,9 @@
 
   <ItemDefinitionGroup>
     <ClCompile>
-      <DisableSpecificWarnings>4091;4100;4132;4200;4201;4204;4206;4221;4244;4245;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4068;4091;4100;4132;4200;4201;4204;4206;4221;4244;4245;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <!-- Warnings:
+             C4068: unknown pragma
              C4091: 'keyword': ignored on left of 'type' when no variable is declared
              C4100: 'identifier': unreferenced formal parameter
              C4132: 'identifier': const object should be initialized
@@ -41,7 +43,7 @@
              C4245: 'conversion_type': conversion from 'type1' to 'type2', signed/unsigned mismatch
       -->
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>OPENGL_NO_LINK;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;CURL_STATICLIB;SDL_MAIN_HANDLED;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NO_RCT2;OPENGL_NO_LINK;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;CURL_STATICLIB;SDL_MAIN_HANDLED;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <TreatWarningAsError>true</TreatWarningAsError>
@@ -84,13 +86,6 @@
     </Link>
   </ItemDefinitionGroup>
 
-  <!-- Debug|Win32 is reserved for RCT2 interop builds, this means it has to be a DLL -->
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'!='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>NO_RCT2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 
   <PropertyGroup>

openrct2.proj

@@ -16,13 +16,12 @@
   <PropertyGroup>
     <Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
     <Platform Condition="'$(PLATFORM)'==''">x64</Platform>
-    <TestConfig Condition="'$(Configuration)'=='DebugTests' OR '$(Configuration)'=='ReleaseTests'">true</TestConfig>
     <GIT_COMMIT_SHA1_SHORT Condition="'$(GIT_COMMIT_SHA1)'!=''">$(GIT_COMMIT_SHA1.Substring(0, 7))</GIT_COMMIT_SHA1_SHORT>
 
-    <Version>0.0.7</Version>
+    <Version>0.0.8</Version>
     <VersionExtra Condition="'$(GIT_BRANCH)'!=''">-$(GIT_BRANCH)-$(GIT_COMMIT_SHA1_SHORT)</VersionExtra>
     <VersionExtra Condition="'$(GIT_TAG)'!=''"></VersionExtra>
-    <TargetLibsVersion>11</TargetLibsVersion>
+    <TargetLibsVersion>12</TargetLibsVersion>
 
     <!-- Set dynamic OpenRCT2 #defines -->
     <OPENRCT2_CL_ADDITIONALOPTIONS Condition="'$(BUILD_SERVER)'!=''">/D "OPENRCT2_BUILD_SERVER=\"$(BUILD_SERVER)\"" $(OPENRCT2_CL_ADDITIONALOPTIONS)</OPENRCT2_CL_ADDITIONALOPTIONS>
@@ -65,19 +64,19 @@
   <PropertyGroup>
     <DependenciesCheckFile>$(RootDir).dependencies</DependenciesCheckFile>
     <LibsUrl>https://github.com/OpenRCT2/Dependencies/releases/download/v$(TargetLibsVersion)/openrct2-libs-vs2015.zip</LibsUrl>
-    <LibsSha1>f088adcd12450c2672f78679ea5d1fbffc28fd22</LibsSha1>
+    <LibsSha1>f845fe2fad0a1dece905c42ac4cfc1234ec447a7</LibsSha1>
     <GtestVersion>1.8.0</GtestVersion>
     <GtestUrl>https://github.com/google/googletest/archive/release-1.8.0.zip</GtestUrl>
     <GtestSha1>667f873ab7a4d246062565fad32fb6d8e203ee73</GtestSha1>
-    <TitleSequencesUrl>https://github.com/OpenRCT2/title-sequences/releases/download/v0.0.5/title-sequence-v0.0.5.zip</TitleSequencesUrl>
+    <TitleSequencesUrl>https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.0/title-sequence-v0.1.0.zip</TitleSequencesUrl>
-    <TitleSequencesSha1>79ffb2585d12abcbfce205d7696e3472a504b005</TitleSequencesSha1>
+    <TitleSequencesSha1>b587d83de508d0b104d14c599b76f8565900fce0</TitleSequencesSha1>
   </PropertyGroup>
 
   <ItemGroup>
     <g2Inputs Include="$(RootDir)resources\g2\*" />
     <SignItems Include="$(OutputExe)" />
-    <SignItems Include="$(OutputDll)" />
     <SignItems Include="$(OutputCom)" />
+    <SignItems Include="$(OutputDll)" />
   </ItemGroup>
 
   <ItemGroup Label="Symbol Items">
@@ -143,7 +142,6 @@
       <SlnProperties>$(SlnProperties);Configuration=$(Configuration)</SlnProperties>
     </PropertyGroup>
     <ItemGroup>
-      <CleanItems Condition="'$(Platform)'=='Win32'" Include="$(OutputExe)" />
       <CleanItems Include="$(OutputCom)" />
       <CleanItems Include="$(g2Output)" />
       <CleanItems Include="$(ArtifactsDir)openrct2-installer-$(Configuration)-$(Platform)*.exe" />
@@ -162,15 +160,11 @@
       <BuildString Condition="'$(GIT_BRANCH)'!=''">$(BuildString) ($(GIT_BRANCH))</BuildString>
     </PropertyGroup>
     <ItemGroup>
-      <CopyItems Condition="'$(Platform)'=='Win32'" Include="$(RootDir)openrct2.exe" />
       <DataItems Include="$(RootDir)data\**\*" />
     </ItemGroup>
     <Message Condition="'$(BuildString)'!=''" Text="Building $(BuildString)" Importance="high" />
     <Copy SourceFiles="@(CopyItems)" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="true" />
     <Copy SourceFiles="@(DataItems)" DestinationFolder="$(TargetDir)data\%(RecursiveDir)" SkipUnchangedFiles="true" />
-
-    <!-- tests -->
-    <Copy SourceFiles="@(CopyItems)" DestinationFolder="$(TargetDir)testpaint\" />
   </Target>
 
   <Target Name="Build">
@@ -189,17 +183,17 @@
   </Target>
 
   <Target Name="Test" DependsOnTargets="Build">
-    <Exec Command="$(TargetDir)tests\tests.exe" />
+    <Exec Command="$(TargetDir)tests\tests.exe &quot;--gtest_output=xml:$(ArtifactsDir)test-results.xml&quot;" />
   </Target>
-  <Target Name="TestPaint" DependsOnTargets="Build" Condition="'$(Platform)'=='Win32'">
+  <Target Name="TestNoRCT2" DependsOnTargets="Build">
-    <Exec Command="$(TargetDir)testpaint\openrct2.exe" />
+    <Exec Command="$(TargetDir)tests\tests.exe &quot;--gtest_filter=-RideRatings*:MultiLaunch*&quot; &quot;--gtest_output=xml:$(ArtifactsDir)test-results.xml&quot;" />
   </Target>
 
   <!-- Target to build g2.dat containing OpenRCT2 sprites -->
   <Target Name="g2" DependsOnTargets="Build" AfterTargets="Build" Inputs="@(g2Inputs)" Outputs="$(g2Output)"
           Condition="'$(TestConfig)'!='true'">
     <Message Text="Building g2.dat..." />
-    <Exec Command="&quot;$(OutputExe)&quot; sprite build &quot;$(g2Output)&quot; &quot;$(RootDir)resources\g2&quot;"
+    <Exec Command="&quot;$(OutputExe)&quot; sprite build &quot;$(g2Output)&quot; &quot;$(RootDir)resources\g2\sprites.json&quot;"
           StandardOutputImportance="low" />
   </Target>
 

openrct2.sln

@@ -1,16 +1,18 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
+# Visual Studio 15
-VisualStudioVersion = 14.0.25420.1
+VisualStudioVersion = 15.0.26228.9
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openrct2-dll", "src\openrct2-dll\openrct2-dll.vcxproj", "{7B8DB129-79EF-417E-B372-8A18E009D261}"
 	ProjectSection(ProjectDependencies) = postProject
+		{8DD8AB7D-2EA6-44E3-8265-BAF08E832951} = {8DD8AB7D-2EA6-44E3-8265-BAF08E832951}
 		{D24D94F6-2A74-480C-B512-629C306CE92F} = {D24D94F6-2A74-480C-B512-629C306CE92F}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openrct2-win", "src\openrct2-win\openrct2-win.vcxproj", "{7A9A57D5-7006-4208-A290-5491BA3C8808}"
 	ProjectSection(ProjectDependencies) = postProject
 		{7B8DB129-79EF-417E-B372-8A18E009D261} = {7B8DB129-79EF-417E-B372-8A18E009D261}
+		{8DD8AB7D-2EA6-44E3-8265-BAF08E832951} = {8DD8AB7D-2EA6-44E3-8265-BAF08E832951}
 		{D24D94F6-2A74-480C-B512-629C306CE92F} = {D24D94F6-2A74-480C-B512-629C306CE92F}
 	EndProjectSection
 EndProject
@@ -21,12 +23,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "test\tests\tests.v
 		{D24D94F6-2A74-480C-B512-629C306CE92F} = {D24D94F6-2A74-480C-B512-629C306CE92F}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testpaint", "test\testpaint\testpaint.vcxproj", "{57E60BA1-FB76-4316-909E-C1449C142327}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2202A816-377D-4FA0-A7AF-7D4105F8A4FB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{480B577D-4E4A-4757-9A42-28A9AD33E6B0}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenrct2ui", "src\openrct2-ui\libopenrct2ui.vcxproj", "{8DD8AB7D-2EA6-44E3-8265-BAF08E832951}"
+	ProjectSection(ProjectDependencies) = postProject
+		{D24D94F6-2A74-480C-B512-629C306CE92F} = {D24D94F6-2A74-480C-B512-629C306CE92F}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openrct2-cli", "src\openrct2-cli\openrct2-cli.vcxproj", "{B6808F71-30B4-4499-8FF6-0B1C86391842}"
+	ProjectSection(ProjectDependencies) = postProject
+		{D24D94F6-2A74-480C-B512-629C306CE92F} = {D24D94F6-2A74-480C-B512-629C306CE92F}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -35,35 +45,6 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D24D94F6-2A74-480C-B512-629C306CE92F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D24D94F6-2A74-480C-B512-629C306CE92F}.Debug|Win32.Build.0 = Debug|Win32
-		{D24D94F6-2A74-480C-B512-629C306CE92F}.Debug|x64.ActiveCfg = Debug|x64
-		{D24D94F6-2A74-480C-B512-629C306CE92F}.Debug|x64.Build.0 = Debug|x64
-		{D24D94F6-2A74-480C-B512-629C306CE92F}.Release|Win32.ActiveCfg = Release|Win32
-		{D24D94F6-2A74-480C-B512-629C306CE92F}.Release|Win32.Build.0 = Release|Win32
-		{D24D94F6-2A74-480C-B512-629C306CE92F}.Release|x64.ActiveCfg = Release|x64
-		{D24D94F6-2A74-480C-B512-629C306CE92F}.Release|x64.Build.0 = Release|x64
-		{57E60BA1-FB76-4316-909E-C1449C142327}.Debug|Win32.ActiveCfg = Debug|Win32
-		{57E60BA1-FB76-4316-909E-C1449C142327}.Debug|Win32.Build.0 = Debug|Win32
-		{57E60BA1-FB76-4316-909E-C1449C142327}.Debug|x64.ActiveCfg = Debug|Win32
-		{57E60BA1-FB76-4316-909E-C1449C142327}.Release|Win32.ActiveCfg = Release|Win32
-		{57E60BA1-FB76-4316-909E-C1449C142327}.Release|x64.ActiveCfg = Release|Win32
-		{62B020FA-E4FB-4C6E-B32A-DC999470F155}.Debug|Win32.ActiveCfg = Debug|Win32
-		{62B020FA-E4FB-4C6E-B32A-DC999470F155}.Debug|Win32.Build.0 = Debug|Win32
-		{62B020FA-E4FB-4C6E-B32A-DC999470F155}.Debug|x64.ActiveCfg = Debug|x64
-		{62B020FA-E4FB-4C6E-B32A-DC999470F155}.Debug|x64.Build.0 = Debug|x64
-		{62B020FA-E4FB-4C6E-B32A-DC999470F155}.Release|Win32.ActiveCfg = Release|Win32
-		{62B020FA-E4FB-4C6E-B32A-DC999470F155}.Release|Win32.Build.0 = Release|Win32
-		{62B020FA-E4FB-4C6E-B32A-DC999470F155}.Release|x64.ActiveCfg = Release|x64
-		{62B020FA-E4FB-4C6E-B32A-DC999470F155}.Release|x64.Build.0 = Release|x64
-		{7A9A57D5-7006-4208-A290-5491BA3C8808}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7A9A57D5-7006-4208-A290-5491BA3C8808}.Debug|Win32.Build.0 = Debug|Win32
-		{7A9A57D5-7006-4208-A290-5491BA3C8808}.Debug|x64.ActiveCfg = Debug|x64
-		{7A9A57D5-7006-4208-A290-5491BA3C8808}.Debug|x64.Build.0 = Debug|x64
-		{7A9A57D5-7006-4208-A290-5491BA3C8808}.Release|Win32.ActiveCfg = Release|Win32
-		{7A9A57D5-7006-4208-A290-5491BA3C8808}.Release|Win32.Build.0 = Release|Win32
-		{7A9A57D5-7006-4208-A290-5491BA3C8808}.Release|x64.ActiveCfg = Release|x64
-		{7A9A57D5-7006-4208-A290-5491BA3C8808}.Release|x64.Build.0 = Release|x64
 		{7B8DB129-79EF-417E-B372-8A18E009D261}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7B8DB129-79EF-417E-B372-8A18E009D261}.Debug|Win32.Build.0 = Debug|Win32
 		{7B8DB129-79EF-417E-B372-8A18E009D261}.Debug|x64.ActiveCfg = Debug|x64
@@ -72,15 +53,56 @@ Global
 		{7B8DB129-79EF-417E-B372-8A18E009D261}.Release|Win32.Build.0 = Release|Win32
 		{7B8DB129-79EF-417E-B372-8A18E009D261}.Release|x64.ActiveCfg = Release|x64
 		{7B8DB129-79EF-417E-B372-8A18E009D261}.Release|x64.Build.0 = Release|x64
+		{7A9A57D5-7006-4208-A290-5491BA3C8808}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7A9A57D5-7006-4208-A290-5491BA3C8808}.Debug|Win32.Build.0 = Debug|Win32
+		{7A9A57D5-7006-4208-A290-5491BA3C8808}.Debug|x64.ActiveCfg = Debug|x64
+		{7A9A57D5-7006-4208-A290-5491BA3C8808}.Debug|x64.Build.0 = Debug|x64
+		{7A9A57D5-7006-4208-A290-5491BA3C8808}.Release|Win32.ActiveCfg = Release|Win32
+		{7A9A57D5-7006-4208-A290-5491BA3C8808}.Release|Win32.Build.0 = Release|Win32
+		{7A9A57D5-7006-4208-A290-5491BA3C8808}.Release|x64.ActiveCfg = Release|x64
+		{7A9A57D5-7006-4208-A290-5491BA3C8808}.Release|x64.Build.0 = Release|x64
+		{D24D94F6-2A74-480C-B512-629C306CE92F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D24D94F6-2A74-480C-B512-629C306CE92F}.Debug|Win32.Build.0 = Debug|Win32
+		{D24D94F6-2A74-480C-B512-629C306CE92F}.Debug|x64.ActiveCfg = Debug|x64
+		{D24D94F6-2A74-480C-B512-629C306CE92F}.Debug|x64.Build.0 = Debug|x64
+		{D24D94F6-2A74-480C-B512-629C306CE92F}.Release|Win32.ActiveCfg = Release|Win32
+		{D24D94F6-2A74-480C-B512-629C306CE92F}.Release|Win32.Build.0 = Release|Win32
+		{D24D94F6-2A74-480C-B512-629C306CE92F}.Release|x64.ActiveCfg = Release|x64
+		{D24D94F6-2A74-480C-B512-629C306CE92F}.Release|x64.Build.0 = Release|x64
+		{62B020FA-E4FB-4C6E-B32A-DC999470F155}.Debug|Win32.ActiveCfg = Debug|Win32
+		{62B020FA-E4FB-4C6E-B32A-DC999470F155}.Debug|Win32.Build.0 = Debug|Win32
+		{62B020FA-E4FB-4C6E-B32A-DC999470F155}.Debug|x64.ActiveCfg = Debug|x64
+		{62B020FA-E4FB-4C6E-B32A-DC999470F155}.Debug|x64.Build.0 = Debug|x64
+		{62B020FA-E4FB-4C6E-B32A-DC999470F155}.Release|Win32.ActiveCfg = Release|Win32
+		{62B020FA-E4FB-4C6E-B32A-DC999470F155}.Release|Win32.Build.0 = Release|Win32
+		{62B020FA-E4FB-4C6E-B32A-DC999470F155}.Release|x64.ActiveCfg = Release|x64
+		{62B020FA-E4FB-4C6E-B32A-DC999470F155}.Release|x64.Build.0 = Release|x64
+		{8DD8AB7D-2EA6-44E3-8265-BAF08E832951}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8DD8AB7D-2EA6-44E3-8265-BAF08E832951}.Debug|Win32.Build.0 = Debug|Win32
+		{8DD8AB7D-2EA6-44E3-8265-BAF08E832951}.Debug|x64.ActiveCfg = Debug|x64
+		{8DD8AB7D-2EA6-44E3-8265-BAF08E832951}.Debug|x64.Build.0 = Debug|x64
+		{8DD8AB7D-2EA6-44E3-8265-BAF08E832951}.Release|Win32.ActiveCfg = Release|Win32
+		{8DD8AB7D-2EA6-44E3-8265-BAF08E832951}.Release|Win32.Build.0 = Release|Win32
+		{8DD8AB7D-2EA6-44E3-8265-BAF08E832951}.Release|x64.ActiveCfg = Release|x64
+		{8DD8AB7D-2EA6-44E3-8265-BAF08E832951}.Release|x64.Build.0 = Release|x64
+		{B6808F71-30B4-4499-8FF6-0B1C86391842}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B6808F71-30B4-4499-8FF6-0B1C86391842}.Debug|Win32.Build.0 = Debug|Win32
+		{B6808F71-30B4-4499-8FF6-0B1C86391842}.Debug|x64.ActiveCfg = Debug|x64
+		{B6808F71-30B4-4499-8FF6-0B1C86391842}.Debug|x64.Build.0 = Debug|x64
+		{B6808F71-30B4-4499-8FF6-0B1C86391842}.Release|Win32.ActiveCfg = Release|Win32
+		{B6808F71-30B4-4499-8FF6-0B1C86391842}.Release|Win32.Build.0 = Release|Win32
+		{B6808F71-30B4-4499-8FF6-0B1C86391842}.Release|x64.ActiveCfg = Release|x64
+		{B6808F71-30B4-4499-8FF6-0B1C86391842}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{D24D94F6-2A74-480C-B512-629C306CE92F} = {2202A816-377D-4FA0-A7AF-7D4105F8A4FB}
-		{57E60BA1-FB76-4316-909E-C1449C142327} = {480B577D-4E4A-4757-9A42-28A9AD33E6B0}
-		{62B020FA-E4FB-4C6E-B32A-DC999470F155} = {480B577D-4E4A-4757-9A42-28A9AD33E6B0}
-		{7A9A57D5-7006-4208-A290-5491BA3C8808} = {2202A816-377D-4FA0-A7AF-7D4105F8A4FB}
 		{7B8DB129-79EF-417E-B372-8A18E009D261} = {2202A816-377D-4FA0-A7AF-7D4105F8A4FB}
+		{7A9A57D5-7006-4208-A290-5491BA3C8808} = {2202A816-377D-4FA0-A7AF-7D4105F8A4FB}
+		{D24D94F6-2A74-480C-B512-629C306CE92F} = {2202A816-377D-4FA0-A7AF-7D4105F8A4FB}
+		{62B020FA-E4FB-4C6E-B32A-DC999470F155} = {480B577D-4E4A-4757-9A42-28A9AD33E6B0}
+		{8DD8AB7D-2EA6-44E3-8265-BAF08E832951} = {2202A816-377D-4FA0-A7AF-7D4105F8A4FB}
+		{B6808F71-30B4-4499-8FF6-0B1C86391842} = {2202A816-377D-4FA0-A7AF-7D4105F8A4FB}
 	EndGlobalSection
 EndGlobal

readme.md

@@ -1,18 +1,35 @@
 # OpenRCT2
 An open-source re-implementation of RollerCoaster Tycoon 2. A construction and management simulation video game that simulates amusement park management.
 
+---
+
+![OpenRCT2.org Group Park 5](https://i.imgur.com/e7CK5Sc.png)
+
+---
+
 ### Build Status
 |             | Windows | Linux / Mac | Download |
 |-------------|---------|-------------|----------|
 | **master**  | [![AppVeyor](https://ci.appveyor.com/api/projects/status/7efnemxhon6i5n34/branch/master?svg=true)](https://ci.appveyor.com/project/IntelOrca/openrct2-ject9) | [![Travis CI](https://travis-ci.org/OpenRCT2/OpenRCT2.svg?branch=master)](https://travis-ci.org/OpenRCT2/OpenRCT2) | [![OpenRCT2.org](https://img.shields.io/badge/master-v0.0.7-green.svg)](https://openrct2.org/downloads/master/latest) |
 | **develop** | [![AppVeyor](https://ci.appveyor.com/api/projects/status/7efnemxhon6i5n34/branch/develop?svg=true)](https://ci.appveyor.com/project/IntelOrca/openrct2-ject9) | [![Travis CI](https://travis-ci.org/OpenRCT2/OpenRCT2.svg?branch=develop)](https://travis-ci.org/OpenRCT2/OpenRCT2) | [![OpenRCT2.org](https://img.shields.io/badge/develop-v0.0.8-blue.svg)](https://openrct2.org/downloads/develop/latest) |
 
+---
+
 ### Chat
-English:<br />
+You only need a GitHub or Twitter account to access these channels.
-[![Gitter](https://img.shields.io/badge/gitter-general-blue.svg)](https://gitter.im/OpenRCT2/OpenRCT2/non-dev)<br />
+
-[![Gitter](https://img.shields.io/badge/gitter-development-yellowgreen.svg)](https://gitter.im/OpenRCT2/OpenRCT2)<br />
+If you want to help *make* the game, join the developer channel.
-Nederlands:<br />
+
-[![Gitter](https://img.shields.io/badge/gitter-general-blue.svg)](https://gitter.im/OpenRCT2/OpenRCT2/Nederlands)
+If you need help, want to talk to the developers, or just want to stay up to date then join the non-developer channel for your language.
+
+If you want to help translate the game to your language, please stop by the Localisation channel.
+
+| Language | Non Developer | Developer | Localisation |
+|----------|---------------|-----------|--------------|
+| English | [![Gitter](https://img.shields.io/badge/gitter-general-blue.svg)](https://gitter.im/OpenRCT2/OpenRCT2/non-dev) | [![Gitter](https://img.shields.io/badge/gitter-development-yellowgreen.svg)](https://gitter.im/OpenRCT2/OpenRCT2) | [![Gitter](https://img.shields.io/badge/gitter-localisation-green.svg)](https://gitter.im/OpenRCT2/Localisation) |
+| Nederlands | [![Gitter](https://img.shields.io/badge/gitter-general-blue.svg)](https://gitter.im/OpenRCT2/OpenRCT2/Nederlands) | | |
+
+---
 
 # Contents
 - 1 - [Introduction](#1-introduction)
@@ -35,7 +52,7 @@ RollerCoaster Tycoon 2 was originally written by Chris Sawyer in x86 assembly an
 
 # 2 Downloading the game (pre-built)
 
-OpenRCT2 requires original files of RollerCoaster Tycoon 2 to play. It can be bought at either [Steam](http://store.steampowered.com/app/285330/) or [GOG.com](http://www.gog.com/game/rollercoaster_tycoon_2).
+OpenRCT2 requires original files of RollerCoaster Tycoon 2 to play. It can be bought at either [Steam](http://store.steampowered.com/app/285330/) or [GOG.com](http://www.gog.com/game/rollercoaster_tycoon_2). If you have the original RollerCoaster Tycoon and its expansion packs, you can [point OpenRCT2 to these](https://github.com/OpenRCT2/OpenRCT2/wiki/Loading-RCT1-scenarios-and-data) in order to play the original scenarios.
 
 [OpenRCT2.org](https://openrct2.org/downloads) offers precompiled builds and installers of the latest master and the develop branch. There is also a cross platform [Launcher](https://github.com/LRFLEW/OpenRCT2Launcher/releases) available that will automatically update your build of the game so that you always have the latest version.
 
@@ -44,6 +61,8 @@ Some Linux distributions offer native packages already. These packages are usual
 * Ubuntu PPA: [`master` branch](https://launchpad.net/~openrct2/+archive/ubuntu/master) and [`develop` branch](https://launchpad.net/~openrct2/+archive/ubuntu/nightly) (`develop` branch builds are temporarily on hold due to [missing functionality in bzr](https://bugs.launchpad.net/ubuntu/+source/bzr-git/+bug/1084403))
 * openSUSE OBS: [games/openrct2](https://software.opensuse.org/download.html?project=games&package=openrct2)
 
+Some \*BSD operating systems offer native packages. These packages are usually third-party, but we're trying to resolve issues they are facing.
+* OpenBSD: [games/openrct2](http://openports.se/games/openrct2)
 # 3 Building the game
 
 ## 3.1 Building prerequisites
@@ -58,6 +77,8 @@ OpenRCT2 requires original files of RollerCoaster Tycoon 2 to play. It can be bo
 - [7-Zip](http://www.7-zip.org/) (for deployment only)
 - [NSIS](http://nsis.sourceforge.net/) (for deployment only)
 
+---
+
 ### macOS:
 - Xcode 8
 
@@ -130,6 +151,8 @@ make
 ```
 Detailed instructions can be found on our [wiki](https://github.com/OpenRCT2/OpenRCT2/wiki/Building-OpenRCT2-on-Linux).
 
+---
+
 # 4 Contributing
 OpenRCT2 uses the [gitflow workflow](https://www.atlassian.com/git/tutorials/comparing-workflows#gitflow-workflow). If you are implementing a new feature or logic from the original game, please branch off and perform pull requests to ```develop```. If you are fixing a bug for the next release, please branch off and perform pull requests to the correct release branch. ```master``` only contains tagged releases, you should never branch off this.
 
@@ -144,9 +167,13 @@ Please talk to the OpenRCT2 team first before starting to develop a new feature.
 ## 4.3 Translation
 You can translate the game into other languages by editing the language files in ```data/language``` directory. Please join discussions and submit pull requests to [OpenRCT2/Localisation](https://github.com/OpenRCT2/Localisation).
 
+---
+
 # 5 Licence
 **OpenRCT2** is licensed under the GNU General Public License version 3.
 
+---
+
 # 6 More information
 - [GitHub](https://github.com/OpenRCT2/OpenRCT2)
 - [OpenRCT2.org](https://openrct2.org)

resources/g2/sprites.json

@@ -0,0 +1,281 @@
+[
+    {
+        "path": "logo.png"
+    },
+    {
+        "path": "logo_text.png"
+    },
+    {
+        "path": "icons/fast_forward.png"
+    },
+    {
+        "path": "icons/game_speed_indicator.png"
+    },
+    {
+        "path": "icons/game_speed_indicator_double.png"
+    },
+    {
+        "path": "icons/twitch.png"
+    },
+    {
+        "path": "icons/map_gen_land.png"
+    },
+    {
+        "path": "7.png"
+    },
+    {
+        "path": "icons/zoom_in.png"
+    },
+    {
+        "path": "icons/zoom_in_background.png"
+    },
+    {
+        "path": "icons/zoom_out.png"
+    },
+    {
+        "path": "icons/zoom_out_background.png"
+    },
+    {
+        "path": "icons/map_gen_trees.png"
+    },
+    {
+        "path": "icons/map_gen_noise.png"
+    },
+    {
+        "path": "icons/large_scenery.png"
+    },
+    {
+        "path": "icons/small_scenery.png"
+    },
+    {
+        "path": "icons/paths.png"
+    },
+    {
+        "path": "icons/rct1_close_off.png"
+    },
+    {
+        "path": "icons/rct1_close_off_pressed.png"
+    },
+    {
+        "path": "icons/rct1_close_on.png"
+    },
+    {
+        "path": "icons/rct1_close_off_pressed.png"
+    },
+    {
+        "path": "icons/rct1_test_off.png"
+    },
+    {
+        "path": "icons/rct1_test_off_pressed.png"
+    },
+    {
+        "path": "icons/rct1_test_on.png"
+    },
+    {
+        "path": "icons/rct1_test_on_pressed.png"
+    },
+    {
+        "path": "icons/rct1_open_off.png"
+    },
+    {
+        "path": "icons/rct1_open_off_pressed.png"
+    },
+    {
+        "path": "icons/rct1_open_on.png"
+    },
+    {
+        "path": "icons/rct1_open_on_pressed.png"
+    },
+    {
+        "path": "icons/29.png"
+    },
+    {
+        "path": "icons/30.png"
+    },
+    {
+        "path": "icons/31.png"
+    },
+    {
+        "path": "icons/32.png"
+    },
+    {
+        "path": "icons/cheats.png"
+    },
+    {
+        "path": "track/junior/flat_to_steep_1.png"
+    },
+    {
+        "path": "track/junior/flat_to_steep_2_1.png"
+    },
+    {
+        "path": "track/junior/flat_to_steep_3_1.png"
+    },
+    {
+        "path": "track/junior/flat_to_steep_4.png"
+    },
+    {
+        "path": "track/junior/flat_to_steep_2_2.png"
+    },
+    {
+        "path": "track/junior/flat_to_steep_3_2.png"
+    },
+    {
+        "path": "track/junior/steep_to_flat_1.png"
+    },
+    {
+        "path": "track/junior/steep_to_flat_2_1.png"
+    },
+    {
+        "path": "track/junior/steep_to_flat_3_1.png"
+    },
+    {
+        "path": "track/junior/steep_to_flat_4.png"
+    },
+    {
+        "path": "track/junior/steep_to_flat_2_2.png"
+    },
+    {
+        "path": "track/junior/steep_to_flat_3_2.png"
+    },
+    {
+        "path": "track/junior/flat_to_steep_lift_1.png"
+    },
+    {
+        "path": "track/junior/flat_to_steep_lift_2_1.png"
+    },
+    {
+        "path": "track/junior/flat_to_steep_lift_3_1.png"
+    },
+    {
+        "path": "track/junior/flat_to_steep_lift_4.png"
+    },
+    {
+        "path": "track/junior/flat_to_steep_lift_2_2.png"
+    },
+    {
+        "path": "track/junior/flat_to_steep_lift_3_2.png"
+    },
+    {
+        "path": "track/junior/steep_to_flat_lift_1.png"
+    },
+    {
+        "path": "track/junior/steep_to_flat_lift_2_1.png"
+    },
+    {
+        "path": "track/junior/steep_to_flat_lift_3_1.png"
+    },
+    {
+        "path": "track/junior/steep_to_flat_lift_4.png"
+    },
+    {
+        "path": "track/junior/steep_to_flat_lift_2_2.png"
+    },
+    {
+        "path": "track/junior/steep_to_flat_lift_3_2.png"
+    },
+    {
+        "path": "icons/58.png"
+    },
+    {
+        "path": "icons/server_password.png"
+    },
+    {
+        "path": "icons/multiplayer.png"
+    },
+    {
+        "path": "track/junior/flat_to_steep_diagonal_1.png"
+    },
+    {
+        "path": "track/junior/flat_to_steep_diagonal_2.png"
+    },
+    {
+        "path": "track/junior/flat_to_steep_diagonal_3.png"
+    },
+    {
+        "path": "track/junior/flat_to_steep_diagonal_4.png"
+    },
+    {
+        "path": "track/junior/steep_to_flat_diagonal_1.png"
+    },
+    {
+        "path": "track/junior/steep_to_flat_diagonal_2.png"
+    },
+    {
+        "path": "track/junior/steep_to_flat_diagonal_3.png"
+    },
+    {
+        "path": "track/junior/steep_to_flat_diagonal_4.png"
+    },
+    {
+        "path": "track/junior/flat_to_steep_diagonal_lift_1.png"
+    },
+    {
+        "path": "track/junior/flat_to_steep_diagonal_lift_2.png"
+    },
+    {
+        "path": "track/junior/flat_to_steep_diagonal_lift_3.png"
+    },
+    {
+        "path": "track/junior/flat_to_steep_diagonal_lift_4.png"
+    },
+    {
+        "path": "track/junior/steep_to_flat_diagonal_lift_1.png"
+    },
+    {
+        "path": "track/junior/steep_to_flat_diagonal_lift_2.png"
+    },
+    {
+        "path": "track/junior/steep_to_flat_diagonal_lift_3.png"
+    },
+    {
+        "path": "track/junior/steep_to_flat_diagonal_lift_4.png"
+    },
+    {
+        "path": "icons/sort.png"
+    },
+    {
+        "path": "icons/copy.png"
+    },
+    {
+        "path": "icons/paste.png"
+    },
+    {
+        "path": "icons/tab_disabled.png"
+    },
+    {
+        "path": "track/intamin/booster_1.png"
+    },
+    {
+        "path": "track/intamin/booster_2.png"
+    },
+    {
+        "path": "track/bm/booster_1.png"
+    },
+    {
+        "path": "track/bm/booster_2.png"
+    },
+    {
+        "path": "track/junior/booster_1.png"
+    },
+    {
+        "path": "track/junior/booster_2.png"
+    },
+    {
+        "path": "icons/mute.png"
+    },
+    {
+        "path": "icons/mute_pressed.png"
+    },
+    {
+        "path": "icons/unmute.png"
+    },
+    {
+        "path": "icons/unmute_pressed.png"
+    },
+    {
+        "path": "track/mini/booster_1.png"
+    },
+    {
+        "path": "track/mini/booster_2.png"
+    }
+]