Merge remote-tracking branch 'upstream/master'

cmake/scripts/SquirrelExport.cmake

@@ -17,41 +17,48 @@ if(NOT APILC)
 endif()
 
 macro(dump_fileheader)
-    get_filename_component(SCRIPT_API_FILE_NAME "${SCRIPT_API_FILE}" NAME)
-    string(APPEND SQUIRREL_EXPORT "\n#include \"../${SCRIPT_API_FILE_NAME}\"")
+    get_filename_component(SCRIPT_API_FILE_NAME "${SCRIPT_API_FILE}" NAME_WE)
+    string(APPEND SQUIRREL_EXPORT "\n#include \"../${SCRIPT_API_FILE_NAME}.hpp\"")
     if(NOT "${APIUC}" STREQUAL "Template")
         string(REPLACE "script_" "template_" SCRIPT_API_FILE_NAME "${SCRIPT_API_FILE_NAME}")
-        string(APPEND SQUIRREL_EXPORT "\n#include \"../template/${SCRIPT_API_FILE_NAME}.sq\"")
+        string(APPEND SQUIRREL_EXPORT "\n#include \"../template/${SCRIPT_API_FILE_NAME}.sq.hpp\"")
+    endif()
+endmacro()
+
+macro(open_namespace)
+    if(NOT NAMESPACE_OPENED)
+        string(APPEND SQUIRREL_EXPORT "\nnamespace SQConvert {")
+        set(NAMESPACE_OPENED TRUE)
     endif()
 endmacro()
 
 macro(dump_class_templates NAME)
     string(REGEX REPLACE "^Script" "" REALNAME ${NAME})
 
-    string(APPEND SQUIRREL_EXPORT "\n	template <> struct Param<${NAME} *> { static inline ${NAME} *Get(HSQUIRRELVM vm, int index) { return  static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
-    string(APPEND SQUIRREL_EXPORT "\n	template <> struct Param<${NAME} &> { static inline ${NAME} &Get(HSQUIRRELVM vm, int index) { return *static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
-    string(APPEND SQUIRREL_EXPORT "\n	template <> struct Param<const ${NAME} *> { static inline const ${NAME} *Get(HSQUIRRELVM vm, int index) { return  static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
-    string(APPEND SQUIRREL_EXPORT "\n	template <> struct Param<const ${NAME} &> { static inline const ${NAME} &Get(HSQUIRRELVM vm, int index) { return *static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
+    string(APPEND SQUIRREL_EXPORT "\n\ttemplate <> struct Param<${NAME} *> { static inline ${NAME} *Get(HSQUIRRELVM vm, int index) { return  static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
+    string(APPEND SQUIRREL_EXPORT "\n\ttemplate <> struct Param<${NAME} &> { static inline ${NAME} &Get(HSQUIRRELVM vm, int index) { return *static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
+    string(APPEND SQUIRREL_EXPORT "\n\ttemplate <> struct Param<const ${NAME} *> { static inline const ${NAME} *Get(HSQUIRRELVM vm, int index) { return  static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
+    string(APPEND SQUIRREL_EXPORT "\n\ttemplate <> struct Param<const ${NAME} &> { static inline const ${NAME} &Get(HSQUIRRELVM vm, int index) { return *static_cast<${NAME} *>(Squirrel::GetRealInstance(vm, index, \"${REALNAME}\")); } };")
     if("${NAME}" STREQUAL "ScriptEvent")
-        string(APPEND SQUIRREL_EXPORT "\n	template <> struct Return<${NAME} *> { static inline int Set(HSQUIRRELVM vm, ${NAME} *res) { if (res == nullptr) { sq_pushnull(vm); return 1; } Squirrel::CreateClassInstanceVM(vm, \"${REALNAME}\", res, nullptr, DefSQDestructorCallback<${NAME}>, true); return 1; } };")
+        string(APPEND SQUIRREL_EXPORT "\n\ttemplate <> struct Return<${NAME} *> { static inline int Set(HSQUIRRELVM vm, ${NAME} *res) { if (res == nullptr) { sq_pushnull(vm); return 1; } Squirrel::CreateClassInstanceVM(vm, \"${REALNAME}\", res, nullptr, DefSQDestructorCallback<${NAME}>, true); return 1; } };")
     elseif("${NAME}" STREQUAL "ScriptText")
         string(APPEND SQUIRREL_EXPORT "\n")
-        string(APPEND SQUIRREL_EXPORT "\n	template <> struct Param<Text *> {")
-        string(APPEND SQUIRREL_EXPORT "\n		static inline Text *Get(HSQUIRRELVM vm, int index) {")
-        string(APPEND SQUIRREL_EXPORT "\n			if (sq_gettype(vm, index) == OT_INSTANCE) {")
-        string(APPEND SQUIRREL_EXPORT "\n				return Param<ScriptText *>::Get(vm, index);")
-        string(APPEND SQUIRREL_EXPORT "\n			}")
-        string(APPEND SQUIRREL_EXPORT "\n			if (sq_gettype(vm, index) == OT_STRING) {")
-        string(APPEND SQUIRREL_EXPORT "\n				return new RawText(Param<const std::string &>::Get(vm, index));")
-        string(APPEND SQUIRREL_EXPORT "\n			}")
-        string(APPEND SQUIRREL_EXPORT "\n			if (sq_gettype(vm, index) == OT_NULL) {")
-        string(APPEND SQUIRREL_EXPORT "\n				return nullptr;")
-        string(APPEND SQUIRREL_EXPORT "\n			}")
-        string(APPEND SQUIRREL_EXPORT "\n			throw sq_throwerror(vm, fmt::format(\"parameter {} has an invalid type ; expected: 'Text'\", index - 1));")
-        string(APPEND SQUIRREL_EXPORT "\n		}")
-        string(APPEND SQUIRREL_EXPORT "\n	};")
+        string(APPEND SQUIRREL_EXPORT "\n\ttemplate <> struct Param<Text *> {")
+        string(APPEND SQUIRREL_EXPORT "\n\t\tstatic inline Text *Get(HSQUIRRELVM vm, int index) {")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\tif (sq_gettype(vm, index) == OT_INSTANCE) {")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\t\treturn Param<ScriptText *>::Get(vm, index);")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\t}")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\tif (sq_gettype(vm, index) == OT_STRING) {")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\t\treturn new RawText(Param<const std::string &>::Get(vm, index));")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\t}")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\tif (sq_gettype(vm, index) == OT_NULL) {")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\t\treturn nullptr;")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\t}")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t\tthrow sq_throwerror(vm, fmt::format(\"parameter {} has an invalid type ; expected: 'Text'\", index - 1));")
+        string(APPEND SQUIRREL_EXPORT "\n\t\t}")
+        string(APPEND SQUIRREL_EXPORT "\n\t};")
     else()
-        string(APPEND SQUIRREL_EXPORT "\n	template <> struct Return<${NAME} *> { static inline int Set(HSQUIRRELVM vm, ${NAME} *res) { if (res == nullptr) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, \"${REALNAME}\", res, nullptr, DefSQDestructorCallback<${NAME}>, true); return 1; } };")
+        string(APPEND SQUIRREL_EXPORT "\n\ttemplate <> struct Return<${NAME} *> { static inline int Set(HSQUIRRELVM vm, ${NAME} *res) { if (res == nullptr) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, \"${REALNAME}\", res, nullptr, DefSQDestructorCallback<${NAME}>, true); return 1; } };")
     endif()
 endmacro()
 
@@ -66,9 +73,7 @@ macro(reset_reader)
     unset(STATIC_METHODS)
     unset(CLS)
     unset(START_SQUIRREL_DEFINE_ON_NEXT_LINE)
-    set(CLS_LEVEL 0)
     unset(CLS_IN_API)
-    set(BRACE_LEVEL 0)
 endmacro()
 
 reset_reader()
@@ -76,6 +81,9 @@ reset_reader()
 file(STRINGS "${SCRIPT_API_FILE}" SOURCE_LINES)
 
 set(NUM_LINE 0)
+set(CLS_LEVEL 0)
+set(BRACE_LEVEL 0)
+
 macro(doxygen_check)
     if(NOT "${DOXYGEN_SKIP}" STREQUAL "")
         message(FATAL_ERROR "${SCRIPT_API_FILE}:${NUM_LINE}: a DOXYGEN_API block was not properly closed")
@@ -111,7 +119,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
         continue()
     endif()
 
-    if("${LINE}" MATCHES "^([	 ]*)\\* @api (.*)$")
+    if("${LINE}" MATCHES "^([\t ]*)\\* @api (.*)$")
         set(LINE ${CMAKE_MATCH_2})
         # By default, classes are not selected
         if(NOT CLS_LEVEL)
@@ -149,22 +157,28 @@ foreach(LINE IN LISTS SOURCE_LINES)
         continue()
     endif()
 
+    # Count braces to skip function bodies
+    string(REGEX REPLACE "[^{]" "" OPENING_BRACES "${LINE}")
+    string(LENGTH "${OPENING_BRACES}" OPENING_BRACES)
+    string(REGEX REPLACE "[^}]" "" CLOSING_BRACES "${LINE}")
+    string(LENGTH "${CLOSING_BRACES}" CLOSING_BRACES)
+    math(EXPR BRACE_LEVEL "${BRACE_LEVEL} + ${OPENING_BRACES} - ${CLOSING_BRACES}")
+
     # Ignore forward declarations of classes
-    if("${LINE}" MATCHES "^(	*)class(.*);")
+    if("${LINE}" MATCHES "^(\t*)class(.*);")
         continue()
     endif()
 
     # We only want to have public functions exported for now
-    if("${LINE}" MATCHES "^(	*)class (.*) (: public|: protected|: private|:) ([^ ]*)")
+    if("${LINE}" MATCHES "^(\t*)class (.*) (: public|: protected|: private|:) ([^ ]*)")
         if(NOT CLS_LEVEL)
             if(NOT DEFINED API_SELECTED)
                 message(WARNING "${SCRIPT_API_FILE}:${NUM_LINE}: Class '${CMAKE_MATCH_2}' has no @api. It won't be published to any API.")
                 set(API_SELECTED FALSE)
             endif()
             unset(IS_PUBLIC)
-            unset(CLS_PARAM_0)
-            set(CLS_PARAM_1 1)
-            set(CLS_PARAM_2 "x")
+            unset(CLS_PARAMS)
+            set(CLS_TYPES "x")
             set(CLS_IN_API ${API_SELECTED})
             unset(API_SELECTED)
             set(CLS "${CMAKE_MATCH_2}")
@@ -182,19 +196,19 @@ foreach(LINE IN LISTS SOURCE_LINES)
         math(EXPR CLS_LEVEL "${CLS_LEVEL} + 1")
         continue()
     endif()
-    if("${LINE}" MATCHES "^(	*)public")
+    if("${LINE}" MATCHES "^(\t*)public")
         if(CLS_LEVEL EQUAL 1)
             set(IS_PUBLIC TRUE)
         endif()
         continue()
     endif()
-    if("${LINE}" MATCHES "^(	*)protected")
+    if("${LINE}" MATCHES "^(\t*)protected")
         if(CLS_LEVEL EQUAL 1)
             unset(IS_PUBLIC)
         endif()
         continue()
     endif()
-    if("${LINE}" MATCHES "^(	*)private")
+    if("${LINE}" MATCHES "^(\t*)private")
         if(CLS_LEVEL EQUAL 1)
             unset(IS_PUBLIC)
         endif()
@@ -222,7 +236,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
     endif()
 
     # We need to make specialized conversions for structs
-    if("${LINE}" MATCHES "^(	*)struct ([^ ]*)")
+    if("${LINE}" MATCHES "^(\t*)struct ([^ ]*)")
         math(EXPR CLS_LEVEL "${CLS_LEVEL} + 1")
 
         # Check if we want to publish this struct
@@ -244,7 +258,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
     endif()
 
     # We need to make specialized conversions for enums
-    if("${LINE}" MATCHES "^(	*)enum ([^ ]*)")
+    if("${LINE}" MATCHES "^(\t*)enum ([^ ]*)")
         math(EXPR CLS_LEVEL "${CLS_LEVEL} + 1")
 
         # Check if we want to publish this enum
@@ -267,7 +281,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
     endif()
 
     # Maybe the end of the class, if so we can start with the Squirrel export pretty soon
-    if("${LINE}" MATCHES "};")
+    if(BRACE_LEVEL LESS CLS_LEVEL)
         math(EXPR CLS_LEVEL "${CLS_LEVEL} - 1")
         if(CLS_LEVEL)
             unset(IN_ENUM)
@@ -281,7 +295,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
     endif()
 
     # Empty/white lines. When we may do the Squirrel export, do that export.
-    if("${LINE}" MATCHES "^([ 	]*)$")
+    if("${LINE}" MATCHES "^([ \t]*)$")
         if(NOT START_SQUIRREL_DEFINE_ON_NEXT_LINE)
             continue()
         endif()
@@ -305,33 +319,17 @@ foreach(LINE IN LISTS SOURCE_LINES)
         string(APPEND SQUIRREL_EXPORT "\n")
 
         if("${APIUC}" STREQUAL "Template")
-            # First check whether we have enums to print
-            if(DEFINED ENUMS)
-                if(NOT NAMESPACE_OPENED)
-                    string(APPEND SQUIRREL_EXPORT "\nnamespace SQConvert {")
-                    set(NAMESPACE_OPENED TRUE)
-                endif()
-            endif()
-
             # Then check whether we have structs/classes to print
             if(DEFINED STRUCTS)
-                if(NOT NAMESPACE_OPENED)
-                    string(APPEND SQUIRREL_EXPORT "\nnamespace SQConvert {")
-                    set(NAMESPACE_OPENED TRUE)
-                endif()
-                string(APPEND SQUIRREL_EXPORT "\n	/* Allow inner classes/structs to be used as Squirrel parameters */")
+                open_namespace()
+                string(APPEND SQUIRREL_EXPORT "\n\t/* Allow inner classes/structs to be used as Squirrel parameters */")
                 foreach(STRUCT IN LISTS STRUCTS)
                     dump_class_templates(${STRUCT})
                 endforeach()
             endif()
 
-            if(NOT NAMESPACE_OPENED)
-                string(APPEND SQUIRREL_EXPORT "\nnamespace SQConvert {")
-                set(NAMESPACE_OPENED TRUE)
-            else()
-                string(APPEND SQUIRREL_EXPORT "\n")
-            endif()
-            string(APPEND SQUIRREL_EXPORT "\n	/* Allow ${CLS} to be used as Squirrel parameter */")
+            open_namespace()
+            string(APPEND SQUIRREL_EXPORT "\n\t/* Allow ${CLS} to be used as Squirrel parameter */")
             dump_class_templates(${CLS})
 
             string(APPEND SQUIRREL_EXPORT "\n} // namespace SQConvert")
@@ -347,17 +345,17 @@ foreach(LINE IN LISTS SOURCE_LINES)
         # Then do the registration functions of the class.
         string(APPEND SQUIRREL_EXPORT "\nvoid SQ${API_CLS}_Register(Squirrel &engine)")
         string(APPEND SQUIRREL_EXPORT "\n{")
-        string(APPEND SQUIRREL_EXPORT "\n	DefSQClass<${CLS}, ScriptType::${APIUC}> SQ${API_CLS}(\"${API_CLS}\");")
+        string(APPEND SQUIRREL_EXPORT "\n\tDefSQClass<${CLS}, ScriptType::${APIUC}> SQ${API_CLS}(\"${API_CLS}\");")
         if("${SUPER_CLS}" STREQUAL "Text")
-            string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.PreRegister(engine);")
+            string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.PreRegister(engine);")
         else()
-            string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.PreRegister(engine, \"${API_SUPER_CLS}\");")
+            string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.PreRegister(engine, \"${API_SUPER_CLS}\");")
         endif()
-        if(NOT "${SUPER_CLS}" MATCHES "^ScriptEvent")
-            if("${CLS_PARAM_2}" STREQUAL "v")
-                string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.AddSQAdvancedConstructor(engine);")
+        if((DEFINED CLS_PARAMS OR DEFINED METHODS) AND NOT "${SUPER_CLS}" MATCHES "^ScriptEvent" AND NOT "${CLS}" STREQUAL "ScriptEvent")
+            if("${CLS_TYPES}" STREQUAL "v")
+                string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.AddSQAdvancedConstructor(engine);")
             else()
-                string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.AddConstructor<void (${CLS}::*)(${CLS_PARAM_0}), ${CLS_PARAM_1}>(engine, \"${CLS_PARAM_2}\");")
+                string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.AddConstructor<void (${CLS}::*)(${CLS_PARAMS})>(engine, \"${CLS_TYPES}\");")
             endif()
         endif()
         string(APPEND SQUIRREL_EXPORT "\n")
@@ -377,7 +375,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
             foreach(i RANGE ${LEN})
                 string(APPEND SPACES " ")
             endforeach()
-            string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQConst(engine, ${CLS}::${ENUM_VALUE},${SPACES}\"${ENUM_VALUE}\");")
+            string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.DefSQConst(engine, ${CLS}::${ENUM_VALUE},${SPACES}\"${ENUM_VALUE}\");")
         endforeach()
         if(MLEN)
             string(APPEND SQUIRREL_EXPORT "\n")
@@ -398,7 +396,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
             foreach(i RANGE ${LEN})
                 string(APPEND SPACES " ")
             endforeach()
-            string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQConst(engine, ${CLS}::${CONST_VALUE},${SPACES}\"${CONST_VALUE}\");")
+            string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.DefSQConst(engine, ${CLS}::${CONST_VALUE},${SPACES}\"${CONST_VALUE}\");")
         endforeach()
         if(MLEN)
             string(APPEND SQUIRREL_EXPORT "\n")
@@ -424,7 +422,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
             foreach(i RANGE ${LEN})
                 string(APPEND SPACES " ")
             endforeach()
-            string(APPEND SQUIRREL_EXPORT "\n	ScriptError::RegisterErrorMap(${ENUM_STRING},${SPACES}${CLS}::${ENUM_ERROR});")
+            string(APPEND SQUIRREL_EXPORT "\n\tScriptError::RegisterErrorMap(${ENUM_STRING},${SPACES}${CLS}::${ENUM_ERROR});")
         endforeach()
         if(MLEN)
             string(APPEND SQUIRREL_EXPORT "\n")
@@ -445,7 +443,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
             foreach(i RANGE ${LEN})
                 string(APPEND SPACES " ")
             endforeach()
-            string(APPEND SQUIRREL_EXPORT "\n	ScriptError::RegisterErrorMapString(${CLS}::${ENUM_ERROR_TO_STRING},${SPACES}\"${ENUM_ERROR_TO_STRING}\");")
+            string(APPEND SQUIRREL_EXPORT "\n\tScriptError::RegisterErrorMapString(${CLS}::${ENUM_ERROR_TO_STRING},${SPACES}\"${ENUM_ERROR_TO_STRING}\");")
         endforeach()
         if(MLEN)
             string(APPEND SQUIRREL_EXPORT "\n")
@@ -479,9 +477,9 @@ foreach(LINE IN LISTS SOURCE_LINES)
                 string(APPEND SPACES " ")
             endforeach()
             if("${TYPES}" STREQUAL "v")
-                string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQAdvancedStaticMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\");")
+                string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.DefSQAdvancedStaticMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\");")
             else()
-                string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQStaticMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\",${SPACES}\"${TYPES}\");")
+                string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.DefSQStaticMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\",${SPACES}\"${TYPES}\");")
             endif()
         endforeach()
         if(MLEN)
@@ -516,16 +514,16 @@ foreach(LINE IN LISTS SOURCE_LINES)
                 string(APPEND SPACES " ")
             endforeach()
             if("${TYPES}" STREQUAL "v")
-                string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQAdvancedMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\");")
+                string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.DefSQAdvancedMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\");")
             else()
-                string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\",${SPACES}\"${TYPES}\");")
+                string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.DefSQMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\",${SPACES}\"${TYPES}\");")
             endif()
         endforeach()
         if(MLEN)
             string(APPEND SQUIRREL_EXPORT "\n")
         endif()
 
-        string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.PostRegister(engine);")
+        string(APPEND SQUIRREL_EXPORT "\n\tSQ${API_CLS}.PostRegister(engine);")
         string(APPEND SQUIRREL_EXPORT "\n}")
 
         reset_reader()
@@ -538,17 +536,13 @@ foreach(LINE IN LISTS SOURCE_LINES)
         continue()
     endif()
 
-    # Count braces to skip function bodies
-    string(REGEX REPLACE "[^{]" "" OPENING_BRACES "${LINE}")
-    string(LENGTH "${OPENING_BRACES}" OPENING_BRACES)
-    string(REGEX REPLACE "[^}]" "" CLOSING_BRACES "${LINE}")
-    string(LENGTH "${CLOSING_BRACES}" CLOSING_BRACES)
-    set(OLD_BRACE_LEVEL "${BRACE_LEVEL}")
-    math(EXPR BRACE_LEVEL "${BRACE_LEVEL} + ${OPENING_BRACES} - ${CLOSING_BRACES}")
+    if(NOT BRACE_LEVEL EQUAL CLS_LEVEL)
+        continue()
+    endif()
 
     # Add enums
     if(IN_ENUM)
-        string(REGEX MATCH "([^,	 ]+)" ENUM_VALUE "${LINE}")
+        string(REGEX MATCH "([^,\t ]+)" ENUM_VALUE "${LINE}")
         list(APPEND ENUM_VALUES "${ENUM_VALUE}")
 
         # Check if this a special error enum
@@ -556,12 +550,12 @@ foreach(LINE IN LISTS SOURCE_LINES)
         if("${ENUM}" MATCHES ".*::ErrorMessages")
             # syntax:
             # enum ErrorMessages {
-            #	ERR_SOME_ERROR,	// [STR_ITEM1, STR_ITEM2, ...]
+            #\tERR_SOME_ERROR,\t// [STR_ITEM1, STR_ITEM2, ...]
             # }
 
             # Set the mappings
             if("${LINE}" MATCHES "\\[(.*)\\]")
-                string(REGEX REPLACE "[ 	]" "" MAPPINGS "${CMAKE_MATCH_1}")
+                string(REGEX REPLACE "[ \t]" "" MAPPINGS "${CMAKE_MATCH_1}")
                 string(REPLACE "," ";" MAPPINGS "${MAPPINGS}")
 
                 foreach(MAPPING IN LISTS MAPPINGS)
@@ -574,16 +568,12 @@ foreach(LINE IN LISTS SOURCE_LINES)
         continue()
     endif()
 
-    if(OLD_BRACE_LEVEL)
-        continue()
-    endif()
-
     # Add a const (non-enum) value
-    if("${LINE}" MATCHES "^[ 	]*static const [^ ]+ ([^ ]+) = -?\\(?[^ ]*\\)?[^ ]+;")
+    if("${LINE}" MATCHES "^[ \t]*static const [^ ]+ ([^ ]+) = -?\\(?[^ ]*\\)?[^ ]+;")
         list(APPEND CONST_VALUES "${CMAKE_MATCH_1}")
         continue()
     endif()
-    if("${LINE}" MATCHES "^[ 	]*static constexpr [^ ]+ ([^ ]+) = -?\\(?[^ ]*\\)?[^ ]+;")
+    if("${LINE}" MATCHES "^[ \t]*static constexpr [^ ]+ ([^ ]+) = -?\\(?[^ ]*\\)?[^ ]+;")
         list(APPEND CONST_VALUES "${CMAKE_MATCH_1}")
         continue()
     endif()
@@ -606,7 +596,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
             set(IS_STATIC TRUE)
         endif()
 
-        string(REGEX REPLACE "(virtual|static|const)[ 	]+" "" LINE "${LINE}")
+        string(REGEX REPLACE "(virtual|static|const)[ \t]+" "" LINE "${LINE}")
         string(REGEX REPLACE "{.*" "" LINE "${LINE}")
         set(PARAM_S "${LINE}")
         string(REGEX REPLACE "\\*" "" LINE "${LINE}")
@@ -617,7 +607,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
         string(REGEX REPLACE "\\).*" "" PARAM_S "${PARAM_S}")
         string(REGEX REPLACE "^\\(" "" PARAM_S "${PARAM_S}")
 
-        string(REGEX MATCH "([^ 	]+)( ([^ ]+))?" RESULT "${LINE}")
+        string(REGEX MATCH "([^ \t]+)( ([^ ]+))?" RESULT "${LINE}")
         set(FUNCTYPE "${CMAKE_MATCH_1}")
         set(FUNCNAME "${CMAKE_MATCH_3}")
         if("${FUNCTYPE}" STREQUAL "${CLS}" AND NOT FUNCNAME)
@@ -625,13 +615,13 @@ foreach(LINE IN LISTS SOURCE_LINES)
                 message(WARNING "${SCRIPT_API_FILE}:${NUM_LINE}: Constructor for '${CLS}' has @api. Tag ignored.")
                 unset(API_SELECTED)
             endif()
-            set(CLS_PARAM_0 "${PARAM_S}")
+            set(CLS_PARAMS "${PARAM_S}")
             if(NOT PARAM_S)
                 continue()
             endif()
         elseif(NOT FUNCNAME)
             continue()
-		endif()
+        endif()
 
         string(REPLACE "," ";" PARAMS "${PARAM_S}")
         if(IS_STATIC)
@@ -640,9 +630,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
             set(TYPES "x")
         endif()
 
-        set(LEN 1)
         foreach(PARAM IN LISTS PARAMS)
-            math(EXPR LEN "${LEN} + 1")
             string(STRIP "${PARAM}" PARAM)
             if("${PARAM}" MATCHES "\\*|&")
                 if("${PARAM}" MATCHES "^char")
@@ -681,8 +669,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
         unset(API_SELECTED)
 
         if("${FUNCTYPE}" STREQUAL "${CLS}" AND NOT FUNCNAME)
-            set(CLS_PARAM_1 ${LEN})
-            set(CLS_PARAM_2 "${TYPES}")
+            set(CLS_TYPES "${TYPES}")
         elseif("${FUNCNAME}" MATCHES "^_" AND NOT "${TYPES}" STREQUAL "v")
         elseif(IS_STATIC)
             list(APPEND STATIC_METHODS "${FUNCNAME}:${TYPES}")

media/baseset/openttd.grf.hash

@@ -1 +1 @@
-ff92f892a34a3b9d7a08e68281a7e9b1
+a4a727b03a7cd07ee0499231f7f233f4

media/baseset/openttd/openttdgui.nfo

@@ -4,7 +4,7 @@
 // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 //
    -1 * 0	 0C "OpenTTD GUI graphics"
-   -1 * 3	 05 15 \b 191 // OPENTTD_SPRITE_COUNT
+   -1 * 3	 05 15 \b 192 // OPENTTD_SPRITE_COUNT
    -1 sprites/openttdgui.png 8bpp  66    8  64  31 -31   7 normal
    -1 sprites/openttdgui.png 8bpp 146    8  64  31 -31   7 normal
    -1 sprites/openttdgui.png 8bpp 226    8  64  31 -31   7 normal
@@ -196,3 +196,4 @@
    -1 sprites/openttdgui.png 8bpp 567  440  12  10   0   0 normal
    -1 sprites/openttdgui.png 8bpp 581  440  10  10   0   0 normal
    -1 sprites/openttdgui.png 8bpp 593  440  10  10   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 605  440   8  10   0   0 normal

os/windows/sign_azure.ps1

@@ -24,7 +24,7 @@ if (!$Env:AZURE_CODESIGN_ENDPOINT -or !$Env:AZURE_CODESIGN_ACCOUNT_NAME -or !$En
 	exit
 }
 
-Install-Module -Name AzureCodeSigning -Scope CurrentUser -RequiredVersion 0.3.0 -Force -Repository PSGallery
+Install-Module -Name TrustedSigning -Scope CurrentUser -RequiredVersion 0.5.3 -Force -Repository PSGallery
 
 $params = @{}
 
@@ -37,4 +37,4 @@ $params["FileDigest"] = "SHA256"
 $params["TimestampRfc3161"] = "http://timestamp.acs.microsoft.com"
 $params["TimestampDigest"] = "SHA256"
 
-Invoke-AzureCodeSigning @params
+Invoke-TrustedSigning @params

regression/regression/main.nut

@@ -828,6 +828,13 @@ function Regression::List()
 	print("  []:");
 	print("    4000 => " + list[4000]);
 
+	print("  clone:");
+	local list3 = clone list;
+	print("  Clone ListDump:");
+	foreach (idx, val in list3) {
+		print("    " + idx + " => " + val);
+	}
+
 	list.Clear();
 	print("  IsEmpty():     " + list.IsEmpty());
 
@@ -860,6 +867,12 @@ function Regression::List()
 		it = list.Next();
 		print("    " + it + " => " + list.GetValue(it));
 	}
+
+	print("  Clone ListDump:");
+	foreach (idx, val in list3) {
+		print("    " + idx + " => " + val);
+	}
+
 }
 
 function Regression::Map()
@@ -1701,13 +1714,22 @@ function Regression::TownList()
 	}
 
 	print("  HasStatue():                     " + AITown.HasStatue(list.Begin()));
-	print("  GetRoadReworkDuration():         " + AITown.GetRoadReworkDuration(list.Begin()));
-	print("  GetExclusiveRightsCompany():     " + AITown.GetExclusiveRightsCompany(list.Begin()));
-	print("  GetExclusiveRightsDuration():    " + AITown.GetExclusiveRightsDuration(list.Begin()));
 	print("  IsActionAvailable(BUILD_STATUE): " + AITown.IsActionAvailable(list.Begin(), AITown.TOWN_ACTION_BUILD_STATUE));
 	print("  PerformTownAction(BUILD_STATUE): " + AITown.PerformTownAction(list.Begin(), AITown.TOWN_ACTION_BUILD_STATUE));
 	print("  IsActionAvailable(BUILD_STATUE): " + AITown.IsActionAvailable(list.Begin(), AITown.TOWN_ACTION_BUILD_STATUE));
 	print("  HasStatue():                     " + AITown.HasStatue(list.Begin()));
+	print("  GetRoadReworkDuration():         " + AITown.GetRoadReworkDuration(list.Begin()));
+	print("  IsActionAvailable(ROAD_REBUILD): " + AITown.IsActionAvailable(list.Begin(), AITown.TOWN_ACTION_ROAD_REBUILD));
+	print("  PerformTownAction(ROAD_REBUILD): " + AITown.PerformTownAction(list.Begin(), AITown.TOWN_ACTION_ROAD_REBUILD));
+	print("  IsActionAvailable(ROAD_REBUILD): " + AITown.IsActionAvailable(list.Begin(), AITown.TOWN_ACTION_ROAD_REBUILD));
+	print("  GetRoadReworkDuration():         " + AITown.GetRoadReworkDuration(list.Begin()));
+	print("  GetExclusiveRightsCompany():     " + AITown.GetExclusiveRightsCompany(list.Begin()));
+	print("  GetExclusiveRightsDuration():    " + AITown.GetExclusiveRightsDuration(list.Begin()));
+	print("  IsActionAvailable(BUY_RIGHTS):   " + AITown.IsActionAvailable(list.Begin(), AITown.TOWN_ACTION_BUY_RIGHTS));
+	print("  PerformTownAction(BUY_RIGHTS):   " + AITown.PerformTownAction(list.Begin(), AITown.TOWN_ACTION_BUY_RIGHTS));
+	print("  IsActionAvailable(BUY_RIGHTS):   " + AITown.IsActionAvailable(list.Begin(), AITown.TOWN_ACTION_BUY_RIGHTS));
+	print("  GetExclusiveRightsCompany():     " + AITown.GetExclusiveRightsCompany(list.Begin()));
+	print("  GetExclusiveRightsDuration():    " + AITown.GetExclusiveRightsDuration(list.Begin()));
 }
 
 function Regression::Tunnel()
@@ -2001,6 +2023,33 @@ function Regression::Math()
 	print("   13725      > -2147483648:   " + ( 13725      > -2147483648));
 }
 
+function Regression::PriorityQueue()
+{
+	print("");
+	print("--PriorityQueue--");
+	local queue = AIPriorityQueue();
+	print("  IsEmpty():    " + queue.IsEmpty());
+	print("  Count():      " + queue.Count());
+	print("  --Insert--")
+	for (local i = 0; i < 10; i++) {
+		print("    Insert(" + i + ", " + i + "): " + queue.Insert(i, i));
+	}
+	print("  Exists(5):    " + queue.Exists(5));
+	print("  Insert(5, 5): "+ queue.Insert(5, 5));
+	print("  IsEmpty():    " + queue.IsEmpty());
+	print("  Count():      " + queue.Count());
+	local item = queue.Peek();
+	print("  Peek():       " + item);
+	print("  Count():      " + queue.Count());
+	local item2 = queue.Pop();
+	print("  Pop():        " + item2);
+	print("  Count():      " + queue.Count());
+	print("  " + item + " == " + item2 + " :      " + (item == item2));
+	print("  Clear():      " + queue.Clear());
+	print("  IsEmpty():    " + queue.IsEmpty());
+	print("  Count():      " + queue.Count());
+}
+
 function Regression::Start()
 {
 	this.TestInit();
@@ -2075,6 +2124,20 @@ function Regression::Start()
 				print("      PresidentName:     " + c.GetNewName());
 			} break;
 
+			case AIEvent.ET_EXCLUSIVE_TRANSPORT_RIGHTS: {
+				local c = AIEventExclusiveTransportRights.Convert(e);
+				print("      EventName:         ExclusiveTransportRights");
+				print("      CompanyID:         " + c.GetCompanyID());
+				print("      TownID:            " + c.GetTownID());
+			} break;
+
+			case AIEvent.ET_ROAD_RECONSTRUCTION: {
+				local c = AIEventRoadReconstruction.Convert(e);
+				print("      EventName:         RoadReconstruction");
+				print("      CompanyID:         " + c.GetCompanyID());
+				print("      TownID:            " + c.GetTownID());
+			} break;
+
 			default:
 				print("      Unknown Event");
 				break;
@@ -2083,12 +2146,18 @@ function Regression::Start()
 	print("  IsEventWaiting:        false");
 
 	this.Math();
+	this.PriorityQueue();
 
 	/* Check Valuate() is actually limited, MUST BE THE LAST TEST. */
 	print("--Valuate() with excessive CPU usage--")
 	local list = AIList();
 	list.AddItem(0, 0);
 	local Infinite = function(id) { while(true); }
+	try {
+		list = AIIndustryList(Infinite);
+	} catch (e) {
+		print("constructor failed with: " + e);
+	}
 	list.Valuate(Infinite);
 }
 

regression/regression/result.txt

@@ -575,6 +575,13 @@
     4006 => 12
   []:
     4000 => 50
+  clone:
+  Clone ListDump:
+    1005 => 1005
+    4000 => 50
+    4001 => 8002
+    4002 => 8004
+    4006 => 12
   IsEmpty():     true
     0 => 5  (true)
 ERROR: Next() is invalid as Begin() is never called
@@ -584,6 +591,12 @@ ERROR: IsEnd() is invalid as Begin() is never called
     2 => 6  (true)
     3 => 6  (true)
     9 => 0  (false)
+  Clone ListDump:
+    1005 => 1005
+    4000 => 50
+    4001 => 8002
+    4002 => 8004
+    4006 => 12
 
 --Company--
   SetName():            true
@@ -9427,13 +9440,22 @@ ERROR: IsEnd() is invalid as Begin() is never called
     23 => 652
     25 => 563
   HasStatue():                     false
-  GetRoadReworkDuration():         0
-  GetExclusiveRightsCompany():     -1
-  GetExclusiveRightsDuration():    0
   IsActionAvailable(BUILD_STATUE): true
   PerformTownAction(BUILD_STATUE): true
   IsActionAvailable(BUILD_STATUE): false
   HasStatue():                     true
+  GetRoadReworkDuration():         0
+  IsActionAvailable(ROAD_REBUILD): true
+  PerformTownAction(ROAD_REBUILD): true
+  IsActionAvailable(ROAD_REBUILD): true
+  GetRoadReworkDuration():         6
+  GetExclusiveRightsCompany():     -1
+  GetExclusiveRightsDuration():    0
+  IsActionAvailable(BUY_RIGHTS):   true
+  PerformTownAction(BUY_RIGHTS):   true
+  IsActionAvailable(BUY_RIGHTS):   false
+  GetExclusiveRightsCompany():     1
+  GetExclusiveRightsDuration():    12
 
 --Tunnel--
   IsTunnelTile():       false
@@ -9738,6 +9760,16 @@ ERROR: IsEnd() is invalid as Begin() is never called
       EventName:         CompanyRenamed
       CompanyID:         1
       CompanyName:       Little Frutford Transport
+  GetNextEvent:          instance
+    GetEventType:        28
+      EventName:         RoadReconstruction
+      CompanyID:         1
+      TownID:            12
+  GetNextEvent:          instance
+    GetEventType:        27
+      EventName:         ExclusiveTransportRights
+      CompanyID:         1
+      TownID:            12
   IsEventWaiting:        false
 
 --Math--
@@ -9772,21 +9804,38 @@ ERROR: IsEnd() is invalid as Begin() is never called
   -1          >  2147483647:   false
   -2147483648 >  2147483647:   false
    13725      > -2147483648:   true
+
+--PriorityQueue--
+  IsEmpty():    true
+  Count():      0
+  --Insert--
+    Insert(0, 0): true
+    Insert(1, 1): true
+    Insert(2, 2): true
+    Insert(3, 3): true
+    Insert(4, 4): true
+    Insert(5, 5): true
+    Insert(6, 6): true
+    Insert(7, 7): true
+    Insert(8, 8): true
+    Insert(9, 9): true
+  Exists(5):    true
+  Insert(5, 5): true
+  IsEmpty():    false
+  Count():      11
+  Peek():       0
+  Count():      11
+  Pop():        0
+  Count():      10
+  0 == 0 :      true
+  Clear():      (null : 0x00000000)
+  IsEmpty():    true
+  Count():      0
 --Valuate() with excessive CPU usage--
+constructor failed with: excessive CPU usage in list filter function
 Your script made an error: excessive CPU usage in valuator function
 
-*FUNCTION [unknown()] regression/main.nut line [2091]
-*FUNCTION [Valuate()] NATIVE line [-1]
-*FUNCTION [Start()] regression/main.nut line [2092]
-
-[id] 0
-[this] TABLE
-[Infinite] CLOSURE
-[list] INSTANCE
-[this] INSTANCE
-Your script made an error: excessive CPU usage in valuator function
-
-*FUNCTION [Start()] regression/main.nut line [2092]
+*FUNCTION [Start()] regression/main.nut line [2161]
 
 [Infinite] CLOSURE
 [list] INSTANCE

src/3rdparty/squirrel/squirrel/sqapi.cpp

@@ -977,6 +977,10 @@ SQRESULT sq_call(HSQUIRRELVM v,SQInteger params,SQBool retval,SQBool raiseerror,
 		if(!v->_suspended) {
 			v->Pop(params);//pop closure and args
 		}
+		if (!v->_can_suspend && v->IsOpsTillSuspendError()) {
+			v->Raise_Error(fmt::format("excessive CPU usage in {}", v->_ops_till_suspend_error_label));
+			return SQ_ERROR;
+		}
 		if(retval){
 			v->Push(res); return SQ_OK;
 		}

src/CMakeLists.txt

@@ -279,6 +279,8 @@ add_files(
     newgrf_animation_type.h
     newgrf_badge.cpp
     newgrf_badge.h
+    newgrf_badge_config.cpp
+    newgrf_badge_config.h
     newgrf_badge_gui.cpp
     newgrf_badge_gui.h
     newgrf_badge_type.h

src/ai/ai_gui.cpp

@@ -142,7 +142,7 @@ struct AIConfigWindow : public Window {
 
 			case WID_AIC_LIST:
 				this->line_height = GetCharacterHeight(FS_NORMAL) + padding.height;
-				resize.height = this->line_height;
+				fill.height = resize.height = this->line_height;
 				size.height = 8 * this->line_height;
 				break;
 		}
@@ -218,7 +218,7 @@ struct AIConfigWindow : public Window {
 		if (widget >= WID_AIC_TEXTFILE && widget < WID_AIC_TEXTFILE + TFT_CONTENT_END) {
 			if (this->selected_slot == CompanyID::Invalid() || AIConfig::GetConfig(this->selected_slot) == nullptr) return;
 
-			ShowScriptTextfileWindow(this, (TextfileType)(widget - WID_AIC_TEXTFILE), this->selected_slot);
+			ShowScriptTextfileWindow(this, static_cast<TextfileType>(widget - WID_AIC_TEXTFILE), this->selected_slot);
 			return;
 		}
 
@@ -250,23 +250,23 @@ struct AIConfigWindow : public Window {
 			}
 
 			case WID_AIC_LIST: { // Select a slot
-				this->selected_slot = (CompanyID)this->vscroll->GetScrolledRowFromWidget(pt.y, this, widget);
+				this->selected_slot = static_cast<CompanyID>(this->vscroll->GetScrolledRowFromWidget(pt.y, this, widget));
 				this->InvalidateData();
-				if (click_count > 1 && IsEditable(this->selected_slot)) ShowScriptListWindow((CompanyID)this->selected_slot, _ctrl_pressed);
+				if (click_count > 1 && IsEditable(this->selected_slot)) ShowScriptListWindow(this->selected_slot, _ctrl_pressed);
 				break;
 			}
 
 			case WID_AIC_MOVE_UP:
-				if (IsEditable(this->selected_slot) && IsEditable((CompanyID)(this->selected_slot - 1))) {
+				if (IsEditable(this->selected_slot) && IsEditable(static_cast<CompanyID>(this->selected_slot - 1))) {
 					std::swap(GetGameSettings().script_config.ai[this->selected_slot], GetGameSettings().script_config.ai[this->selected_slot - 1]);
-					this->selected_slot = CompanyID(this->selected_slot - 1);
+					this->selected_slot = static_cast<CompanyID>(this->selected_slot - 1);
 					this->vscroll->ScrollTowards(this->selected_slot.base());
 					this->InvalidateData();
 				}
 				break;
 
 			case WID_AIC_MOVE_DOWN:
-				if (IsEditable(this->selected_slot) && IsEditable((CompanyID)(this->selected_slot + 1))) {
+				if (IsEditable(this->selected_slot) && IsEditable(static_cast<CompanyID>(this->selected_slot + 1))) {
 					std::swap(GetGameSettings().script_config.ai[this->selected_slot], GetGameSettings().script_config.ai[this->selected_slot + 1]);
 					++this->selected_slot;
 					this->vscroll->ScrollTowards(this->selected_slot.base());
@@ -282,11 +282,11 @@ struct AIConfigWindow : public Window {
 			}
 
 			case WID_AIC_CHANGE:  // choose other AI
-				if (IsEditable(this->selected_slot)) ShowScriptListWindow((CompanyID)this->selected_slot, _ctrl_pressed);
+				if (IsEditable(this->selected_slot)) ShowScriptListWindow(this->selected_slot, _ctrl_pressed);
 				break;
 
 			case WID_AIC_CONFIGURE: // change the settings for an AI
-				ShowScriptSettingsWindow((CompanyID)this->selected_slot);
+				ShowScriptSettingsWindow(this->selected_slot);
 				break;
 
 			case WID_AIC_CONTENT_DOWNLOAD:
@@ -320,8 +320,8 @@ struct AIConfigWindow : public Window {
 		this->SetWidgetDisabledState(WID_AIC_INCREASE_INTERVAL, GetGameSettings().difficulty.competitors_interval == MAX_COMPETITORS_INTERVAL);
 		this->SetWidgetDisabledState(WID_AIC_CHANGE, !IsEditable(this->selected_slot));
 		this->SetWidgetDisabledState(WID_AIC_CONFIGURE, this->selected_slot == CompanyID::Invalid() || config->GetConfigList()->empty());
-		this->SetWidgetDisabledState(WID_AIC_MOVE_UP, !IsEditable(this->selected_slot) || !IsEditable((CompanyID)(this->selected_slot - 1)));
-		this->SetWidgetDisabledState(WID_AIC_MOVE_DOWN, !IsEditable(this->selected_slot) || !IsEditable((CompanyID)(this->selected_slot + 1)));
+		this->SetWidgetDisabledState(WID_AIC_MOVE_UP, !IsEditable(this->selected_slot) || !IsEditable(static_cast<CompanyID>(this->selected_slot - 1)));
+		this->SetWidgetDisabledState(WID_AIC_MOVE_DOWN, !IsEditable(this->selected_slot) || !IsEditable(static_cast<CompanyID>(this->selected_slot + 1)));
 
 		this->SetWidgetDisabledState(WID_AIC_OPEN_URL, this->selected_slot == CompanyID::Invalid() || config->GetInfo() == nullptr || config->GetInfo()->GetURL().empty());
 		for (TextfileType tft = TFT_CONTENT_BEGIN; tft < TFT_CONTENT_END; tft++) {

src/ai/ai_info.cpp

@@ -34,7 +34,7 @@ template <> SQInteger PushClassName<AIInfo, ScriptType::AI>(HSQUIRRELVM vm) { sq
 	/* Create the AIInfo class, and add the RegisterAI function */
 	DefSQClass<AIInfo, ScriptType::AI> SQAIInfo("AIInfo");
 	SQAIInfo.PreRegister(engine);
-	SQAIInfo.AddConstructor<void (AIInfo::*)(), 1>(engine, "x");
+	SQAIInfo.AddConstructor<void (AIInfo::*)()>(engine, "x");
 	SQAIInfo.DefSQAdvancedMethod(engine, &AIInfo::AddSetting, "AddSetting");
 	SQAIInfo.DefSQAdvancedMethod(engine, &AIInfo::AddLabels, "AddLabels");
 	SQAIInfo.DefSQConst(engine, ScriptConfigFlags{}.base(), "CONFIG_NONE");
@@ -108,7 +108,7 @@ template <> SQInteger PushClassName<AIInfo, ScriptType::AI>(HSQUIRRELVM vm) { sq
 	/* Remove the link to the real instance, else it might get deleted by RegisterAI() */
 	sq_setinstanceup(vm, 2, nullptr);
 	/* Register the AI to the base system */
-	static_cast<AIScannerInfo *>(info->GetScanner())->SetDummyAI(info);
+	static_cast<AIScannerInfo *>(info->GetScanner())->SetDummyAI(std::unique_ptr<AIInfo>(info));
 	return 0;
 }
 

src/ai/ai_instance.cpp

@@ -27,7 +27,7 @@
 #include "table/strings.h"
 
 /* Manually include the Text glue. */
-#include "../script/api/template/template_text.hpp.sq"
+#include "../script/api/template/template_text.sq.hpp"
 
 /* Convert all AI related classes to Squirrel data. */
 #include "../script/api/ai/ai_includes.hpp"

src/ai/ai_scanner.cpp

@@ -22,11 +22,8 @@
 #include "../safeguards.h"
 
 
-AIScannerInfo::AIScannerInfo() :
-	ScriptScanner(),
-	info_dummy(nullptr)
-{
-}
+AIScannerInfo::AIScannerInfo() = default;
+AIScannerInfo::~AIScannerInfo() = default;
 
 void AIScannerInfo::Initialize()
 {
@@ -39,14 +36,9 @@ void AIScannerInfo::Initialize()
 	Script_CreateDummyInfo(this->engine->GetVM(), "AI", "ai");
 }
 
-void AIScannerInfo::SetDummyAI(class AIInfo *info)
+void AIScannerInfo::SetDummyAI(std::unique_ptr<class AIInfo> &&info)
 {
-	this->info_dummy = info;
-}
-
-AIScannerInfo::~AIScannerInfo()
-{
-	delete this->info_dummy;
+	this->info_dummy = std::move(info);
 }
 
 std::string AIScannerInfo::GetScriptName(ScriptInfo &info)
@@ -63,7 +55,7 @@ AIInfo *AIScannerInfo::SelectRandomAI() const
 {
 	if (_game_mode == GM_MENU) {
 		Debug(script, 0, "The intro game should not use AI, loading 'dummy' AI.");
-		return this->info_dummy;
+		return this->info_dummy.get();
 	}
 
 	/* Filter for AIs suitable as Random AI. */
@@ -72,7 +64,7 @@ AIInfo *AIScannerInfo::SelectRandomAI() const
 	uint num_random_ais = std::ranges::distance(random_ais);
 	if (num_random_ais == 0) {
 		Debug(script, 0, "No suitable AI found, loading 'dummy' AI.");
-		return this->info_dummy;
+		return this->info_dummy.get();
 	}
 
 	/* Pick a random AI */

src/ai/ai_scanner.hpp

@@ -37,7 +37,7 @@ public:
 	/**
 	 * Set the Dummy AI.
 	 */
-	void SetDummyAI(class AIInfo *info);
+	void SetDummyAI(std::unique_ptr<class AIInfo> &&info);
 
 protected:
 	std::string GetScriptName(ScriptInfo &info) override;
@@ -47,7 +47,7 @@ protected:
 	void RegisterAPI(class Squirrel &engine) override;
 
 private:
-	AIInfo *info_dummy; ///< The dummy AI.
+	std::unique_ptr<AIInfo> info_dummy; ///< The dummy AI.
 };
 
 class AIScannerLibrary : public ScriptScanner {

src/airport_gui.cpp

@@ -204,9 +204,9 @@ static constexpr NWidgetPart _nested_air_toolbar_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_DARK_GREEN),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_AT_AIRPORT), SetFill(0, 1), SetMinimalSize(42, 22), SetSpriteTip(SPR_IMG_AIRPORT, STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP),
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetMinimalSize(4, 22), SetFill(1, 1), EndContainer(),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_AT_DEMOLISH), SetFill(0, 1), SetMinimalSize(22, 22), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_AT_AIRPORT), SetFill(0, 1), SetToolbarMinimalSize(2), SetSpriteTip(SPR_IMG_AIRPORT, STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP),
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetToolbarSpacerMinimalSize(), SetFill(1, 1), EndContainer(),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_AT_DEMOLISH), SetFill(0, 1), SetToolbarMinimalSize(1), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
 	EndContainer(),
 };
 
@@ -561,7 +561,7 @@ public:
 		this->SelectOtherAirport(-1);
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		if (widget == WID_AP_CLASS_DROPDOWN) {
 			_selected_airport_class = (AirportClassID)index;

src/articulated_vehicles.cpp

@@ -80,20 +80,18 @@ uint CountArticulatedParts(EngineID engine_type, bool purchase_window)
 	 * either, so it doesn't matter how many articulated parts there are. */
 	if (!Vehicle::CanAllocateItem()) return 0;
 
-	Vehicle *v = nullptr;
+	std::unique_ptr<Vehicle> v;
 	if (!purchase_window) {
-		v = new Vehicle();
+		v = std::make_unique<Vehicle>();
 		v->engine_type = engine_type;
 		v->owner = _current_company;
 	}
 
 	uint i;
 	for (i = 1; i < MAX_ARTICULATED_PARTS; i++) {
-		if (GetNextArticulatedPart(i, engine_type, v) == EngineID::Invalid()) break;
+		if (GetNextArticulatedPart(i, engine_type, v.get()) == EngineID::Invalid()) break;
 	}
 
-	delete v;
-
 	return i - 1;
 }
 
@@ -432,7 +430,10 @@ void AddArticulatedParts(Vehicle *first)
 
 		if (flip_image) v->spritenum++;
 
-		if (v->type == VEH_TRAIN && TestVehicleBuildProbability(v, v->engine_type, BuildProbabilityType::Reversed)) SetBit(Train::From(v)->flags, VRF_REVERSE_DIRECTION);
+		if (v->type == VEH_TRAIN) {
+			auto prob = TestVehicleBuildProbability(v, v->engine_type, BuildProbabilityType::Reversed);
+			if (prob.has_value()) Train::From(v)->flags.Set(VehicleRailFlag::Flipped, prob.value());
+		}
 		v->UpdatePosition();
 	}
 }

src/autoreplace_cmd.cpp

@@ -185,9 +185,9 @@ static bool VerifyAutoreplaceRefitForOrders(const Vehicle *v, EngineID engine_ty
 	CargoTypes union_refit_mask_b = GetUnionOfArticulatedRefitMasks(engine_type, false);
 
 	const Vehicle *u = (v->type == VEH_TRAIN) ? v->First() : v;
-	for (const Order *o : u->Orders()) {
-		if (!o->IsRefit() || o->IsAutoRefit()) continue;
-		CargoType cargo_type = o->GetRefitCargo();
+	for (const Order &o : u->Orders()) {
+		if (!o.IsRefit() || o.IsAutoRefit()) continue;
+		CargoType cargo_type = o.GetRefitCargo();
 
 		if (!HasBit(union_refit_mask_a, cargo_type)) continue;
 		if (!HasBit(union_refit_mask_b, cargo_type)) return false;
@@ -206,13 +206,12 @@ static int GetIncompatibleRefitOrderIdForAutoreplace(const Vehicle *v, EngineID
 {
 	CargoTypes union_refit_mask = GetUnionOfArticulatedRefitMasks(engine_type, false);
 
-	const Order *o;
 	const Vehicle *u = (v->type == VEH_TRAIN) ? v->First() : v;
 
 	const OrderList *orders = u->orders;
 	if (orders == nullptr) return -1;
 	for (VehicleOrderID i = 0; i < orders->GetNumOrders(); i++) {
-		o = orders->GetOrderAt(i);
+		const Order *o = orders->GetOrderAt(i);
 		if (!o->IsRefit()) continue;
 		if (!HasBit(union_refit_mask, o->GetRefitCargo())) return i;
 	}
@@ -373,8 +372,12 @@ static CommandCost BuildReplacementVehicle(Vehicle *old_veh, Vehicle **new_vehic
 	}
 
 	/* Try to reverse the vehicle, but do not care if it fails as the new type might not be reversible */
-	if (new_veh->type == VEH_TRAIN && HasBit(Train::From(old_veh)->flags, VRF_REVERSE_DIRECTION)) {
-		Command<CMD_REVERSE_TRAIN_DIRECTION>::Do(DoCommandFlag::Execute, new_veh->index, true);
+	if (new_veh->type == VEH_TRAIN && Train::From(old_veh)->flags.Test(VehicleRailFlag::Flipped)) {
+		/* Only copy the reverse state if neither old or new vehicle implements reverse-on-build probability callback. */
+		if (!TestVehicleBuildProbability(old_veh, old_veh->engine_type, BuildProbabilityType::Reversed).has_value() &&
+			!TestVehicleBuildProbability(new_veh, new_veh->engine_type, BuildProbabilityType::Reversed).has_value()) {
+			Command<CMD_REVERSE_TRAIN_DIRECTION>::Do(DoCommandFlag::Execute, new_veh->index, true);
+		}
 	}
 
 	return cost;

src/autoreplace_gui.cpp

@@ -311,7 +311,7 @@ public:
 
 			case WID_RV_LEFT_MATRIX:
 			case WID_RV_RIGHT_MATRIX:
-				resize.height = GetEngineListHeight(this->window_number);
+				fill.height = resize.height = GetEngineListHeight(this->window_number);
 				size.height = (this->window_number <= VEH_ROAD ? 8 : 4) * resize.height;
 				break;
 
@@ -623,7 +623,7 @@ public:
 		}
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		switch (widget) {
 			case WID_RV_SORT_DROPDOWN:

src/base_media_base.h

@@ -70,14 +70,6 @@ struct BaseSet {
 	uint found_files = 0; ///< Number of the files that could be found
 	uint valid_files = 0; ///< Number of the files that could be found and are valid
 
-	T *next = nullptr; ///< The next base set in this list
-
-	/** Free everything we allocated */
-	~BaseSet()
-	{
-		delete this->next;
-	}
-
 	/**
 	 * Get the number of missing files.
 	 * @return the number
@@ -170,9 +162,9 @@ struct BaseSet {
 template <class Tbase_set>
 class BaseMedia : FileScanner {
 protected:
-	static inline Tbase_set *available_sets = nullptr; ///< All available sets
-	static inline Tbase_set *duplicate_sets = nullptr; ///< All sets that aren't available, but needed for not downloading base sets when a newer version than the one on BaNaNaS is loaded.
-	static inline const Tbase_set *used_set = nullptr; ///< The currently used set
+	static inline std::vector<std::unique_ptr<Tbase_set>> available_sets; ///< All available sets
+	static inline std::vector<std::unique_ptr<Tbase_set>> duplicate_sets; ///< All sets that aren't available, but needed for not downloading base sets when a newer version than the one on BaNaNaS is loaded.
+	static inline const Tbase_set *used_set; ///< The currently used set
 
 	bool AddFile(const std::string &filename, size_t basepath_length, const std::string &tar_filename) override;
 
@@ -181,6 +173,12 @@ protected:
 	 * @return the extension
 	 */
 	static std::string_view GetExtension();
+
+	/**
+	 * Return the duplicate sets.
+	 * @return The duplicate sets.
+	 */
+	 static std::span<const std::unique_ptr<Tbase_set>> GetDuplicateSets() { return BaseMedia<Tbase_set>::duplicate_sets; }
 public:
 	/**
 	 * Determine the graphics pack that has to be used.
@@ -198,7 +196,11 @@ public:
 		return num + fs.Scan(GetExtension(), BASESET_DIR, Tbase_set::SEARCH_IN_TARS);
 	}
 
-	static Tbase_set *GetAvailableSets();
+	/**
+	 * Return the available sets.
+	 * @return The available sets.
+	 */
+	static std::span<const std::unique_ptr<Tbase_set>> GetAvailableSets() { return BaseMedia<Tbase_set>::available_sets; }
 
 	static bool SetSet(const Tbase_set *set);
 	static bool SetSetByName(const std::string &name);
@@ -226,6 +228,6 @@ public:
  * @return The filename of the first file of the base set, or \c std::nullopt if there is no match.
  */
 template <class Tbase_set>
-std::optional<std::string_view> TryGetBaseSetFile(const ContentInfo &ci, bool md5sum, const Tbase_set *s);
+std::optional<std::string_view> TryGetBaseSetFile(const ContentInfo &ci, bool md5sum, std::span<const std::unique_ptr<Tbase_set>> sets);
 
 #endif /* BASE_MEDIA_BASE_H */

src/base_media_func.h

@@ -187,10 +187,9 @@ bool BaseSet<T>::FillSetDetails(const IniFile &ini, const std::string &path, con
 template <class Tbase_set>
 bool BaseMedia<Tbase_set>::AddFile(const std::string &filename, size_t basepath_length, const std::string &)
 {
-	bool ret = false;
 	Debug(misc, 1, "Checking {} for base {} set", filename, BaseSet<Tbase_set>::SET_TYPE);
 
-	Tbase_set *set = new Tbase_set();
+	auto set = std::make_unique<Tbase_set>();
 	IniFile ini{};
 	std::string path{ filename, basepath_length };
 	ini.LoadFromDisk(path, BASESET_DIR);
@@ -202,60 +201,44 @@ bool BaseMedia<Tbase_set>::AddFile(const std::string &filename, size_t basepath_
 		path.clear();
 	}
 
-	if (set->FillSetDetails(ini, path, filename)) {
-		Tbase_set *duplicate = nullptr;
-		for (Tbase_set *c = BaseMedia<Tbase_set>::available_sets; c != nullptr; c = c->next) {
-			if (c->name == set->name || c->shortname == set->shortname) {
-				duplicate = c;
-				break;
-			}
+	if (!set->FillSetDetails(ini, path, filename)) return false;
+
+	auto existing = std::ranges::find_if(BaseMedia<Tbase_set>::available_sets, [&set](const auto &c) { return c->name == set->name || c->shortname == set->shortname; });
+	if (existing != std::end(BaseMedia<Tbase_set>::available_sets)) {
+		/* The more complete set takes precedence over the version number. */
+		if (((*existing)->valid_files == set->valid_files && (*existing)->version >= set->version) ||
+				(*existing)->valid_files > set->valid_files) {
+
+			Debug(misc, 1, "Not adding {} ({}) as base {} set (duplicate, {})", set->name, fmt::join(set->version, "."),
+					BaseSet<Tbase_set>::SET_TYPE,
+					(*existing)->valid_files > set->valid_files ? "fewer valid files" : "lower version");
+
+			duplicate_sets.push_back(std::move(set));
+			return false;
 		}
-		if (duplicate != nullptr) {
-			/* The more complete set takes precedence over the version number. */
-			if ((duplicate->valid_files == set->valid_files && duplicate->version >= set->version) ||
-					duplicate->valid_files > set->valid_files) {
-				Debug(misc, 1, "Not adding {} ({}) as base {} set (duplicate, {})", set->name, fmt::join(set->version, "."),
-						BaseSet<Tbase_set>::SET_TYPE,
-						duplicate->valid_files > set->valid_files ? "less valid files" : "lower version");
-				set->next = BaseMedia<Tbase_set>::duplicate_sets;
-				BaseMedia<Tbase_set>::duplicate_sets = set;
-			} else {
-				Tbase_set **prev = &BaseMedia<Tbase_set>::available_sets;
-				while (*prev != duplicate) prev = &(*prev)->next;
 
-				*prev = set;
-				set->next = duplicate->next;
+		/* If the duplicate set is currently used (due to rescanning this can happen)
+		 * update the currently used set to the new one. This will 'lie' about the
+		 * version number until a new game is started which isn't a big problem */
+		if (BaseMedia<Tbase_set>::used_set == existing->get()) BaseMedia<Tbase_set>::used_set = set.get();
 
-				/* Keep baseset configuration, if compatible */
-				set->CopyCompatibleConfig(*duplicate);
+		/* Keep baseset configuration, if compatible */
+		set->CopyCompatibleConfig(**existing);
 
-				/* If the duplicate set is currently used (due to rescanning this can happen)
-				 * update the currently used set to the new one. This will 'lie' about the
-				 * version number until a new game is started which isn't a big problem */
-				if (BaseMedia<Tbase_set>::used_set == duplicate) BaseMedia<Tbase_set>::used_set = set;
+		Debug(misc, 1, "Removing {} ({}) as base {} set (duplicate, {})", (*existing)->name, fmt::join((*existing)->version, "."), BaseSet<Tbase_set>::SET_TYPE,
+				(*existing)->valid_files < set->valid_files ? "fewer valid files" : "lower version");
 
-				Debug(misc, 1, "Removing {} ({}) as base {} set (duplicate, {})", duplicate->name, fmt::join(duplicate->version, "."),
-						BaseSet<Tbase_set>::SET_TYPE,
-						duplicate->valid_files < set->valid_files ? "less valid files" : "lower version");
-				duplicate->next = BaseMedia<Tbase_set>::duplicate_sets;
-				BaseMedia<Tbase_set>::duplicate_sets = duplicate;
-				ret = true;
-			}
-		} else {
-			Tbase_set **last = &BaseMedia<Tbase_set>::available_sets;
-			while (*last != nullptr) last = &(*last)->next;
+		/* Existing set is worse, move it to duplicates and replace with the current set. */
+		duplicate_sets.push_back(std::move(*existing));
 
-			*last = set;
-			ret = true;
-		}
-		if (ret) {
-			Debug(misc, 1, "Adding {} ({}) as base {} set", set->name, fmt::join(set->version, "."), BaseSet<Tbase_set>::SET_TYPE);
-		}
+		Debug(misc, 1, "Adding {} ({}) as base {} set", set->name, fmt::join(set->version, "."), BaseSet<Tbase_set>::SET_TYPE);
+		*existing = std::move(set);
 	} else {
-		delete set;
+		Debug(grf, 1, "Adding {} ({}) as base {} set", set->name, set->version, BaseSet<Tbase_set>::SET_TYPE);
+		available_sets.push_back(std::move(set));
 	}
 
-	return ret;
+	return true;
 }
 
 /**
@@ -287,9 +270,9 @@ template <class Tbase_set>
 		return SetSet(nullptr);
 	}
 
-	for (const Tbase_set *s = BaseMedia<Tbase_set>::available_sets; s != nullptr; s = s->next) {
+	for (const auto &s : BaseMedia<Tbase_set>::available_sets) {
 		if (name == s->name) {
-			return SetSet(s);
+			return SetSet(s.get());
 		}
 	}
 	return false;
@@ -307,9 +290,9 @@ template <class Tbase_set>
 		return SetSet(nullptr);
 	}
 
-	for (const Tbase_set *s = BaseMedia<Tbase_set>::available_sets; s != nullptr; s = s->next) {
+	for (const auto &s : BaseMedia<Tbase_set>::available_sets) {
 		if (shortname == s->shortname) {
-			return SetSet(s);
+			return SetSet(s.get());
 		}
 	}
 	return false;
@@ -323,7 +306,7 @@ template <class Tbase_set>
 /* static */ void BaseMedia<Tbase_set>::GetSetsList(std::back_insert_iterator<std::string> &output_iterator)
 {
 	fmt::format_to(output_iterator, "List of {} sets:\n", BaseSet<Tbase_set>::SET_TYPE);
-	for (const Tbase_set *s = BaseMedia<Tbase_set>::available_sets; s != nullptr; s = s->next) {
+	for (const auto &s : BaseMedia<Tbase_set>::available_sets) {
 		fmt::format_to(output_iterator, "{:>18}: {}", s->name, s->GetDescription({}));
 		int invalid = s->GetNumInvalid();
 		if (invalid != 0) {
@@ -342,9 +325,9 @@ template <class Tbase_set>
 
 #include "network/core/tcp_content_type.h"
 
-template <class Tbase_set> std::optional<std::string_view> TryGetBaseSetFile(const ContentInfo &ci, bool md5sum, const Tbase_set *s)
+template <class Tbase_set> std::optional<std::string_view> TryGetBaseSetFile(const ContentInfo &ci, bool md5sum, std::span<const std::unique_ptr<Tbase_set>> sets)
 {
-	for (; s != nullptr; s = s->next) {
+	for (const auto &s : sets) {
 		if (s->GetNumMissing() != 0) continue;
 
 		if (s->shortname != ci.unique_id) continue;
@@ -362,8 +345,8 @@ template <class Tbase_set> std::optional<std::string_view> TryGetBaseSetFile(con
 template <class Tbase_set>
 /* static */ bool BaseMedia<Tbase_set>::HasSet(const ContentInfo &ci, bool md5sum)
 {
-	return TryGetBaseSetFile(ci, md5sum, BaseMedia<Tbase_set>::available_sets).has_value() ||
-			TryGetBaseSetFile(ci, md5sum, BaseMedia<Tbase_set>::duplicate_sets).has_value();
+	return TryGetBaseSetFile(ci, md5sum, BaseMedia<Tbase_set>::GetAvailableSets()).has_value() ||
+			TryGetBaseSetFile(ci, md5sum, BaseMedia<Tbase_set>::GetDuplicateSets()).has_value();
 }
 
 /**
@@ -373,12 +356,9 @@ template <class Tbase_set>
 template <class Tbase_set>
 /* static */ int BaseMedia<Tbase_set>::GetNumSets()
 {
-	int n = 0;
-	for (const Tbase_set *s = BaseMedia<Tbase_set>::available_sets; s != nullptr; s = s->next) {
-		if (s != BaseMedia<Tbase_set>::used_set && s->GetNumMissing() != 0) continue;
-		n++;
-	}
-	return n;
+	return std::ranges::count_if(BaseMedia<Tbase_set>::GetAvailableSets(), [](const auto &set) {
+		return set.get() == BaseMedia<Tbase_set>::used_set || set->GetNumMissing() == 0;
+	});
 }
 
 /**
@@ -389,8 +369,8 @@ template <class Tbase_set>
 /* static */ int BaseMedia<Tbase_set>::GetIndexOfUsedSet()
 {
 	int n = 0;
-	for (const Tbase_set *s = BaseMedia<Tbase_set>::available_sets; s != nullptr; s = s->next) {
-		if (s == BaseMedia<Tbase_set>::used_set) return n;
+	for (const auto &s : BaseMedia<Tbase_set>::available_sets) {
+		if (s.get() == BaseMedia<Tbase_set>::used_set) return n;
 		if (s->GetNumMissing() != 0) continue;
 		n++;
 	}
@@ -404,9 +384,9 @@ template <class Tbase_set>
 template <class Tbase_set>
 /* static */ const Tbase_set *BaseMedia<Tbase_set>::GetSet(int index)
 {
-	for (const Tbase_set *s = BaseMedia<Tbase_set>::available_sets; s != nullptr; s = s->next) {
-		if (s != BaseMedia<Tbase_set>::used_set && s->GetNumMissing() != 0) continue;
-		if (index == 0) return s;
+	for (const auto &s : BaseMedia<Tbase_set>::available_sets) {
+		if (s.get() != BaseMedia<Tbase_set>::used_set && s->GetNumMissing() != 0) continue;
+		if (index == 0) return s.get();
 		index--;
 	}
 	FatalError("Base{}::GetSet(): index {} out of range", BaseSet<Tbase_set>::SET_TYPE, index);
@@ -421,13 +401,3 @@ template <class Tbase_set>
 {
 	return BaseMedia<Tbase_set>::used_set;
 }
-
-/**
- * Return the available sets.
- * @return The available sets.
- */
-template <class Tbase_set>
-/* static */ Tbase_set *BaseMedia<Tbase_set>::GetAvailableSets()
-{
-	return BaseMedia<Tbase_set>::available_sets;
-}

src/bridge_gui.cpp

@@ -205,7 +205,7 @@ public:
 					sprite_dim = maxdim(sprite_dim, GetScaledSpriteSize(bridge_data.spec->sprite));
 					text_dim = maxdim(text_dim, GetStringBoundingBox(GetBridgeSelectString(bridge_data)));
 				}
-				resize.height = std::max(sprite_dim.height, text_dim.height) + padding.height; // Max of both sizes + account for matrix edges.
+				fill.height = resize.height = std::max(sprite_dim.height, text_dim.height) + padding.height; // Max of both sizes + account for matrix edges.
 
 				this->icon_width = sprite_dim.width; // Width of bridge icon.
 				size.width = this->icon_width + WidgetDimensions::scaled.hsep_normal + text_dim.width + padding.width;
@@ -283,7 +283,7 @@ public:
 		}
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		if (widget == WID_BBS_DROPDOWN_CRITERIA && this->bridges.SortType() != index) {
 			this->bridges.SetSortType(index);

src/build_vehicle_gui.cpp

@@ -18,6 +18,7 @@
 #include "company_func.h"
 #include "vehicle_gui.h"
 #include "newgrf_badge.h"
+#include "newgrf_badge_config.h"
 #include "newgrf_badge_gui.h"
 #include "newgrf_engine.h"
 #include "newgrf_text.h"
@@ -73,10 +74,13 @@ static constexpr NWidgetPart _nested_build_vehicle_widgets[] = {
 		NWidget(NWID_HORIZONTAL),
 			NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_BV_SHOW_HIDDEN_ENGINES),
 			NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_BV_CARGO_FILTER_DROPDOWN), SetResize(1, 0), SetFill(1, 0), SetToolTip(STR_TOOLTIP_FILTER_CRITERIA),
+			NWidget(WWT_IMGBTN, COLOUR_GREY, WID_BV_CONFIGURE_BADGES), SetAspect(WidgetDimensions::ASPECT_UP_DOWN_BUTTON), SetResize(0, 0), SetFill(0, 1), SetSpriteTip(SPR_EXTRA_MENU, STR_BADGE_CONFIG_MENU_TOOLTIP),
 		EndContainer(),
 		NWidget(WWT_PANEL, COLOUR_GREY),
 			NWidget(WWT_EDITBOX, COLOUR_GREY, WID_BV_FILTER), SetResize(1, 0), SetFill(1, 0), SetPadding(2), SetStringTip(STR_LIST_FILTER_OSKTITLE, STR_LIST_FILTER_TOOLTIP),
 		EndContainer(),
+		NWidget(NWID_VERTICAL, NWidContainerFlag{}, WID_BV_BADGE_FILTER),
+		EndContainer(),
 	EndContainer(),
 	/* Vehicle list. */
 	NWidget(NWID_HORIZONTAL),
@@ -1127,11 +1131,6 @@ void GUIEngineListAddChildren(GUIEngineList &dst, const GUIEngineList &src, Engi
 	}
 }
 
-/** Enum referring to the Hotkeys in the build vehicle window */
-enum BuildVehicleHotkeys : int32_t {
-	BVHK_FOCUS_FILTER_BOX, ///< Focus the edit box for editing the filter string
-};
-
 /** GUI for building vehicles. */
 struct BuildVehicleWindow : Window {
 	VehicleType vehicle_type = VEH_INVALID; ///< Type of vehicles shown in the window.
@@ -1152,9 +1151,14 @@ struct BuildVehicleWindow : Window {
 	TestedEngineDetails te{}; ///< Tested cost and capacity after refit.
 	GUIBadgeClasses badge_classes{};
 
+	static constexpr int BADGE_COLUMNS = 3; ///< Number of columns available for badges (0 = left of image, 1 = between image and name, 2 = after name)
+
 	StringFilter string_filter{}; ///< Filter for vehicle name
 	QueryString vehicle_editbox; ///< Filter editbox
 
+	std::pair<WidgetID, WidgetID> badge_filters{}; ///< First and last widgets IDs of badge filters.
+	BadgeFilterChoices badge_filter_choices{};
+
 	void SetBuyVehicleText()
 	{
 		NWidgetCore *widget = this->GetWidget<NWidgetCore>(WID_BV_BUILD);
@@ -1310,6 +1314,12 @@ struct BuildVehicleWindow : Window {
 	{
 		this->badge_classes = GUIBadgeClasses(static_cast<GrfSpecFeature>(GSF_TRAINS + this->vehicle_type));
 		this->SetCargoFilterArray();
+
+		auto container = this->GetWidget<NWidgetContainer>(WID_BV_BADGE_FILTER);
+		this->badge_filters = AddBadgeDropdownFilters(*container, WID_BV_BADGE_FILTER, COLOUR_GREY, static_cast<GrfSpecFeature>(GSF_TRAINS + this->vehicle_type));
+
+		this->widget_lookup.clear();
+		this->nested_root->FillWidgetLookup(this->widget_lookup);
 	}
 
 	/** Filter the engine list against the currently selected cargo filter */
@@ -1357,6 +1367,7 @@ struct BuildVehicleWindow : Window {
 		list.clear();
 
 		BadgeTextFilter btf(this->string_filter, GSF_TRAINS);
+		BadgeDropdownFilter bdf(this->badge_filter_choices);
 
 		/* Make list of all available train engines and wagons.
 		 * Also check to see if the previously selected engine is still available,
@@ -1373,6 +1384,8 @@ struct BuildVehicleWindow : Window {
 			/* Filter now! So num_engines and num_wagons is valid */
 			if (!FilterSingleEngine(eid)) continue;
 
+			if (!bdf.Filter(e->badges)) continue;
+
 			/* Filter by name or NewGRF extra text */
 			if (!FilterByText(e) && !btf.Filter(e->badges)) continue;
 
@@ -1578,6 +1591,12 @@ struct BuildVehicleWindow : Window {
 		return list;
 	}
 
+	DropDownList BuildBadgeConfigurationList() const
+	{
+		static const auto separators = {STR_BADGE_CONFIG_PREVIEW, STR_BADGE_CONFIG_NAME};
+		return BuildBadgeClassConfigurationList(this->badge_classes, BADGE_COLUMNS, separators);
+	}
+
 	void BuildVehicle()
 	{
 		EngineID sel_eng = this->sel_engine;
@@ -1661,6 +1680,11 @@ struct BuildVehicleWindow : Window {
 				ShowDropDownList(this, this->BuildCargoDropDownList(), this->cargo_filter_criteria, widget);
 				break;
 
+			case WID_BV_CONFIGURE_BADGES:
+				if (this->badge_classes.GetClasses().empty()) break;
+				ShowDropDownList(this, this->BuildBadgeConfigurationList(), -1, widget, 0, false, true);
+				break;
+
 			case WID_BV_SHOW_HIDE: {
 				const Engine *e = (this->sel_engine == EngineID::Invalid()) ? nullptr : Engine::Get(this->sel_engine);
 				if (e != nullptr) {
@@ -1681,6 +1705,12 @@ struct BuildVehicleWindow : Window {
 				}
 				break;
 			}
+
+			default:
+				if (IsInsideMM(widget, this->badge_filters.first, this->badge_filters.second)) {
+					ShowDropDownList(this, this->GetWidget<NWidgetBadgeFilter>(widget)->GetDropDownList(), -1, widget, 0, false);
+				}
+				break;
 		}
 	}
 
@@ -1731,6 +1761,10 @@ struct BuildVehicleWindow : Window {
 			}
 
 			default:
+				if (IsInsideMM(widget, this->badge_filters.first, this->badge_filters.second)) {
+					return this->GetWidget<NWidgetBadgeFilter>(widget)->GetStringParameter(this->badge_filter_choices);
+				}
+
 				return this->Window::GetWidgetString(widget, stringid);
 		}
 	}
@@ -1739,7 +1773,7 @@ struct BuildVehicleWindow : Window {
 	{
 		switch (widget) {
 			case WID_BV_LIST:
-				resize.height = GetEngineListHeight(this->vehicle_type);
+				fill.height = resize.height = GetEngineListHeight(this->vehicle_type);
 				size.height = 3 * resize.height;
 				size.width = std::max(size.width, this->badge_classes.GetTotalColumnsWidth() + GetVehicleImageCellSize(this->vehicle_type, EIT_PURCHASE).extend_left + GetVehicleImageCellSize(this->vehicle_type, EIT_PURCHASE).extend_right + 165) + padding.width;
 				break;
@@ -1760,6 +1794,11 @@ struct BuildVehicleWindow : Window {
 				size.width = std::max(size.width, GetDropDownListDimension(this->BuildCargoDropDownList()).width + padding.width);
 				break;
 
+			case WID_BV_CONFIGURE_BADGES:
+				/* Hide the configuration button if no configurable badges are present. */
+				if (this->badge_classes.GetClasses().empty()) size = {0, 0};
+				break;
+
 			case WID_BV_BUILD:
 				size = GetStringBoundingBox(STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_BUTTON + this->vehicle_type);
 				size = maxdim(size, GetStringBoundingBox(STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_BUTTON + this->vehicle_type));
@@ -1834,7 +1873,7 @@ struct BuildVehicleWindow : Window {
 		Command<CMD_RENAME_ENGINE>::Post(STR_ERROR_CAN_T_RENAME_TRAIN_TYPE + this->vehicle_type, this->rename_engine, *str);
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int click_result) override
 	{
 		switch (widget) {
 			case WID_BV_SORT_DROPDOWN:
@@ -1855,6 +1894,31 @@ struct BuildVehicleWindow : Window {
 					this->SelectEngine(this->sel_engine);
 				}
 				break;
+
+			case WID_BV_CONFIGURE_BADGES: {
+				bool reopen = HandleBadgeConfigurationDropDownClick(static_cast<GrfSpecFeature>(GSF_TRAINS + this->vehicle_type), BADGE_COLUMNS, index, click_result);
+
+				this->ReInit();
+
+				if (reopen) {
+					ReplaceDropDownList(this, this->BuildBadgeConfigurationList(), -1);
+				} else {
+					this->CloseChildWindows(WC_DROPDOWN_MENU);
+				}
+				break;
+			}
+
+			default:
+				if (IsInsideMM(widget, this->badge_filters.first, this->badge_filters.second)) {
+					if (index < 0) {
+						ResetBadgeFilter(this->badge_filter_choices, this->GetWidget<NWidgetBadgeFilter>(widget)->GetBadgeClassID());
+					} else {
+						SetBadgeFilter(this->badge_filter_choices, BadgeID(index));
+					}
+					this->eng_list.ForceRebuild();
+					this->SetDirty();
+				}
+				break;
 		}
 		this->SetDirty();
 	}
@@ -1872,23 +1936,8 @@ struct BuildVehicleWindow : Window {
 		}
 	}
 
-	EventState OnHotkey(int hotkey) override
-	{
-		switch (hotkey) {
-			case BVHK_FOCUS_FILTER_BOX:
-				this->SetFocusedWidget(WID_BV_FILTER);
-				SetFocusedWindow(this); // The user has asked to give focus to the text box, so make sure this window is focused.
-				return ES_HANDLED;
-
-			default:
-				return ES_NOT_HANDLED;
-		}
-
-		return ES_HANDLED;
-	}
-
 	static inline HotkeyList hotkeys{"buildvehicle", {
-		Hotkey('F', "focus_filter_box", BVHK_FOCUS_FILTER_BOX),
+		Hotkey('F', "focus_filter_box", WID_BV_FILTER),
 	}};
 };
 

src/cheat_gui.cpp

@@ -608,7 +608,7 @@ struct CheatWindow : Window {
 
 			int32_t value;
 			if (!str->empty()) {
-				auto llvalue = ParseInteger<int64_t>(*str);
+				auto llvalue = ParseInteger<int64_t>(*str, 10, true);
 				if (!llvalue.has_value()) return;
 
 				/* Save the correct currency-translated value */
@@ -623,7 +623,7 @@ struct CheatWindow : Window {
 		} else {
 			const CheatEntry *ce = &_cheats_ui[clicked_cheat];
 			int oldvalue = static_cast<int32_t>(ReadValue(ce->variable, ce->type));
-			auto value = ParseInteger<int32_t>(*str);
+			auto value = ParseInteger<int32_t>(*str, 10, true);
 			if (!value.has_value()) return;
 			*ce->been_used = true;
 			value = ce->proc(*value, *value - oldvalue);

src/company_cmd.cpp

@@ -52,7 +52,7 @@ void UpdateObjectColours(const Company *c);
 
 CompanyID _local_company;   ///< Company controlled by the human player at this client. Can also be #COMPANY_SPECTATOR.
 CompanyID _current_company; ///< Company currently doing an action.
-ReferenceThroughBaseContainer<std::array<Colours, MAX_COMPANIES>> _company_colours; ///< NOSAVE: can be determined from company structs.
+TypedIndexContainer<std::array<Colours, MAX_COMPANIES>, CompanyID> _company_colours; ///< NOSAVE: can be determined from company structs.
 CompanyManagerFace _company_manager_face; ///< for company manager face storage in openttd.cfg
 uint _cur_company_tick_index;             ///< used to generate a name for one company that doesn't have a name yet per tick
 

src/company_func.h

@@ -36,7 +36,7 @@ CommandCost CheckTileOwnership(TileIndex tile);
 extern CompanyID _local_company;
 extern CompanyID _current_company;
 
-extern ReferenceThroughBaseContainer<std::array<Colours, MAX_COMPANIES>> _company_colours;
+extern TypedIndexContainer<std::array<Colours, MAX_COMPANIES>, CompanyID> _company_colours;
 extern CompanyManagerFace _company_manager_face;
 PaletteID GetCompanyPalette(CompanyID company);
 

src/company_gui.cpp

@@ -750,13 +750,6 @@ public:
 					d = maxdim(d, GetStringBoundingBox(STR_LIVERY_DEFAULT + scheme));
 				}
 
-				/* And group names */
-				for (const Group *g : Group::Iterate()) {
-					if (g->owner == this->window_number) {
-						d = maxdim(d, GetStringBoundingBox(GetString(STR_GROUP_NAME, g->index)));
-					}
-				}
-
 				size.width = std::max(size.width, 5 + d.width + padding.width);
 				break;
 			}
@@ -768,7 +761,7 @@ public:
 
 				size.height = 5 * this->line_height;
 				resize.width = 1;
-				resize.height = this->line_height;
+				fill.height = resize.height = this->line_height;
 				break;
 			}
 
@@ -999,7 +992,7 @@ public:
 		this->vscroll->SetCapacityFromWidget(this, WID_SCL_MATRIX);
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		bool local = this->window_number == _local_company;
 		if (!local) return;
@@ -1077,15 +1070,15 @@ static constexpr NWidgetPart _nested_select_company_livery_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_GREY),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_CLASS_GENERAL), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_COMPANY_GENERAL, STR_LIVERY_GENERAL_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_CLASS_RAIL), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_TRAINLIST, STR_LIVERY_TRAIN_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_CLASS_ROAD), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_TRUCKLIST, STR_LIVERY_ROAD_VEHICLE_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_CLASS_SHIP), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_SHIPLIST, STR_LIVERY_SHIP_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_CLASS_AIRCRAFT), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_AIRPLANESLIST, STR_LIVERY_AIRCRAFT_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_GROUPS_RAIL), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_GROUP_LIVERY_TRAIN, STR_LIVERY_TRAIN_GROUP_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_GROUPS_ROAD), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_GROUP_LIVERY_ROADVEH, STR_LIVERY_ROAD_VEHICLE_GROUP_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_GROUPS_SHIP), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_GROUP_LIVERY_SHIP, STR_LIVERY_SHIP_GROUP_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_GROUPS_AIRCRAFT), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_GROUP_LIVERY_AIRCRAFT, STR_LIVERY_AIRCRAFT_GROUP_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_CLASS_GENERAL), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_COMPANY_GENERAL, STR_LIVERY_GENERAL_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_CLASS_RAIL), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_TRAINLIST, STR_LIVERY_TRAIN_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_CLASS_ROAD), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_TRUCKLIST, STR_LIVERY_ROAD_VEHICLE_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_CLASS_SHIP), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_SHIPLIST, STR_LIVERY_SHIP_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_CLASS_AIRCRAFT), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_AIRPLANESLIST, STR_LIVERY_AIRCRAFT_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_GROUPS_RAIL), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_GROUP_LIVERY_TRAIN, STR_LIVERY_TRAIN_GROUP_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_GROUPS_ROAD), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_GROUP_LIVERY_ROADVEH, STR_LIVERY_ROAD_VEHICLE_GROUP_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_GROUPS_SHIP), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_GROUP_LIVERY_SHIP, STR_LIVERY_SHIP_GROUP_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, WID_SCL_GROUPS_AIRCRAFT), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_GROUP_LIVERY_AIRCRAFT, STR_LIVERY_AIRCRAFT_GROUP_TOOLTIP),
 		NWidget(WWT_PANEL, COLOUR_GREY), SetFill(1, 1), SetResize(1, 0), EndContainer(),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
@@ -1693,7 +1686,7 @@ public:
 		if (!str.has_value()) return;
 		/* Set a new company manager face number */
 		if (!str->empty()) {
-			auto val = ParseInteger(*str);
+			auto val = ParseInteger(*str, 10, true);
 			if (!val.has_value()) return;
 			this->face = *val;
 			ScaleAllCompanyManagerFaceBits(this->face);
@@ -1944,7 +1937,7 @@ struct CompanyInfrastructureWindow : Window
 		size.width = max_label_width + WidgetDimensions::scaled.hsep_wide + this->count_width + WidgetDimensions::scaled.hsep_wide + this->cost_width;
 		size.width = std::max(size.width, max_header_width) + WidgetDimensions::scaled.framerect.Horizontal();
 
-		resize.height = GetCharacterHeight(FS_NORMAL);
+		fill.height = resize.height = GetCharacterHeight(FS_NORMAL);
 	}
 
 	void DrawWidget(const Rect &r, WidgetID widget) const override
@@ -2458,7 +2451,7 @@ struct CompanyWindow : Window
 			default: NOT_REACHED();
 
 			case WID_C_GIVE_MONEY: {
-				auto value = ParseInteger<uint64_t>(*str);
+				auto value = ParseInteger<uint64_t>(*str, 10, true);
 				if (!value.has_value()) return;
 				Money money = *value / GetCurrency().rate;
 				Command<CMD_GIVE_MONEY>::Post(STR_ERROR_CAN_T_GIVE_MONEY, money, this->window_number);

src/console_cmds.cpp

@@ -543,8 +543,12 @@ static bool ConRemove(std::span<std::string_view> argv)
 	_console_file_list_savegame.ValidateFileList();
 	const FiosItem *item = _console_file_list_savegame.FindItem(file);
 	if (item != nullptr) {
-		if (!FioRemove(item->name)) {
-			IConsolePrint(CC_ERROR, "Failed to delete '{}'.", item->name);
+		if (item->type.abstract == FT_SAVEGAME) {
+			if (!FioRemove(item->name)) {
+				IConsolePrint(CC_ERROR, "Failed to delete '{}'.", item->name);
+			}
+		} else {
+			IConsolePrint(CC_ERROR, "'{}' is not a savegame.", file);
 		}
 	} else {
 		IConsolePrint(CC_ERROR, "'{}' could not be found.", file);
@@ -2220,7 +2224,7 @@ static void OutputContentState(const ContentInfo &ci)
 	static const std::string_view states[] = { "Not selected", "Selected", "Dep Selected", "Installed", "Unknown" };
 	static const TextColour state_to_colour[] = { CC_COMMAND, CC_INFO, CC_INFO, CC_WHITE, CC_ERROR };
 
-	IConsolePrint(state_to_colour[ci.state], "{}, {}, {}, {}, {:08X}, {}", ci.id, types[ci.type - 1], states[ci.state], ci.name, ci.unique_id, FormatArrayAsHex(ci.md5sum));
+	IConsolePrint(state_to_colour[to_underlying(ci.state)], "{}, {}, {}, {}, {:08X}, {}", ci.id, types[ci.type - 1], states[to_underlying(ci.state)], ci.name, ci.unique_id, FormatArrayAsHex(ci.md5sum));
 }
 
 static bool ConContent(std::span<std::string_view> argv)
@@ -2257,7 +2261,7 @@ static bool ConContent(std::span<std::string_view> argv)
 			/* List selected content */
 			IConsolePrint(CC_WHITE, "id, type, state, name");
 			for (const ContentInfo &ci : _network_content_client.Info()) {
-				if (ci.state != ContentInfo::SELECTED && ci.state != ContentInfo::AUTOSELECTED) continue;
+				if (ci.state != ContentInfo::State::Selected && ci.state != ContentInfo::State::Autoselected) continue;
 				OutputContentState(ci);
 			}
 		} else if (StrEqualsIgnoreCase(argv[2], "all")) {

src/core/convertible_through_base.hpp

@@ -30,23 +30,24 @@ template <typename T, typename TTo>
 concept ConvertibleThroughBaseOrTo = std::is_convertible_v<T, TTo> || ConvertibleThroughBase<T>;
 
 /**
- * A sort-of mixin that adds 'at(pos)' and 'operator[](pos)' implementations for 'ConvertibleThroughBase' types.
- * This to prevent having to call '.base()' for many container accesses.
+ * A sort-of mixin that implements 'at(pos)' and 'operator[](pos)' only for a specific type.
+ * The type must have a suitable '.base()' method and therefore must inherently match 'ConvertibleThroughBase'.
+ * This to prevent having to call '.base()' for many container accesses, whilst preventing accidental use of the wrong index type.
  */
-template <typename Container>
-class ReferenceThroughBaseContainer : public Container {
+template <typename Container, typename Index>
+class TypedIndexContainer : public Container {
 public:
 	Container::reference at(size_t pos) { return this->Container::at(pos); }
-	Container::reference at(const ConvertibleThroughBase auto &pos) { return this->Container::at(pos.base()); }
+	Container::reference at(const Index &pos) { return this->Container::at(pos.base()); }
 
 	Container::const_reference at(size_t pos) const { return this->Container::at(pos); }
-	Container::const_reference at(const ConvertibleThroughBase auto &pos) const { return this->Container::at(pos.base()); }
+	Container::const_reference at(const Index &pos) const { return this->Container::at(pos.base()); }
 
 	Container::reference operator[](size_t pos) { return this->Container::operator[](pos); }
-	Container::reference operator[](const ConvertibleThroughBase auto &pos) { return this->Container::operator[](pos.base()); }
+	Container::reference operator[](const Index &pos) { return this->Container::operator[](pos.base()); }
 
 	Container::const_reference operator[](size_t pos) const { return this->Container::operator[](pos); }
-	Container::const_reference operator[](const ConvertibleThroughBase auto &pos) const { return this->Container::operator[](pos.base()); }
+	Container::const_reference operator[](const Index &pos) const { return this->Container::operator[](pos.base()); }
 };
 
 #endif /* CONVERTIBLE_THROUGH_BASE_HPP */

src/core/geometry_type.hpp

@@ -236,6 +236,19 @@ struct Rect {
 		/* This is a local version of IsInsideMM, to avoid including math_func everywhere. */
 		return (uint)(pt.x - this->left) <= (uint)(this->right - this->left) && (uint)(pt.y - this->top) <= (uint)(this->bottom - this->top);
 	}
+
+	/**
+	 * Centre a dimension within this Rect.
+	 * @param width The horizontal dimension.
+	 * @param height The vertical dimension.
+	 * @return the new resized Rect.
+	 */
+	[[nodiscard]] inline Rect CentreTo(int width, int height) const
+	{
+		int new_left = CentreBounds(this->left, this->right, width);
+		int new_right = CentreBounds(this->top, this->bottom, height);
+		return {new_left, new_right, new_left + width, new_right + height};
+	}
 };
 
 /**

src/core/string_consumer.hpp

@@ -797,12 +797,12 @@ public:
 
 private:
 	template <class T>
-	[[nodiscard]] static std::pair<size_type, T> ParseIntegerBase(std::string_view src, int base, bool log_errors)
+	[[nodiscard]] static std::pair<size_type, T> ParseIntegerBase(std::string_view src, int base, bool clamp, bool log_errors)
 	{
 		if (base == 0) {
 			/* Try positive hex */
 			if (src.starts_with("0x") || src.starts_with("0X")) {
-				auto [len, value] = ParseIntegerBase<T>(src.substr(2), 16, log_errors);
+				auto [len, value] = ParseIntegerBase<T>(src.substr(2), 16, clamp, log_errors);
 				if (len == 0) return {};
 				return {len + 2, value};
 			}
@@ -810,18 +810,21 @@ private:
 			/* Try negative hex */
 			if (std::is_signed_v<T> && (src.starts_with("-0x") || src.starts_with("-0X"))) {
 				using Unsigned = std::make_unsigned_t<T>;
-				auto [len, uvalue] = ParseIntegerBase<Unsigned>(src.substr(3), 16, log_errors);
+				auto [len, uvalue] = ParseIntegerBase<Unsigned>(src.substr(3), 16, clamp, log_errors);
 				if (len == 0) return {};
 				T value = static_cast<T>(0 - uvalue);
 				if (value > 0) {
-					if (log_errors) LogError(fmt::format("Integer out of range: '{}'", src.substr(0, len + 3)));
-					return {};
+					if (!clamp) {
+						if (log_errors) LogError(fmt::format("Integer out of range: '{}'", src.substr(0, len + 3)));
+						return {};
+					}
+					value = std::numeric_limits<T>::lowest();
 				}
 				return {len + 3, value};
 			}
 
 			/* Try decimal */
-			return ParseIntegerBase<T>(src, 10, log_errors);
+			return ParseIntegerBase<T>(src, 10, clamp, log_errors);
 		}
 
 		T value{};
@@ -829,10 +832,16 @@ private:
 		auto result = std::from_chars(src.data(), src.data() + src.size(), value, base);
 		auto len = result.ptr - src.data();
 		if (result.ec == std::errc::result_out_of_range) {
-			if (log_errors) LogError(fmt::format("Integer out of range: '{}'+'{}'", src.substr(0, len), src.substr(len, 4)));
-			return {};
-		}
-		if (result.ec != std::errc{}) {
+			if (!clamp) {
+				if (log_errors) LogError(fmt::format("Integer out of range: '{}'+'{}'", src.substr(0, len), src.substr(len, 4)));
+				return {};
+			}
+			if (src.starts_with("-")) {
+				value = std::numeric_limits<T>::lowest();
+			} else {
+				value = std::numeric_limits<T>::max();
+			}
+		} else if (result.ec != std::errc{}) {
 			if (log_errors) LogError(fmt::format("Cannot parse integer: '{}'+'{}'", src.substr(0, len), src.substr(len, 4)));
 			return {};
 		}
@@ -843,24 +852,28 @@ public:
 	/**
 	 * Peek and parse an integer in number 'base'.
 	 * If 'base == 0', then a prefix '0x' decides between base 16 or base 10.
+	 * @param clamp If the value is a valid number, but out of range for T, return the maximum representable value.
+	 *              Negative values for unsigned results are still treated as invalid.
 	 * @return Length of string match, and parsed value.
 	 * @note The parser rejects leading whitespace and unary plus.
 	 */
 	template <class T>
-	[[nodiscard]] std::pair<size_type, T> PeekIntegerBase(int base) const
+	[[nodiscard]] std::pair<size_type, T> PeekIntegerBase(int base, bool clamp = false) const
 	{
-		return ParseIntegerBase<T>(this->src.substr(this->position), base, false);
+		return ParseIntegerBase<T>(this->src.substr(this->position), base, clamp, false);
 	}
 	/**
 	 * Try to read and parse an integer in number 'base', and then advance the reader.
 	 * If 'base == 0', then a prefix '0x' decides between base 16 or base 10.
+	 * @param clamp If the value is a valid number, but out of range for T, return the maximum representable value.
+	 *              Negative values for unsigned results are still treated as invalid.
 	 * @return Parsed value, if valid.
 	 * @note The parser rejects leading whitespace and unary plus.
 	 */
 	template <class T>
-	[[nodiscard]] std::optional<T> TryReadIntegerBase(int base)
+	[[nodiscard]] std::optional<T> TryReadIntegerBase(int base, bool clamp = false)
 	{
-		auto [len, value] = this->PeekIntegerBase<T>(base);
+		auto [len, value] = this->PeekIntegerBase<T>(base, clamp);
 		if (len == 0) return std::nullopt;
 		this->SkipIntegerBase(base);
 		return value;
@@ -868,14 +881,16 @@ public:
 	/**
 	 * Read and parse an integer in number 'base', and advance the reader.
 	 * If 'base == 0', then a prefix '0x' decides between base 16 or base 10.
+	 * @param clamp If the value is a valid number, but out of range for T, return the maximum representable value.
+	 *              Negative values for unsigned results are still treated as invalid.
 	 * @return Parsed value, or 'def' if invalid.
 	 * @note The reader is advanced, even if no valid data was present.
 	 * @note The parser rejects leading whitespace and unary plus.
 	 */
 	template <class T>
-	[[nodiscard]] T ReadIntegerBase(int base, T def = 0)
+	[[nodiscard]] T ReadIntegerBase(int base, T def = 0, bool clamp = false)
 	{
-		auto [len, value] = ParseIntegerBase<T>(this->src.substr(this->position), base, true);
+		auto [len, value] = ParseIntegerBase<T>(this->src.substr(this->position), base, clamp, true);
 		this->SkipIntegerBase(base); // always advance
 		return len > 0 ? value : def;
 	}
@@ -894,14 +909,16 @@ public:
  * Accepts leading and trailing whitespace. Trailing junk is an error.
  * @param arg The string to be converted.
  * @param base The base for parsing the number, defaults to only decimal numbers. Use 0 to also allow hexadecimal.
+ * @param clamp If the value is a valid number, but out of range for T, return the maximum representable value.
+ *              Negative values for unsigned results are still treated as invalid.
  * @return The number, or std::nullopt if it could not be parsed.
  */
 template <class T = uint32_t>
-static inline std::optional<T> ParseInteger(std::string_view arg, int base = 10)
+static inline std::optional<T> ParseInteger(std::string_view arg, int base = 10, bool clamp = false)
 {
 	StringConsumer consumer{arg};
 	consumer.SkipUntilCharNotIn(StringConsumer::WHITESPACE_NO_NEWLINE);
-	auto result = consumer.TryReadIntegerBase<T>(base);
+	auto result = consumer.TryReadIntegerBase<T>(base, clamp);
 	consumer.SkipUntilCharNotIn(StringConsumer::WHITESPACE_NO_NEWLINE);
 	if (consumer.AnyBytesLeft()) return std::nullopt;
 	return result;

src/date_gui.cpp

@@ -153,7 +153,7 @@ struct SetDateWindow : Window {
 		}
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		switch (widget) {
 			case WID_SD_DAY:

src/debug.h

@@ -61,20 +61,49 @@ void SetDebugString(std::string_view s, SetDebugStringErrorFunc error_func);
 std::string GetDebugString();
 
 /** TicToc profiling.
- * Usage:
+ * Usage for max_count based output:
  * static TicToc::State state("A name", 1);
  * TicToc tt(state);
  * --Do your code--
+ *
+ * Usage for per-tick output:
+ * static TicToc::State state("A name");
+ * TicToc tt(state);
+ * --Do your code--
  */
 struct TicToc {
 	/** Persistent state for TicToc profiling. */
 	struct State {
 		const std::string_view name;
-		const uint32_t max_count;
+		const std::optional<uint32_t> max_count;
 		uint32_t count = 0;
 		uint64_t chrono_sum = 0;
 
-		constexpr State(std::string_view name, uint32_t max_count) : name(name), max_count(max_count) { }
+		using States = std::vector<State *>;
+
+		State(std::string_view name, std::optional<uint32_t> max_count = {}) : name(name), max_count(max_count)
+		{
+			GetStates().push_back(this);
+		}
+
+		~State()
+		{
+			/* Container might be already destroyed. */
+			if (!GetStates().empty()) std::erase(GetStates(), this);
+		}
+
+		static States &GetStates()
+		{
+			thread_local static States s_states;
+			return s_states;
+		}
+
+		void OutputAndReset(const std::string_view prefix = "")
+		{
+			Debug(misc, 0, "[{}] [{}] {} calls in {} us [avg: {:.1f} us]", prefix, this->name, this->count, this->chrono_sum, this->chrono_sum / static_cast<double>(this->count));
+			this->count = 0;
+			this->chrono_sum = 0;
+		}
 	};
 
 	State &state;
@@ -85,10 +114,17 @@ struct TicToc {
 	inline ~TicToc()
 	{
 		this->state.chrono_sum += (std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::high_resolution_clock::now() - this->chrono_start)).count();
-		if (++this->state.count == this->state.max_count) {
-			Debug(misc, 0, "[{}] {} us [avg: {:.1f} us]", this->state.name, this->state.chrono_sum, this->state.chrono_sum / static_cast<double>(this->state.count));
-			this->state.count = 0;
-			this->state.chrono_sum = 0;
+		this->state.count++;
+		if (this->state.max_count.has_value() && this->state.count == this->state.max_count.value()) {
+			this->state.OutputAndReset("MaxCount");
+		}
+	}
+
+	static void Tick(const std::string_view prefix)
+	{
+		for (auto state : State::GetStates()) {
+			if (state->max_count.has_value() || state->count == 0) continue;
+			state->OutputAndReset(prefix);
 		}
 	}
 };

src/dock_gui.cpp

@@ -340,14 +340,14 @@ static constexpr NWidgetPart _nested_build_docks_toolbar_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_DARK_GREEN),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL_LTR),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_CANAL), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUILD_CANAL, STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_LOCK), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUILD_LOCK, STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP),
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetMinimalSize(5, 22), SetFill(1, 1), EndContainer(),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_DEMOLISH), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_DEPOT), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_SHIP_DEPOT, STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_STATION), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_SHIP_DOCK, STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_BUOY), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUOY, STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_BUILD_AQUEDUCT), SetMinimalSize(23, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_AQUEDUCT, STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_CANAL), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUILD_CANAL, STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_LOCK), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUILD_LOCK, STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP),
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetToolbarSpacerMinimalSize(), SetFill(1, 1), EndContainer(),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_DEMOLISH), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_DEPOT), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_SHIP_DEPOT, STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_STATION), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_SHIP_DOCK, STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_BUOY), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUOY, STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_BUILD_AQUEDUCT), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_AQUEDUCT, STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP),
 	EndContainer(),
 };
 
@@ -385,12 +385,12 @@ static constexpr NWidgetPart _nested_build_docks_scen_toolbar_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_DARK_GREEN),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_CANAL), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUILD_CANAL, STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_LOCK), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUILD_LOCK, STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP),
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetMinimalSize(5, 22), SetFill(1, 1), EndContainer(),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_DEMOLISH), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_RIVER), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUILD_RIVER, STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_BUILD_AQUEDUCT), SetMinimalSize(22, 22), SetFill(0, 1), SetSpriteTip(SPR_IMG_AQUEDUCT, STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_CANAL), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUILD_CANAL, STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_LOCK), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUILD_LOCK, STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP),
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetToolbarSpacerMinimalSize(), SetFill(1, 1), EndContainer(),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_DEMOLISH), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_RIVER), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_BUILD_RIVER, STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_DT_BUILD_AQUEDUCT), SetToolbarMinimalSize(1), SetFill(0, 1), SetSpriteTip(SPR_IMG_AQUEDUCT, STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP),
 	EndContainer(),
 };
 

src/dropdown.cpp

@@ -77,6 +77,7 @@ struct DropdownWindow : Window {
 	Rect wi_rect{}; ///< Rect of the button that opened the dropdown.
 	DropDownList list{}; ///< List with dropdown menu items.
 	int selected_result = 0; ///< Result value of the selected item in the list.
+	int selected_click_result = -1; ///< Click result value, from the OnClick handler of the selected item.
 	uint8_t click_delay = 0; ///< Timer to delay selection.
 	bool drag_mode = true;
 	bool instant_close = false; ///< Close the window when the mouse button is raised.
@@ -131,7 +132,7 @@ struct DropdownWindow : Window {
 		Point pt = _cursor.pos;
 		pt.x -= this->parent->left;
 		pt.y -= this->parent->top;
-		this->parent->OnDropdownClose(pt, this->parent_button, this->selected_result, this->instant_close);
+		this->parent->OnDropdownClose(pt, this->parent_button, this->selected_result, this->selected_click_result, this->instant_close);
 
 		/* Set flag on parent widget to indicate that we have just closed. */
 		NWidgetCore *nwc = this->parent->GetWidget<NWidgetCore>(this->parent_button);
@@ -225,14 +226,15 @@ struct DropdownWindow : Window {
 
 	/**
 	 * Find the dropdown item under the cursor.
-	 * @param[out] value Selected item, if function returns \c true.
+	 * @param[out] result Selected item, if function returns \c true.
+	 * @param[out] click_result Click result from OnClick of Selected item, if function returns \c true.
 	 * @return Cursor points to a dropdown item.
 	 */
-	bool GetDropDownItem(int &value)
+	bool GetDropDownItem(int &result, int &click_result)
 	{
 		if (GetWidgetFromPos(this, _cursor.pos.x - this->left, _cursor.pos.y - this->top) < 0) return false;
 
-		const Rect &r = this->GetWidget<NWidgetBase>(WID_DM_ITEMS)->GetCurrentRect().Shrink(WidgetDimensions::scaled.dropdownlist);
+		const Rect &r = this->GetWidget<NWidgetBase>(WID_DM_ITEMS)->GetCurrentRect().Shrink(WidgetDimensions::scaled.dropdownlist).Shrink(WidgetDimensions::scaled.dropdowntext, RectPadding::zero);
 		int y     = _cursor.pos.y - this->top - r.top;
 		int pos   = this->vscroll->GetPosition();
 
@@ -244,7 +246,8 @@ struct DropdownWindow : Window {
 
 			if (y < item_height) {
 				if (item->masked || !item->Selectable()) return false;
-				value = item->result;
+				result = item->result;
+				click_result = item->OnClick({r.left, 0, r.right, item_height - 1}, {_cursor.pos.x - this->left, y});
 				return true;
 			}
 
@@ -275,7 +278,7 @@ struct DropdownWindow : Window {
 				bool selected = (this->selected_result == item->result) && item->Selectable();
 				if (selected) GfxFillRect(full, PC_BLACK);
 
-				item->Draw(full, full.Shrink(WidgetDimensions::scaled.dropdowntext, RectPadding::zero), selected, colour);
+				item->Draw(full, full.Shrink(WidgetDimensions::scaled.dropdowntext, RectPadding::zero), selected, selected ? this->selected_click_result : -1, colour);
 			}
 			y += item_height;
 		}
@@ -284,10 +287,11 @@ struct DropdownWindow : Window {
 	void OnClick([[maybe_unused]] Point pt, WidgetID widget, [[maybe_unused]] int click_count) override
 	{
 		if (widget != WID_DM_ITEMS) return;
-		int item;
-		if (this->GetDropDownItem(item)) {
+		int result, click_result;
+		if (this->GetDropDownItem(result, click_result)) {
 			this->click_delay = 4;
-			this->selected_result = item;
+			this->selected_result = result;
+			this->selected_click_result = click_result;
 			this->SetDirty();
 		}
 	}
@@ -307,16 +311,16 @@ struct DropdownWindow : Window {
 			/* Close the dropdown, so it doesn't affect new window placement.
 			 * Also mark it dirty in case the callback deals with the screen. (e.g. screenshots). */
 			if (!this->persist) this->Close();
-			this->parent->OnDropdownSelect(this->parent_button, this->selected_result);
+			this->parent->OnDropdownSelect(this->parent_button, this->selected_result, this->selected_click_result);
 			return;
 		}
 
 		if (this->drag_mode) {
-			int item;
+			int result, click_result;
 
 			if (!_left_button_clicked) {
 				this->drag_mode = false;
-				if (!this->GetDropDownItem(item)) {
+				if (!this->GetDropDownItem(result, click_result)) {
 					if (this->instant_close) this->Close();
 					return;
 				}
@@ -332,19 +336,21 @@ struct DropdownWindow : Window {
 					return;
 				}
 
-				if (!this->GetDropDownItem(item)) return;
+				if (!this->GetDropDownItem(result, click_result)) return;
 			}
 
-			if (this->selected_result != item) {
-				this->selected_result = item;
+			if (this->selected_result != result || this->selected_click_result != click_result) {
+				this->selected_result = result;
+				this->selected_click_result = click_result;
 				this->SetDirty();
 			}
 		}
 	}
 
-	void ReplaceList(DropDownList &&list)
+	void ReplaceList(DropDownList &&list, std::optional<int> selected_result)
 	{
 		this->list = std::move(list);
+		if (selected_result.has_value()) this->selected_result = *selected_result;
 		this->UpdateSizeAndPosition();
 		this->ReInit(0, 0);
 		this->InitializePositionSize(this->position.x, this->position.y, this->nested_root->smallest_x, this->nested_root->smallest_y);
@@ -353,10 +359,10 @@ struct DropdownWindow : Window {
 	}
 };
 
-void ReplaceDropDownList(Window *parent, DropDownList &&list)
+void ReplaceDropDownList(Window *parent, DropDownList &&list, std::optional<int> selected_result)
 {
 	DropdownWindow *ddw = dynamic_cast<DropdownWindow *>(parent->FindChildWindow(WC_DROPDOWN_MENU));
-	if (ddw != nullptr) ddw->ReplaceList(std::move(list));
+	if (ddw != nullptr) ddw->ReplaceList(std::move(list), selected_result);
 }
 
 /**

src/dropdown_common_type.h

@@ -14,6 +14,7 @@
 #include "gfx_func.h"
 #include "gfx_type.h"
 #include "palette_func.h"
+#include "settings_gui.h"
 #include "string_func.h"
 #include "strings_func.h"
 #include "window_gui.h"
@@ -34,7 +35,7 @@ public:
 	bool Selectable() const override { return false; }
 	uint Height() const override { return std::max<uint>(GetCharacterHeight(TFs), this->TBase::Height()); }
 
-	void Draw(const Rect &full, const Rect &, bool, Colours bg_colour) const override
+	void Draw(const Rect &full, const Rect &, bool, int, Colours bg_colour) const override
 	{
 		uint8_t c1 = GetColourGradient(bg_colour, SHADE_DARK);
 		uint8_t c2 = GetColourGradient(bg_colour, SHADE_LIGHTEST);
@@ -75,11 +76,17 @@ public:
 
 	uint Width() const override { return this->dim.width + this->TBase::Width(); }
 
-	void Draw(const Rect &full, const Rect &r, bool sel, Colours bg_colour) const override
+	int OnClick(const Rect &r, const Point &pt) const override
+	{
+		bool rtl = TEnd ^ (_current_text_dir == TD_RTL);
+		return this->TBase::OnClick(r.Indent(this->dim.width, rtl), pt);
+	}
+
+	void Draw(const Rect &full, const Rect &r, bool sel, int click_result, Colours bg_colour) const override
 	{
 		bool rtl = TEnd ^ (_current_text_dir == TD_RTL);
 		DrawStringMultiLine(r.WithWidth(this->dim.width, rtl), this->string, this->GetColour(sel), SA_CENTER, false, TFs);
-		this->TBase::Draw(full, r.Indent(this->dim.width, rtl), sel, bg_colour);
+		this->TBase::Draw(full, r.Indent(this->dim.width, rtl), sel, click_result, bg_colour);
 	}
 
 	/**
@@ -125,12 +132,18 @@ public:
 	uint Height() const override { return std::max(this->dbounds.height, this->TBase::Height()); }
 	uint Width() const override { return this->dbounds.width + WidgetDimensions::scaled.hsep_normal + this->TBase::Width(); }
 
-	void Draw(const Rect &full, const Rect &r, bool sel, Colours bg_colour) const override
+	int OnClick(const Rect &r, const Point &pt) const override
+	{
+		bool rtl = TEnd ^ (_current_text_dir == TD_RTL);
+		return this->TBase::OnClick(r.Indent(this->dbounds.width + WidgetDimensions::scaled.hsep_normal, rtl), pt);
+	}
+
+	void Draw(const Rect &full, const Rect &r, bool sel, int click_result, Colours bg_colour) const override
 	{
 		bool rtl = TEnd ^ (_current_text_dir == TD_RTL);
 		Rect ir = r.WithWidth(this->dbounds.width, rtl);
 		DrawSprite(this->sprite, this->palette, CentreBounds(ir.left, ir.right, this->dsprite.width), CentreBounds(r.top, r.bottom, this->dsprite.height));
-		this->TBase::Draw(full, r.Indent(this->dbounds.width + WidgetDimensions::scaled.hsep_normal, rtl), sel, bg_colour);
+		this->TBase::Draw(full, r.Indent(this->dbounds.width + WidgetDimensions::scaled.hsep_normal, rtl), sel, click_result, bg_colour);
 	}
 };
 
@@ -154,13 +167,69 @@ public:
 	uint Height() const override { return std::max<uint>(this->dim.height, this->TBase::Height()); }
 	uint Width() const override { return this->dim.width + WidgetDimensions::scaled.hsep_wide + this->TBase::Width(); }
 
-	void Draw(const Rect &full, const Rect &r, bool sel, Colours bg_colour) const override
+	int OnClick(const Rect &r, const Point &pt) const override
+	{
+		bool rtl = TEnd ^ (_current_text_dir == TD_RTL);
+		return this->TBase::OnClick(r.Indent(this->dim.width + WidgetDimensions::scaled.hsep_wide, rtl), pt);
+	}
+
+	void Draw(const Rect &full, const Rect &r, bool sel, int click_result, Colours bg_colour) const override
 	{
 		bool rtl = TEnd ^ (_current_text_dir == TD_RTL);
 		if (this->checked) {
 			DrawStringMultiLine(r.WithWidth(this->dim.width, rtl), STR_JUST_CHECKMARK, this->GetColour(sel), SA_CENTER, false, TFs);
 		}
-		this->TBase::Draw(full, r.Indent(this->dim.width + WidgetDimensions::scaled.hsep_wide, rtl), sel, bg_colour);
+		this->TBase::Draw(full, r.Indent(this->dim.width + WidgetDimensions::scaled.hsep_wide, rtl), sel, click_result, bg_colour);
+	}
+};
+
+/**
+ * Drop down boolean toggle component.
+ * @tparam TBase Base component.
+ * @tparam TEnd Position toggle at end if true, or start if false.
+ */
+template <class TBase, bool TEnd = false>
+class DropDownToggle : public TBase {
+	bool on; ///< Is item on.
+	int click; ///< Click result when toggle used.
+	Colours button_colour; ///< Colour of toggle button.
+	Colours background_colour; ///< Colour of toggle background.
+public:
+	template <typename... Args>
+	explicit DropDownToggle(bool on, int click, Colours button_colour, Colours background_colour, Args&&... args)
+		: TBase(std::forward<Args>(args)...), on(on), click(click), button_colour(button_colour), background_colour(background_colour)
+	{
+	}
+
+	uint Height() const override
+	{
+		return std::max<uint>(SETTING_BUTTON_HEIGHT + WidgetDimensions::scaled.vsep_normal, this->TBase::Height());
+	}
+
+	uint Width() const override
+	{
+		return SETTING_BUTTON_WIDTH + WidgetDimensions::scaled.hsep_wide + this->TBase::Width();
+	}
+
+	int OnClick(const Rect &r, const Point &pt) const override
+	{
+		bool rtl = TEnd ^ (_current_text_dir == TD_RTL);
+		int w = SETTING_BUTTON_WIDTH;
+
+		if (r.WithWidth(w, rtl).CentreTo(w, SETTING_BUTTON_HEIGHT).Contains(pt)) return this->click;
+
+		return this->TBase::OnClick(r.Indent(w + WidgetDimensions::scaled.hsep_wide, rtl), pt);
+	}
+
+	void Draw(const Rect &full, const Rect &r, bool sel, int click_result, Colours bg_colour) const override
+	{
+		bool rtl = TEnd ^ (_current_text_dir == TD_RTL);
+		int w = SETTING_BUTTON_WIDTH;
+
+		Rect br = r.WithWidth(w, rtl).CentreTo(w, SETTING_BUTTON_HEIGHT);
+		DrawBoolButton(br.left, br.top, this->button_colour, this->background_colour, this->on, true);
+
+		this->TBase::Draw(full, r.Indent(w + WidgetDimensions::scaled.hsep_wide, rtl), sel, click_result, bg_colour);
 	}
 };
 
@@ -178,11 +247,30 @@ public:
 
 	uint Width() const override { return this->indent * WidgetDimensions::scaled.hsep_indent + this->TBase::Width(); }
 
-	void Draw(const Rect &full, const Rect &r, bool sel, Colours bg_colour) const override
+	int OnClick(const Rect &r, const Point &pt) const override
 	{
 		bool rtl = TEnd ^ (_current_text_dir == TD_RTL);
-		this->TBase::Draw(full, r.Indent(this->indent * WidgetDimensions::scaled.hsep_indent, rtl), sel, bg_colour);
+		return this->TBase::OnClick(r.Indent(this->indent * WidgetDimensions::scaled.hsep_indent, rtl), pt);
 	}
+
+	void Draw(const Rect &full, const Rect &r, bool sel, int click_result, Colours bg_colour) const override
+	{
+		bool rtl = TEnd ^ (_current_text_dir == TD_RTL);
+		this->TBase::Draw(full, r.Indent(this->indent * WidgetDimensions::scaled.hsep_indent, rtl), sel, click_result, bg_colour);
+	}
+};
+
+/**
+ * Drop down component that makes the item unselectable.
+ * @tparam TBase Base component.
+ */
+template <class TBase, FontSize TFs = FS_NORMAL>
+class DropDownUnselectable : public TBase {
+public:
+	template <typename... Args>
+	explicit DropDownUnselectable(Args&&... args) : TBase(std::forward<Args>(args)...) {}
+
+	bool Selectable() const override { return false; }
 };
 
 /* Commonly used drop down list items. */

src/dropdown_type.h

@@ -32,7 +32,12 @@ public:
 	virtual uint Height() const { return 0; }
 	virtual uint Width() const { return 0; }
 
-	virtual void Draw(const Rect &full, const Rect &, bool, Colours bg_colour) const
+	virtual int OnClick(const Rect &, const Point &) const
+	{
+		return -1;
+	}
+
+	virtual void Draw(const Rect &full, const Rect &, bool, int, Colours bg_colour) const
 	{
 		if (this->masked) GfxFillRect(full, GetColourGradient(bg_colour, SHADE_LIGHT), FILLRECT_CHECKER);
 	}
@@ -55,6 +60,6 @@ void ShowDropDownList(Window *w, DropDownList &&list, int selected, WidgetID but
 
 Dimension GetDropDownListDimension(const DropDownList &list);
 
-void ReplaceDropDownList(Window *parent, DropDownList &&list);
+void ReplaceDropDownList(Window *parent, DropDownList &&list, std::optional<int> selected_result = std::nullopt);
 
 #endif /* DROPDOWN_TYPE_H */

src/economy.cpp

@@ -101,7 +101,7 @@ const ScoreInfo _score_info[] = {
 	{       0,   0}  // SCORE_TOTAL
 };
 
-ReferenceThroughBaseContainer<std::array<std::array<int64_t, SCORE_END>, MAX_COMPANIES>> _score_part;
+TypedIndexContainer<std::array<std::array<int64_t, SCORE_END>, MAX_COMPANIES>, CompanyID> _score_part;
 Economy _economy;
 Prices _price;
 static PriceMultipliers _price_base_multiplier;

src/economy_func.h

@@ -23,7 +23,7 @@ void ResetPriceBaseMultipliers();
 void SetPriceBaseMultiplier(Price price, int factor);
 
 extern const ScoreInfo _score_info[];
-extern ReferenceThroughBaseContainer<std::array<std::array<int64_t, SCORE_END>, MAX_COMPANIES>> _score_part;
+extern TypedIndexContainer<std::array<std::array<int64_t, SCORE_END>, MAX_COMPANIES>, CompanyID> _score_part;
 extern Economy _economy;
 /* Prices and also the fractional part. */
 extern Prices _price;

src/elrail.cpp

@@ -623,7 +623,7 @@ void UpdateDisableElrailSettingState(bool disable, bool update_vehicles)
 				 *  so add there also normal rail compatibility */
 				t->compatible_railtypes.Set(RAILTYPE_RAIL);
 				t->railtype = RAILTYPE_RAIL;
-				SetBit(t->flags, VRF_EL_ENGINE_ALLOWED_NORMAL_RAIL);
+				t->flags.Set(VehicleRailFlag::AllowedOnNormalRail);
 			}
 		}
 	}

src/engine.cpp

@@ -1085,22 +1085,13 @@ static void NewVehicleAvailable(Engine *e)
 	 * prevent that company from getting future intro periods for a while. */
 	if (e->flags.Test(EngineFlag::ExclusivePreview)) {
 		for (Company *c : Company::Iterate()) {
-			uint block_preview = c->block_preview;
-
 			if (!e->company_avail.Test(c->index)) continue;
 
-			/* We assume the user did NOT build it.. prove me wrong ;) */
-			c->block_preview = 20;
-
-			for (const Vehicle *v : Vehicle::Iterate()) {
-				if (v->type == VEH_TRAIN || v->type == VEH_ROAD || v->type == VEH_SHIP ||
-						(v->type == VEH_AIRCRAFT && Aircraft::From(v)->IsNormalAircraft())) {
-					if (v->owner == c->index && v->engine_type == index) {
-						/* The user did prove me wrong, so restore old value */
-						c->block_preview = block_preview;
-						break;
-					}
-				}
+			/* Check the company's 'ALL_GROUP' group statistics. This only includes countable vehicles, which is fine
+			 * as those are the only engines that can be given exclusive previews. */
+			if (GetGroupNumEngines(c->index, ALL_GROUP, e->index) == 0) {
+				/* The company did not build this engine during preview. */
+				c->block_preview = 20;
 			}
 		}
 	}

src/fileio_type.h

@@ -11,6 +11,7 @@
 #define FILEIO_TYPE_H
 
 #include "core/enum_type.hpp"
+#include "misc/autorelease.hpp"
 
 /** The different abstract types of files that the system knows about. */
 enum AbstractFileType : uint8_t {
@@ -142,15 +143,7 @@ public:
 	}
 
 private:
-	/** Helper to close a FILE * with a \c std::unique_ptr. */
-	struct FileDeleter {
-		void operator ()(FILE *f)
-		{
-			if (f != nullptr) fclose(f);
-		}
-	};
-
-	std::unique_ptr<FILE, FileDeleter> f;
+	AutoRelease<FILE, fclose> f;
 
 	FileHandle(FILE *f) : f(f) { assert(this->f != nullptr); }
 };

src/fios_gui.cpp

@@ -621,7 +621,7 @@ public:
 				break;
 
 			case WID_SL_DRIVES_DIRECTORIES_LIST:
-				resize.height = GetCharacterHeight(FS_NORMAL);
+				fill.height = resize.height = GetCharacterHeight(FS_NORMAL);
 				size.height = resize.height * 10 + padding.height;
 				break;
 			case WID_SL_SORT_BYNAME:

src/framerate_gui.cpp

@@ -531,7 +531,7 @@ struct FramerateWindow : Window {
 				size.width = 0;
 				size.height = GetCharacterHeight(FS_NORMAL) + WidgetDimensions::scaled.vsep_normal + MIN_ELEMENTS * GetCharacterHeight(FS_NORMAL);
 				resize.width = 0;
-				resize.height = GetCharacterHeight(FS_NORMAL);
+				fill.height = resize.height = GetCharacterHeight(FS_NORMAL);
 				for (PerformanceElement e : DISPLAY_ORDER_PFE) {
 					if (_pf_data[e].num_valid == 0) continue;
 					Dimension line_size;
@@ -553,7 +553,7 @@ struct FramerateWindow : Window {
 				size.width = std::max(size.width, item_size.width);
 				size.height += GetCharacterHeight(FS_NORMAL) * MIN_ELEMENTS + WidgetDimensions::scaled.vsep_normal;
 				resize.width = 0;
-				resize.height = GetCharacterHeight(FS_NORMAL);
+				fill.height = resize.height = GetCharacterHeight(FS_NORMAL);
 				break;
 			}
 		}

src/game/game_gui.cpp

@@ -123,12 +123,12 @@ struct GSConfigWindow : public Window {
 	 */
 	void RebuildVisibleSettings()
 	{
-		visible_settings.clear();
+		this->visible_settings.clear();
 
 		for (const auto &item : *this->gs_config->GetConfigList()) {
 			bool no_hide = !item.flags.Test(ScriptConfigFlag::Developer);
 			if (no_hide || _settings_client.gui.ai_developer_tools) {
-				visible_settings.push_back(&item);
+				this->visible_settings.push_back(&item);
 			}
 		}
 
@@ -141,7 +141,7 @@ struct GSConfigWindow : public Window {
 			case WID_GSC_SETTINGS:
 				this->line_height = std::max(SETTING_BUTTON_HEIGHT, GetCharacterHeight(FS_NORMAL)) + padding.height;
 				resize.width = 1;
-				resize.height = this->line_height;
+				fill.height = resize.height = this->line_height;
 				size.height = 5 * this->line_height;
 				break;
 
@@ -200,7 +200,7 @@ struct GSConfigWindow : public Window {
 					} else {
 						int i = static_cast<int>(std::distance(std::begin(this->visible_settings), it));
 						if (config_item.complete_labels) {
-							DrawDropDownButton(br.left, y + button_y_offset, COLOUR_YELLOW, this->clicked_row == i && clicked_dropdown, editable);
+							DrawDropDownButton(br.left, y + button_y_offset, COLOUR_YELLOW, this->clicked_row == i && this->clicked_dropdown, editable);
 						} else {
 							DrawArrowButtons(br.left, y + button_y_offset, COLOUR_YELLOW, (this->clicked_button == i) ? 1 + (this->clicked_increase != rtl) : 0, editable && current_value > config_item.min_value, editable && current_value < config_item.max_value);
 						}
@@ -228,19 +228,19 @@ struct GSConfigWindow : public Window {
 		if (widget >= WID_GSC_TEXTFILE && widget < WID_GSC_TEXTFILE + TFT_CONTENT_END) {
 			if (GameConfig::GetConfig() == nullptr) return;
 
-			ShowScriptTextfileWindow(this, (TextfileType)(widget - WID_GSC_TEXTFILE), (CompanyID)OWNER_DEITY);
+			ShowScriptTextfileWindow(this, static_cast<TextfileType>(widget - WID_GSC_TEXTFILE), OWNER_DEITY);
 			return;
 		}
 
 		switch (widget) {
 			case WID_GSC_GSLIST: {
 				this->InvalidateData();
-				if (click_count > 1 && _game_mode != GM_NORMAL) ShowScriptListWindow((CompanyID)OWNER_DEITY, _ctrl_pressed);
+				if (click_count > 1 && _game_mode != GM_NORMAL) ShowScriptListWindow(OWNER_DEITY, _ctrl_pressed);
 				break;
 			}
 
 			case WID_GSC_CHANGE:  // choose other Game Script
-				ShowScriptListWindow((CompanyID)OWNER_DEITY, _ctrl_pressed);
+				ShowScriptListWindow(OWNER_DEITY, _ctrl_pressed);
 				break;
 
 			case WID_GSC_CONTENT_DOWNLOAD:
@@ -348,19 +348,19 @@ struct GSConfigWindow : public Window {
 	void OnQueryTextFinished(std::optional<std::string> str) override
 	{
 		if (!str.has_value()) return;
-		auto value = ParseInteger<int32_t>(*str);
+		auto value = ParseInteger<int32_t>(*str, 10, true);
 		if (!value.has_value()) return;
-		SetValue(*value);
+		this->SetValue(*value);
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		if (widget != WID_GSC_SETTING_DROPDOWN) return;
 		assert(this->clicked_dropdown);
-		SetValue(index);
+		this->SetValue(index);
 	}
 
-	void OnDropdownClose(Point, WidgetID widget, int, bool) override
+	void OnDropdownClose(Point, WidgetID widget, int, int, bool) override
 	{
 		if (widget != WID_GSC_SETTING_DROPDOWN) return;
 		/* We cannot raise the dropdown button just yet. OnClick needs some hint, whether
@@ -397,7 +397,7 @@ struct GSConfigWindow : public Window {
 		const GameConfig *config = GameConfig::GetConfig();
 		this->SetWidgetDisabledState(WID_GSC_OPEN_URL, config->GetInfo() == nullptr || config->GetInfo()->GetURL().empty());
 		for (TextfileType tft = TFT_CONTENT_BEGIN; tft < TFT_CONTENT_END; tft++) {
-			this->SetWidgetDisabledState(WID_GSC_TEXTFILE + tft, !config->GetTextfile(tft, (CompanyID)OWNER_DEITY).has_value());
+			this->SetWidgetDisabledState(WID_GSC_TEXTFILE + tft, !config->GetTextfile(tft, OWNER_DEITY).has_value());
 		}
 		this->RebuildVisibleSettings();
 		this->CloseChildWindows(WC_DROPDOWN_MENU);

src/game/game_info.cpp

@@ -32,7 +32,7 @@ template <> SQInteger PushClassName<GameInfo, ScriptType::GS>(HSQUIRRELVM vm) {
 	/* Create the GSInfo class, and add the RegisterGS function */
 	DefSQClass<GameInfo, ScriptType::GS> SQGSInfo("GSInfo");
 	SQGSInfo.PreRegister(engine);
-	SQGSInfo.AddConstructor<void (GameInfo::*)(), 1>(engine, "x");
+	SQGSInfo.AddConstructor<void (GameInfo::*)()>(engine, "x");
 	SQGSInfo.DefSQAdvancedMethod(engine, &GameInfo::AddSetting, "AddSetting");
 	SQGSInfo.DefSQAdvancedMethod(engine, &GameInfo::AddLabels, "AddLabels");
 	SQGSInfo.DefSQConst(engine, ScriptConfigFlags{}.base(), "CONFIG_NONE");

src/game/game_instance.cpp

@@ -52,7 +52,7 @@ void GameInstance::RegisterAPI()
 
 	if (!this->LoadCompatibilityScripts(GAME_DIR, GameInfo::ApiVersions)) this->Died();
 
-	RegisterGameTranslation(*this->engine);
+	if (this->IsAlive()) RegisterGameTranslation(*this->engine);
 }
 
 int GameInstance::GetSetting(const std::string &name)

src/game/game_text.hpp

@@ -39,7 +39,7 @@ void ReconsiderGameScriptLanguage();
 /** Container for the raw (unencoded) language strings of a language. */
 struct LanguageStrings {
 	std::string language; ///< Name of the language (base filename). Empty string if invalid.
-	ReferenceThroughBaseContainer<StringList> lines; ///< The lines of the file to pass into the parser/encoder.
+	TypedIndexContainer<StringList, StringIndexInTab> lines; ///< The lines of the file to pass into the parser/encoder.
 
 	LanguageStrings() {}
 	LanguageStrings(const std::string &lang) : language(lang) {}
@@ -56,8 +56,8 @@ struct GameStrings {
 
 	std::vector<LanguageStrings> raw_strings;      ///< The raw strings per language, first must be English/the master language!.
 	std::vector<LanguageStrings> compiled_strings; ///< The compiled strings per language, first must be English/the master language!.
-	ReferenceThroughBaseContainer<StringList> string_names; ///< The names of the compiled strings.
-	ReferenceThroughBaseContainer<StringParamsList> string_params; ///< The parameters for the strings.
+	TypedIndexContainer<StringList, StringIndexInTab> string_names; ///< The names of the compiled strings.
+	TypedIndexContainer<StringParamsList, StringIndexInTab> string_params; ///< The parameters for the strings.
 
 	void Compile();
 

src/genworld.cpp

@@ -501,7 +501,7 @@ void LoadTownData()
 
 		do {
 			uint before = t->cache.num_houses;
-			Command<CMD_EXPAND_TOWN>::Post(t->index, HOUSES_TO_GROW);
+			Command<CMD_EXPAND_TOWN>::Post(t->index, HOUSES_TO_GROW, {TownExpandMode::Buildings, TownExpandMode::Roads});
 			if (t->cache.num_houses <= before) fail_limit--;
 		} while (fail_limit > 0 && try_limit-- > 0 && t->cache.population < population);
 	}

src/genworld_gui.cpp

@@ -852,7 +852,7 @@ struct GenerateLandscapeWindow : public Window {
 		}
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		switch (widget) {
 			case WID_GL_MAPSIZE_X_PULLDOWN:     _settings_newgame.game_creation.map_x = index; break;
@@ -914,7 +914,7 @@ struct GenerateLandscapeWindow : public Window {
 
 		int32_t value;
 		if (!str->empty()) {
-			auto val = ParseInteger<int32_t>(*str);
+			auto val = ParseInteger<int32_t>(*str, 10, true);
 			if (!val.has_value()) return;
 			value = *val;
 		} else {
@@ -1190,7 +1190,7 @@ struct CreateScenarioWindow : public Window
 		this->RaiseWidgetsWhenLowered(WID_CS_START_DATE_DOWN, WID_CS_START_DATE_UP, WID_CS_FLAT_LAND_HEIGHT_DOWN, WID_CS_FLAT_LAND_HEIGHT_UP);
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		switch (widget) {
 			case WID_CS_MAPSIZE_X_PULLDOWN: _settings_newgame.game_creation.map_x = index; break;
@@ -1203,7 +1203,7 @@ struct CreateScenarioWindow : public Window
 	{
 		if (!str.has_value()) return;
 
-		auto value = ParseInteger<int32_t>(*str);
+		auto value = ParseInteger<int32_t>(*str, 10, true);
 		if (!value.has_value()) return;
 
 		switch (this->widget_id) {

src/gfxinit.cpp

@@ -480,7 +480,7 @@ template <>
 
 	const GraphicsSet *best = nullptr;
 
-	auto IsBetter = [&best] (const auto *current) {
+	auto IsBetter = [&best] (const GraphicsSet *current) {
 		/* Nothing chosen yet. */
 		if (best == nullptr) return true;
 		/* Not being a fallback is better. */
@@ -495,11 +495,11 @@ template <>
 		return best->palette != PAL_DOS && current->palette == PAL_DOS;
 	};
 
-	for (const GraphicsSet *c = BaseMedia<GraphicsSet>::available_sets; c != nullptr; c = c->next) {
+	for (const auto &c : BaseMedia<GraphicsSet>::available_sets) {
 		/* Skip unusable sets */
 		if (c->GetNumMissing() != 0) continue;
 
-		if (IsBetter(c)) best = c;
+		if (IsBetter(c.get())) best = c.get();
 	}
 
 	BaseMedia<GraphicsSet>::used_set = best;

src/goal_gui.cpp

@@ -172,7 +172,7 @@ struct GoalListWindow : public Window {
 		Dimension d = GetStringBoundingBox(STR_GOALS_NONE);
 
 		resize.width = 1;
-		resize.height = d.height;
+		fill.height = resize.height = d.height;
 
 		d.height *= 5;
 		d.width += WidgetDimensions::scaled.framerect.Horizontal();

src/graph_gui.cpp

@@ -35,8 +35,6 @@
 
 /* Bitmasks of company and cargo indices that shouldn't be drawn. */
 static CompanyMask _legend_excluded_companies;
-static CargoTypes _legend_excluded_cargo_payment_rates;
-static CargoTypes _legend_excluded_cargo_production_history;
 
 /* Apparently these don't play well with enums. */
 static const OverflowSafeInt64 INVALID_DATAPOINT(INT64_MAX); // Value used for a datapoint that shouldn't be drawn.
@@ -213,6 +211,10 @@ protected:
 
 	std::span<const StringID> ranges = {};
 
+	uint8_t highlight_data = UINT8_MAX; ///< Data set that should be highlighted, or UINT8_MAX for none.
+	uint8_t highlight_range = UINT8_MAX; ///< Data range that should be highlighted, or UINT8_MAX for none.
+	bool highlight_state = false; ///< Current state of highlight, toggled every TIMER_BLINK_INTERVAL period.
+
 	/**
 	 * Get appropriate part of dataset values for the current number of horizontal points.
 	 * @param dataset Dataset to get values of
@@ -502,9 +504,9 @@ protected:
 		uint pointoffs1 = (linewidth + 1) / 2;
 		uint pointoffs2 = linewidth + 1 - pointoffs1;
 
-		for (const DataSet &dataset : this->data) {
-			if (HasBit(this->excluded_data, dataset.exclude_bit)) continue;
-			if (HasBit(this->excluded_range, dataset.range_bit)) continue;
+		auto draw_dataset = [&](const DataSet &dataset, uint8_t colour) {
+			if (HasBit(this->excluded_data, dataset.exclude_bit)) return;
+			if (HasBit(this->excluded_range, dataset.range_bit)) return;
 
 			/* Centre the dot between the grid lines. */
 			if (rtl) {
@@ -545,10 +547,10 @@ protected:
 					y = r.top + x_axis_offset - ((r.bottom - r.top) * datapoint) / (interval_size >> reduce_range);
 
 					/* Draw the point. */
-					GfxFillRect(x - pointoffs1, y - pointoffs1, x + pointoffs2, y + pointoffs2, dataset.colour);
+					GfxFillRect(x - pointoffs1, y - pointoffs1, x + pointoffs2, y + pointoffs2, colour);
 
 					/* Draw the line connected to the previous point. */
-					if (prev_x != INVALID_DATAPOINT_POS) GfxDrawLine(prev_x, prev_y, x, y, dataset.colour, linewidth, dash);
+					if (prev_x != INVALID_DATAPOINT_POS) GfxDrawLine(prev_x, prev_y, x, y, colour, linewidth, dash);
 
 					prev_x = x;
 					prev_y = y;
@@ -559,6 +561,23 @@ protected:
 
 				x += x_sep;
 			}
+		};
+
+		/* Draw unhighlighted datasets. */
+		for (const DataSet &dataset : this->data) {
+			if (dataset.exclude_bit != this->highlight_data && dataset.range_bit != this->highlight_range) {
+				draw_dataset(dataset, dataset.colour);
+			}
+		}
+
+		/* If any dataset or range is highlighted, draw separately after the rest so they appear on top of all other
+		 * data. Highlighted data is only drawn when highlight_state is set, otherwise it is invisible. */
+		if (this->highlight_state && (this->highlight_data != UINT8_MAX || this->highlight_range != UINT8_MAX)) {
+			for (const DataSet &dataset : this->data) {
+				if (dataset.exclude_bit == this->highlight_data || dataset.range_bit == this->highlight_range) {
+					draw_dataset(dataset, PC_WHITE);
+				}
+			}
 		}
 	}
 
@@ -569,20 +588,14 @@ protected:
 		SetWindowDirty(WC_GRAPH_LEGEND, 0);
 	}
 
-	void InitializeWindow(WindowNumber number)
-	{
-		/* Initialise the dataset */
-		this->UpdateStatistics(true);
+	const IntervalTimer<TimerWindow> blink_interval = {TIMER_BLINK_INTERVAL, [this](auto) {
+		/* If nothing is highlighted then no redraw is needed. */
+		if (this->highlight_data == UINT8_MAX && this->highlight_range == UINT8_MAX) return;
 
-		this->CreateNestedTree();
-
-		auto *wid = this->GetWidget<NWidgetCore>(WID_GRAPH_FOOTER);
-		if (wid != nullptr && TimerGameEconomy::UsingWallclockUnits()) {
-			wid->SetString(STR_GRAPH_LAST_72_MINUTES_TIME_LABEL);
-		}
-
-		this->FinishInitNested(number);
-	}
+		/* Toggle the highlight state and redraw. */
+		this->highlight_state = !this->highlight_state;
+		this->SetDirty();
+	}};
 
 public:
 	void UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize) override
@@ -668,11 +681,6 @@ public:
 		}
 	}
 
-	virtual OverflowSafeInt64 GetGraphData(const Company *, int)
-	{
-		return INVALID_DATAPOINT;
-	}
-
 	void OnClick([[maybe_unused]] Point pt, WidgetID widget, [[maybe_unused]] int click_count) override
 	{
 		/* Clicked on legend? */
@@ -693,6 +701,31 @@ public:
 		}
 	}
 
+	void OnMouseOver(Point pt, WidgetID widget) override
+	{
+		/* Test if a range should be highlighted. */
+		uint8_t new_highlight_range = UINT8_MAX;
+		if (widget == WID_GRAPH_RANGE_MATRIX) {
+			int row = GetRowFromWidget(pt.y, widget, 0, GetCharacterHeight(FS_SMALL) + WidgetDimensions::scaled.framerect.Vertical());
+			if (!HasBit(this->excluded_range, row)) new_highlight_range = static_cast<uint8_t>(row);
+		}
+
+		/* Test if a dataset should be highlighted. */
+		uint8_t new_highlight_data = UINT8_MAX;
+		if (widget == WID_GRAPH_MATRIX) {
+			auto dataset_index = this->GetDatasetIndex(pt.y);
+			if (dataset_index.has_value() && !HasBit(this->excluded_data, *dataset_index)) new_highlight_data = *dataset_index;
+		}
+
+		if (this->highlight_data == new_highlight_data && this->highlight_range == new_highlight_range) return;
+
+		/* Range or data set highlight has changed, set and redraw. */
+		this->highlight_data = new_highlight_data;
+		this->highlight_range = new_highlight_range;
+		this->highlight_state = true;
+		this->SetDirty();
+	}
+
 	void OnGameTick() override
 	{
 		this->UpdateStatistics(false);
@@ -709,11 +742,33 @@ public:
 		this->UpdateStatistics(true);
 	}
 
+	virtual void UpdateStatistics(bool initialize) = 0;
+
+	virtual std::optional<uint8_t> GetDatasetIndex(int) { return std::nullopt; }
+};
+
+class BaseCompanyGraphWindow : public BaseGraphWindow {
+public:
+	BaseCompanyGraphWindow(WindowDesc &desc, StringID format_str_y_axis) : BaseGraphWindow(desc, format_str_y_axis) {}
+
+	void InitializeWindow(WindowNumber number)
+	{
+		/* Initialise the dataset */
+		this->UpdateStatistics(true);
+
+		this->CreateNestedTree();
+
+		auto *wid = this->GetWidget<NWidgetCore>(WID_GRAPH_FOOTER);
+		wid->SetString(TimerGameEconomy::UsingWallclockUnits() ? STR_GRAPH_LAST_72_MINUTES_TIME_LABEL : STR_EMPTY);
+
+		this->FinishInitNested(number);
+	}
+
 	/**
 	 * Update the statistics.
 	 * @param initialize Initialize the data structure.
 	 */
-	virtual void UpdateStatistics(bool initialize)
+	void UpdateStatistics(bool initialize) override
 	{
 		CompanyMask excluded_companies = _legend_excluded_companies;
 
@@ -766,6 +821,8 @@ public:
 			}
 		}
 	}
+
+	virtual OverflowSafeInt64 GetGraphData(const Company *, int) = 0;
 };
 
 
@@ -773,9 +830,9 @@ public:
 /* OPERATING PROFIT */
 /********************/
 
-struct OperatingProfitGraphWindow : BaseGraphWindow {
+struct OperatingProfitGraphWindow : BaseCompanyGraphWindow {
 	OperatingProfitGraphWindow(WindowDesc &desc, WindowNumber window_number) :
-			BaseGraphWindow(desc, STR_JUST_CURRENCY_SHORT)
+			BaseCompanyGraphWindow(desc, STR_JUST_CURRENCY_SHORT)
 	{
 		this->num_on_x_axis = GRAPH_NUM_MONTHS;
 		this->num_vert_lines = GRAPH_NUM_MONTHS;
@@ -800,14 +857,10 @@ static constexpr NWidgetPart _nested_operating_profit_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_BROWN),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_BROWN, WID_GRAPH_BACKGROUND),
-		NWidget(NWID_VERTICAL),
-			NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GRAPH_GRAPH), SetMinimalSize(576, 160), SetFill(1, 1), SetResize(1, 1),
-			NWidget(NWID_HORIZONTAL),
-				NWidget(NWID_SPACER), SetMinimalSize(12, 0), SetFill(1, 0), SetResize(1, 0),
-				NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetStringTip(STR_EMPTY),
-				NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
-				NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
-			EndContainer(),
+		NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GRAPH_GRAPH), SetMinimalSize(576, 160), SetFill(1, 1), SetResize(1, 1),
+		NWidget(NWID_HORIZONTAL),
+			NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetFill(1, 0), SetResize(1, 0), SetPadding(2, 0, 2, 0), SetTextStyle(TC_BLACK, FS_SMALL), SetAlignment(SA_CENTER),
+			NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
 		EndContainer(),
 	EndContainer(),
 };
@@ -830,9 +883,9 @@ void ShowOperatingProfitGraph()
 /* INCOME GRAPH */
 /****************/
 
-struct IncomeGraphWindow : BaseGraphWindow {
+struct IncomeGraphWindow : BaseCompanyGraphWindow {
 	IncomeGraphWindow(WindowDesc &desc, WindowNumber window_number) :
-			BaseGraphWindow(desc, STR_JUST_CURRENCY_SHORT)
+			BaseCompanyGraphWindow(desc, STR_JUST_CURRENCY_SHORT)
 	{
 		this->num_on_x_axis = GRAPH_NUM_MONTHS;
 		this->num_vert_lines = GRAPH_NUM_MONTHS;
@@ -857,14 +910,10 @@ static constexpr NWidgetPart _nested_income_graph_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_BROWN),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_BROWN, WID_GRAPH_BACKGROUND),
-		NWidget(NWID_VERTICAL),
-			NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GRAPH_GRAPH), SetMinimalSize(576, 128), SetFill(1, 1), SetResize(1, 1),
-			NWidget(NWID_HORIZONTAL),
-				NWidget(NWID_SPACER), SetMinimalSize(12, 0), SetFill(1, 0), SetResize(1, 0),
-				NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetStringTip(STR_EMPTY),
-				NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
-				NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
-			EndContainer(),
+		NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GRAPH_GRAPH), SetMinimalSize(576, 128), SetFill(1, 1), SetResize(1, 1),
+		NWidget(NWID_HORIZONTAL),
+			NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetFill(1, 0), SetResize(1, 0), SetPadding(2, 0, 2, 0), SetTextStyle(TC_BLACK, FS_SMALL), SetAlignment(SA_CENTER),
+			NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
 		EndContainer(),
 	EndContainer(),
 };
@@ -885,9 +934,9 @@ void ShowIncomeGraph()
 /* DELIVERED CARGO */
 /*******************/
 
-struct DeliveredCargoGraphWindow : BaseGraphWindow {
+struct DeliveredCargoGraphWindow : BaseCompanyGraphWindow {
 	DeliveredCargoGraphWindow(WindowDesc &desc, WindowNumber window_number) :
-			BaseGraphWindow(desc, STR_JUST_COMMA)
+			BaseCompanyGraphWindow(desc, STR_JUST_COMMA)
 	{
 		this->num_on_x_axis = GRAPH_NUM_MONTHS;
 		this->num_vert_lines = GRAPH_NUM_MONTHS;
@@ -912,14 +961,10 @@ static constexpr NWidgetPart _nested_delivered_cargo_graph_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_BROWN),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_BROWN, WID_GRAPH_BACKGROUND),
-		NWidget(NWID_VERTICAL),
-			NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GRAPH_GRAPH), SetMinimalSize(576, 128), SetFill(1, 1), SetResize(1, 1),
-			NWidget(NWID_HORIZONTAL),
-				NWidget(NWID_SPACER), SetMinimalSize(12, 0), SetFill(1, 0), SetResize(1, 0),
-				NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetStringTip(STR_EMPTY),
-				NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
-				NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
-			EndContainer(),
+		NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GRAPH_GRAPH), SetMinimalSize(576, 128), SetFill(1, 1), SetResize(1, 1),
+		NWidget(NWID_HORIZONTAL),
+			NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetFill(1, 0), SetResize(1, 0), SetPadding(2, 0, 2, 0), SetTextStyle(TC_BLACK, FS_SMALL), SetAlignment(SA_CENTER),
+			NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
 		EndContainer(),
 	EndContainer(),
 };
@@ -940,9 +985,9 @@ void ShowDeliveredCargoGraph()
 /* PERFORMANCE HISTORY */
 /***********************/
 
-struct PerformanceHistoryGraphWindow : BaseGraphWindow {
+struct PerformanceHistoryGraphWindow : BaseCompanyGraphWindow {
 	PerformanceHistoryGraphWindow(WindowDesc &desc, WindowNumber window_number) :
-			BaseGraphWindow(desc, STR_JUST_COMMA)
+			BaseCompanyGraphWindow(desc, STR_JUST_COMMA)
 	{
 		this->num_on_x_axis = GRAPH_NUM_MONTHS;
 		this->num_vert_lines = GRAPH_NUM_MONTHS;
@@ -974,14 +1019,10 @@ static constexpr NWidgetPart _nested_performance_history_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_BROWN),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_BROWN, WID_GRAPH_BACKGROUND),
-		NWidget(NWID_VERTICAL),
-			NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GRAPH_GRAPH), SetMinimalSize(576, 224), SetFill(1, 1), SetResize(1, 1),
-			NWidget(NWID_HORIZONTAL),
-				NWidget(NWID_SPACER), SetMinimalSize(12, 0), SetFill(1, 0), SetResize(1, 0),
-				NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetStringTip(STR_EMPTY),
-				NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
-				NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
-			EndContainer(),
+		NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GRAPH_GRAPH), SetMinimalSize(576, 224), SetFill(1, 1), SetResize(1, 1),
+		NWidget(NWID_HORIZONTAL),
+			NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetFill(1, 0), SetResize(1, 0), SetPadding(2, 0, 2, 0), SetTextStyle(TC_BLACK, FS_SMALL), SetAlignment(SA_CENTER),
+			NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
 		EndContainer(),
 	EndContainer(),
 };
@@ -1002,9 +1043,9 @@ void ShowPerformanceHistoryGraph()
 /* COMPANY VALUE */
 /*****************/
 
-struct CompanyValueGraphWindow : BaseGraphWindow {
+struct CompanyValueGraphWindow : BaseCompanyGraphWindow {
 	CompanyValueGraphWindow(WindowDesc &desc, WindowNumber window_number) :
-			BaseGraphWindow(desc, STR_JUST_CURRENCY_SHORT)
+			BaseCompanyGraphWindow(desc, STR_JUST_CURRENCY_SHORT)
 	{
 		this->num_on_x_axis = GRAPH_NUM_MONTHS;
 		this->num_vert_lines = GRAPH_NUM_MONTHS;
@@ -1029,14 +1070,10 @@ static constexpr NWidgetPart _nested_company_value_graph_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_BROWN),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_BROWN, WID_GRAPH_BACKGROUND),
-		NWidget(NWID_VERTICAL),
-			NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GRAPH_GRAPH), SetMinimalSize(576, 224), SetFill(1, 1), SetResize(1, 1),
-			NWidget(NWID_HORIZONTAL),
-				NWidget(NWID_SPACER), SetMinimalSize(12, 0), SetFill(1, 0), SetResize(1, 0),
-				NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetStringTip(STR_EMPTY),
-				NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
-				NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
-			EndContainer(),
+		NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GRAPH_GRAPH), SetMinimalSize(576, 224), SetFill(1, 1), SetResize(1, 1),
+		NWidget(NWID_HORIZONTAL),
+			NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetFill(1, 0), SetResize(1, 0), SetPadding(2, 0, 2, 0), SetTextStyle(TC_BLACK, FS_SMALL), SetAlignment(SA_CENTER),
+			NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
 		EndContainer(),
 	EndContainer(),
 };
@@ -1053,37 +1090,49 @@ void ShowCompanyValueGraph()
 	AllocateWindowDescFront<CompanyValueGraphWindow>(_company_value_graph_desc, 0);
 }
 
-/*****************/
-/* PAYMENT RATES */
-/*****************/
-
-struct PaymentRatesGraphWindow : BaseGraphWindow {
-	uint line_height = 0; ///< Pixel height of each cargo type row.
+struct BaseCargoGraphWindow : BaseGraphWindow {
 	Scrollbar *vscroll = nullptr; ///< Cargo list scrollbar.
+	uint line_height = 0; ///< Pixel height of each cargo type row.
 	uint legend_width = 0; ///< Width of legend 'blob'.
 
-	PaymentRatesGraphWindow(WindowDesc &desc, WindowNumber window_number) :
-			BaseGraphWindow(desc, STR_JUST_CURRENCY_SHORT)
+	CargoTypes cargo_types{}; ///< Cargo types that can be selected.
+
+	BaseCargoGraphWindow(WindowDesc &desc, StringID format_str_y_axis) : BaseGraphWindow(desc, format_str_y_axis) {}
+
+	void InitializeWindow(WindowNumber number, StringID footer_wallclock = STR_EMPTY, StringID footer_calendar = STR_EMPTY)
 	{
-		this->num_on_x_axis = GRAPH_PAYMENT_RATE_STEPS;
-		this->num_vert_lines = GRAPH_PAYMENT_RATE_STEPS;
-		this->draw_dates = false;
-
-		this->x_values_reversed = false;
-		/* The x-axis is labeled in either seconds or days. A day is two seconds, so we adjust the label if needed. */
-		this->x_values_increment = (TimerGameEconomy::UsingWallclockUnits() ? PAYMENT_GRAPH_X_STEP_SECONDS : PAYMENT_GRAPH_X_STEP_DAYS);
-
 		this->CreateNestedTree();
+
+		this->cargo_types = this->GetCargoTypes(number);
+
 		this->vscroll = this->GetScrollbar(WID_GRAPH_MATRIX_SCROLLBAR);
-		this->vscroll->SetCount(_sorted_standard_cargo_specs.size());
+		this->vscroll->SetCount(CountBits(this->cargo_types));
 
 		auto *wid = this->GetWidget<NWidgetCore>(WID_GRAPH_FOOTER);
-		wid->SetString(TimerGameEconomy::UsingWallclockUnits() ? STR_GRAPH_CARGO_PAYMENT_RATES_SECONDS : STR_GRAPH_CARGO_PAYMENT_RATES_DAYS);
+		wid->SetString(TimerGameEconomy::UsingWallclockUnits() ? footer_wallclock : footer_calendar);
+
+		this->FinishInitNested(number);
 
 		/* Initialise the dataset */
-		this->UpdatePaymentRates();
+		this->InvalidateData();
+	}
 
-		this->FinishInitNested(window_number);
+	virtual CargoTypes GetCargoTypes(WindowNumber number) const = 0;
+	virtual CargoTypes &GetExcludedCargoTypes() const = 0;
+
+	std::optional<uint8_t> GetDatasetIndex(int y) override
+	{
+		int row = this->vscroll->GetScrolledRowFromWidget(y, this, WID_GRAPH_MATRIX);
+		if (row >= this->vscroll->GetCount()) return std::nullopt;
+
+		for (const CargoSpec *cs : _sorted_cargo_specs) {
+			if (!HasBit(this->cargo_types, cs->Index())) continue;
+			if (row-- > 0) continue;
+
+			return cs->Index();
+		}
+
+		return std::nullopt;
 	}
 
 	void OnInit() override
@@ -1092,11 +1141,6 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
 		this->legend_width = GetCharacterHeight(FS_SMALL) * 9 / 6;
 	}
 
-	void UpdateExcludedData()
-	{
-		this->excluded_data = _legend_excluded_cargo_payment_rates;
-	}
-
 	void UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize) override
 	{
 		if (widget != WID_GRAPH_MATRIX) {
@@ -1106,7 +1150,9 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
 
 		size.height = GetCharacterHeight(FS_SMALL) + WidgetDimensions::scaled.framerect.Vertical();
 
-		for (const CargoSpec *cs : _sorted_standard_cargo_specs) {
+		for (CargoType cargo_type : SetCargoBitIterator(this->cargo_types)) {
+			const CargoSpec *cs = CargoSpec::Get(cargo_type);
+
 			Dimension d = GetStringBoundingBox(GetString(STR_GRAPH_CARGO_PAYMENT_CARGO, cs->name));
 			d.width += this->legend_width + WidgetDimensions::scaled.hsep_normal; // colour field
 			d.width += WidgetDimensions::scaled.framerect.Horizontal();
@@ -1117,7 +1163,7 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
 		this->line_height = size.height;
 		size.height = this->line_height * 11; /* Default number of cargo types in most climates. */
 		resize.width = 0;
-		resize.height = this->line_height;
+		fill.height = resize.height = this->line_height;
 	}
 
 	void DrawWidget(const Rect &r, WidgetID widget) const override
@@ -1129,13 +1175,18 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
 
 		bool rtl = _current_text_dir == TD_RTL;
 
-		auto [first, last] = this->vscroll->GetVisibleRangeIterators(_sorted_standard_cargo_specs);
+		int pos = this->vscroll->GetPosition();
+		int max = pos + this->vscroll->GetCapacity();
 
 		Rect line = r.WithHeight(this->line_height);
-		for (auto it = first; it != last; ++it) {
-			const CargoSpec *cs = *it;
 
-			bool lowered = !HasBit(_legend_excluded_cargo_payment_rates, cs->Index());
+		for (const CargoSpec *cs : _sorted_cargo_specs) {
+			if (!HasBit(this->cargo_types, cs->Index())) continue;
+
+			if (pos-- > 0) continue;
+			if (--max < 0) break;
+
+			bool lowered = !HasBit(this->excluded_data, cs->Index());
 
 			/* Redraw frame if lowered */
 			if (lowered) DrawFrameRect(line, COLOUR_BROWN, FrameFlag::Lowered);
@@ -1145,7 +1196,9 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
 			/* Cargo-colour box with outline */
 			const Rect cargo = text.WithWidth(this->legend_width, rtl);
 			GfxFillRect(cargo, PC_BLACK);
-			GfxFillRect(cargo.Shrink(WidgetDimensions::scaled.bevel), cs->legend_colour);
+			uint8_t pc = cs->legend_colour;
+			if (this->highlight_data == cs->Index()) pc = this->highlight_state ? PC_WHITE : PC_BLACK;
+			GfxFillRect(cargo.Shrink(WidgetDimensions::scaled.bevel), pc);
 
 			/* Cargo name */
 			DrawString(text.Indent(this->legend_width + WidgetDimensions::scaled.hsep_normal, rtl), GetString(STR_GRAPH_CARGO_PAYMENT_CARGO, cs->name));
@@ -1159,27 +1212,31 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
 		switch (widget) {
 			case WID_GRAPH_ENABLE_CARGOES:
 				/* Remove all cargoes from the excluded lists. */
-				_legend_excluded_cargo_payment_rates = 0;
-				this->excluded_data = 0;
+				this->GetExcludedCargoTypes() = {};
+				this->excluded_data = this->GetExcludedCargoTypes();
 				this->SetDirty();
 				break;
 
 			case WID_GRAPH_DISABLE_CARGOES: {
 				/* Add all cargoes to the excluded lists. */
-				for (const CargoSpec *cs : _sorted_standard_cargo_specs) {
-					SetBit(_legend_excluded_cargo_payment_rates, cs->Index());
-					SetBit(this->excluded_data, cs->Index());
-				}
+				this->GetExcludedCargoTypes() = this->cargo_types;
+				this->excluded_data = this->GetExcludedCargoTypes();
 				this->SetDirty();
 				break;
 			}
 
 			case WID_GRAPH_MATRIX: {
-				auto it = this->vscroll->GetScrolledItemFromWidget(_sorted_standard_cargo_specs, pt.y, this, WID_GRAPH_MATRIX);
-				if (it != _sorted_standard_cargo_specs.end()) {
-					ToggleBit(_legend_excluded_cargo_payment_rates, (*it)->Index());
-					this->UpdateExcludedData();
+				int row = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_GRAPH_MATRIX);
+				if (row >= this->vscroll->GetCount()) return;
+
+				for (const CargoSpec *cs : _sorted_cargo_specs) {
+					if (!HasBit(this->cargo_types, cs->Index())) continue;
+					if (row-- > 0) continue;
+
+					ToggleBit(this->GetExcludedCargoTypes(), cs->Index());
+					this->excluded_data = this->GetExcludedCargoTypes();
 					this->SetDirty();
+					break;
 				}
 				break;
 			}
@@ -1194,10 +1251,36 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
 	{
 		this->vscroll->SetCapacityFromWidget(this, WID_GRAPH_MATRIX);
 	}
+};
 
-	void OnGameTick() override
+/*****************/
+/* PAYMENT RATES */
+/*****************/
+
+struct PaymentRatesGraphWindow : BaseCargoGraphWindow {
+	static inline CargoTypes excluded_cargo_types{};
+
+	PaymentRatesGraphWindow(WindowDesc &desc, WindowNumber window_number) : BaseCargoGraphWindow(desc, STR_JUST_CURRENCY_SHORT)
 	{
-		/* Override default OnGameTick */
+		this->num_on_x_axis = GRAPH_PAYMENT_RATE_STEPS;
+		this->num_vert_lines = GRAPH_PAYMENT_RATE_STEPS;
+		this->draw_dates = false;
+
+		this->x_values_reversed = false;
+		/* The x-axis is labeled in either seconds or days. A day is two seconds, so we adjust the label if needed. */
+		this->x_values_increment = (TimerGameEconomy::UsingWallclockUnits() ? PAYMENT_GRAPH_X_STEP_SECONDS : PAYMENT_GRAPH_X_STEP_DAYS);
+
+		this->InitializeWindow(window_number, STR_GRAPH_CARGO_PAYMENT_RATES_SECONDS, STR_GRAPH_CARGO_PAYMENT_RATES_DAYS);
+	}
+
+	CargoTypes GetCargoTypes(WindowNumber) const override
+	{
+		return _standard_cargo_mask;
+	}
+
+	CargoTypes &GetExcludedCargoTypes() const override
+	{
+		return PaymentRatesGraphWindow::excluded_cargo_types;
 	}
 
 	/**
@@ -1216,12 +1299,14 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
 		this->UpdatePaymentRates();
 	}};
 
+	void UpdateStatistics(bool) override {}
+
 	/**
 	 * Update the payment rates according to the latest information.
 	 */
 	void UpdatePaymentRates()
 	{
-		this->UpdateExcludedData();
+		this->excluded_data = this->GetExcludedCargoTypes();
 
 		this->data.clear();
 		for (const CargoSpec *cs : _sorted_standard_cargo_specs) {
@@ -1245,11 +1330,7 @@ static constexpr NWidgetPart _nested_cargo_payment_rates_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_BROWN),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_BROWN, WID_GRAPH_BACKGROUND), SetMinimalSize(568, 128),
-		NWidget(NWID_HORIZONTAL),
-			NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
-			NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_HEADER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetStringTip(STR_GRAPH_CARGO_PAYMENT_RATES_TITLE),
-			NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
-		EndContainer(),
+		NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_HEADER), SetFill(1, 0), SetResize(1, 0), SetPadding(2, 0, 2, 0), SetStringTip(STR_GRAPH_CARGO_PAYMENT_RATES_TITLE), SetTextStyle(TC_BLACK, FS_SMALL), SetAlignment(SA_CENTER),
 		NWidget(NWID_HORIZONTAL),
 			NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GRAPH_GRAPH), SetMinimalSize(495, 0), SetFill(1, 1), SetResize(1, 1),
 			NWidget(NWID_VERTICAL),
@@ -1266,9 +1347,7 @@ static constexpr NWidgetPart _nested_cargo_payment_rates_widgets[] = {
 			NWidget(NWID_SPACER), SetMinimalSize(5, 0), SetFill(0, 1), SetResize(0, 1),
 		EndContainer(),
 		NWidget(NWID_HORIZONTAL),
-			NWidget(NWID_SPACER), SetMinimalSize(12, 0), SetFill(1, 0), SetResize(1, 0),
-			NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0),
-			NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
+			NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetFill(1, 0), SetResize(1, 0), SetPadding(2, 0, 2, 0), SetTextStyle(TC_BLACK, FS_SMALL), SetAlignment(SA_CENTER),
 			NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
 		EndContainer(),
 	EndContainer(),
@@ -1514,18 +1593,16 @@ CompanyID PerformanceRatingDetailWindow::company = CompanyID::Invalid();
 /* INDUSTRY PRODUCTION HISTORY */
 /*******************************/
 
-struct IndustryProductionGraphWindow : BaseGraphWindow {
-	uint line_height = 0; ///< Pixel height of each cargo type row.
-	Scrollbar *vscroll = nullptr; ///< Cargo list scrollbar.
-	uint legend_width = 0;  ///< Width of legend 'blob'.
-
+struct IndustryProductionGraphWindow : BaseCargoGraphWindow {
 	static inline constexpr StringID RANGE_LABELS[] = {
 		STR_GRAPH_INDUSTRY_RANGE_PRODUCED,
 		STR_GRAPH_INDUSTRY_RANGE_TRANSPORTED
 	};
 
+	static inline CargoTypes excluded_cargo_types{};
+
 	IndustryProductionGraphWindow(WindowDesc &desc, WindowNumber window_number) :
-			BaseGraphWindow(desc, STR_JUST_COMMA)
+			BaseCargoGraphWindow(desc, STR_JUST_COMMA)
 	{
 		this->num_on_x_axis = GRAPH_NUM_MONTHS;
 		this->num_vert_lines = GRAPH_NUM_MONTHS;
@@ -1534,156 +1611,22 @@ struct IndustryProductionGraphWindow : BaseGraphWindow {
 		this->draw_dates = !TimerGameEconomy::UsingWallclockUnits();
 		this->ranges = RANGE_LABELS;
 
-		this->CreateNestedTree();
-		this->vscroll = this->GetScrollbar(WID_GRAPH_MATRIX_SCROLLBAR);
+		this->InitializeWindow(window_number, STR_GRAPH_LAST_24_MINUTES_TIME_LABEL);
+	}
 
-		int count = 0;
+	CargoTypes GetCargoTypes(WindowNumber window_number) const override
+	{
+		CargoTypes cargo_types{};
 		const Industry *i = Industry::Get(window_number);
 		for (const auto &p : i->produced) {
-			if (!IsValidCargoType(p.cargo)) continue;
-			count++;
+			if (IsValidCargoType(p.cargo)) SetBit(cargo_types, p.cargo);
 		}
-		this->vscroll->SetCount(count);
-
-		auto *wid = this->GetWidget<NWidgetCore>(WID_GRAPH_FOOTER);
-		wid->SetString(TimerGameEconomy::UsingWallclockUnits() ? STR_GRAPH_LAST_24_MINUTES_TIME_LABEL : STR_EMPTY);
-
-		this->FinishInitNested(window_number);
-
-		/* Initialise the dataset */
-		this->UpdateStatistics(true);
+		return cargo_types;
 	}
 
-	void OnInit() override
+	CargoTypes &GetExcludedCargoTypes() const override
 	{
-		/* Width of the legend blob. */
-		this->legend_width = GetCharacterHeight(FS_SMALL) * 9 / 6;
-	}
-
-	void UpdateExcludedData()
-	{
-		this->excluded_data = 0;
-
-		const Industry *i = Industry::Get(this->window_number);
-		for (const auto &p : i->produced) {
-			if (!IsValidCargoType(p.cargo)) continue;
-			if (HasBit(_legend_excluded_cargo_production_history, p.cargo)) SetBit(this->excluded_data, p.cargo);
-		}
-	}
-
-	void UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize) override
-	{
-		if (widget != WID_GRAPH_MATRIX) {
-			BaseGraphWindow::UpdateWidgetSize(widget, size, padding, fill, resize);
-			return;
-		}
-
-		const Industry *i = Industry::Get(this->window_number);
-		const CargoSpec *cs;
-		for (const auto &p : i->produced) {
-			if (!IsValidCargoType(p.cargo)) continue;
-
-			cs = CargoSpec::Get(p.cargo);
-			Dimension d = GetStringBoundingBox(GetString(STR_GRAPH_CARGO_PAYMENT_CARGO, cs->name));
-			d.width += this->legend_width + WidgetDimensions::scaled.hsep_normal; // colour field
-			d.width += WidgetDimensions::scaled.framerect.Horizontal();
-			d.height += WidgetDimensions::scaled.framerect.Vertical();
-			size = maxdim(d, size);
-		}
-
-		this->line_height = size.height;
-		size.height = this->line_height * 11; /* Default number of cargo types in most climates. */
-		resize.width = 0;
-		resize.height = this->line_height;
-	}
-
-	void DrawWidget(const Rect &r, WidgetID widget) const override
-	{
-		if (widget != WID_GRAPH_MATRIX) {
-			BaseGraphWindow::DrawWidget(r, widget);
-			return;
-		}
-
-		bool rtl = _current_text_dir == TD_RTL;
-
-		int pos = this->vscroll->GetPosition();
-		int max = pos + this->vscroll->GetCapacity();
-
-		Rect line = r.WithHeight(this->line_height);
-		const Industry *i = Industry::Get(this->window_number);
-		const CargoSpec *cs;
-
-		for (const auto &p : i->produced) {
-			if (!IsValidCargoType(p.cargo)) continue;
-
-			if (pos-- > 0) continue;
-			if (--max < 0) break;
-
-			cs = CargoSpec::Get(p.cargo);
-
-			bool lowered = !HasBit(_legend_excluded_cargo_production_history, p.cargo);
-
-			/* Redraw frame if lowered */
-			if (lowered) DrawFrameRect(line, COLOUR_BROWN, FrameFlag::Lowered);
-
-			const Rect text = line.Shrink(WidgetDimensions::scaled.framerect);
-
-			/* Cargo-colour box with outline */
-			const Rect cargo = text.WithWidth(this->legend_width, rtl);
-			GfxFillRect(cargo, PC_BLACK);
-			GfxFillRect(cargo.Shrink(WidgetDimensions::scaled.bevel), cs->legend_colour);
-
-			/* Cargo name */
-			DrawString(text.Indent(this->legend_width + WidgetDimensions::scaled.hsep_normal, rtl), GetString(STR_GRAPH_CARGO_PAYMENT_CARGO, cs->name));
-
-			line = line.Translate(0, this->line_height);
-		}
-	}
-
-	void OnClick([[maybe_unused]] Point pt, WidgetID widget, [[maybe_unused]] int click_count) override
-	{
-		switch (widget) {
-			case WID_GRAPH_ENABLE_CARGOES:
-				/* Remove all cargoes from the excluded lists. */
-				_legend_excluded_cargo_production_history = 0;
-				this->excluded_data = 0;
-				this->SetDirty();
-				break;
-
-			case WID_GRAPH_DISABLE_CARGOES: {
-				/* Add all cargoes to the excluded lists. */
-				const Industry *i = Industry::Get(this->window_number);
-				for (const auto &p : i->produced) {
-					if (!IsValidCargoType(p.cargo)) continue;
-
-					SetBit(_legend_excluded_cargo_production_history, p.cargo);
-					SetBit(this->excluded_data, p.cargo);
-				}
-				this->SetDirty();
-				break;
-			}
-
-			case WID_GRAPH_MATRIX: {
-				int row = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_GRAPH_MATRIX);
-				if (row >= this->vscroll->GetCount()) return;
-
-				const Industry *i = Industry::Get(this->window_number);
-				for (const auto &p : i->produced) {
-					if (!IsValidCargoType(p.cargo)) continue;
-					if (row-- > 0) continue;
-
-					ToggleBit(_legend_excluded_cargo_production_history, p.cargo);
-					this->UpdateExcludedData();
-					this->SetDirty();
-					break;
-				}
-				break;
-			}
-
-			default:
-				this->BaseGraphWindow::OnClick(pt, widget, click_count);
-				break;
-		}
+		return IndustryProductionGraphWindow::excluded_cargo_types;
 	}
 
 	std::string GetWidgetString(WidgetID widget, StringID stringid) const override
@@ -1693,16 +1636,8 @@ struct IndustryProductionGraphWindow : BaseGraphWindow {
 		return this->Window::GetWidgetString(widget, stringid);
 	}
 
-	void OnResize() override
-	{
-		this->vscroll->SetCapacityFromWidget(this, WID_GRAPH_MATRIX);
-	}
-
 	void UpdateStatistics(bool initialize) override
 	{
-		CargoTypes excluded_cargo = this->excluded_data;
-		this->UpdateExcludedData();
-
 		int mo = TimerGameEconomy::month - this->num_vert_lines;
 		auto yr = TimerGameEconomy::year;
 		while (mo < 0) {
@@ -1710,11 +1645,12 @@ struct IndustryProductionGraphWindow : BaseGraphWindow {
 			mo += 12;
 		}
 
-		if (!initialize && this->excluded_data == excluded_cargo && this->num_on_x_axis == this->num_vert_lines && this->year == yr && this->month == mo) {
+		if (!initialize && this->excluded_data == this->GetExcludedCargoTypes() && this->num_on_x_axis == this->num_vert_lines && this->year == yr && this->month == mo) {
 			/* There's no reason to get new stats */
 			return;
 		}
 
+		this->excluded_data = this->GetExcludedCargoTypes();
 		this->year = yr;
 		this->month = mo;
 
@@ -1745,8 +1681,6 @@ struct IndustryProductionGraphWindow : BaseGraphWindow {
 			}
 		}
 
-		this->vscroll->SetCount(std::size(this->data));
-
 		this->SetDirty();
 	}
 };
@@ -1778,9 +1712,7 @@ static constexpr NWidgetPart _nested_industry_production_widgets[] = {
 			NWidget(NWID_SPACER), SetMinimalSize(5, 0), SetFill(0, 1), SetResize(0, 1),
 		EndContainer(),
 		NWidget(NWID_HORIZONTAL),
-			NWidget(NWID_SPACER), SetMinimalSize(12, 0), SetFill(1, 0), SetResize(1, 0),
-			NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetMinimalSize(0, 6), SetPadding(2, 0, 2, 0), SetStringTip(STR_EMPTY),
-			NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
+			NWidget(WWT_TEXT, INVALID_COLOUR, WID_GRAPH_FOOTER), SetFill(1, 0), SetResize(1, 0), SetPadding(2, 0, 2, 0), SetTextStyle(TC_BLACK, FS_SMALL), SetAlignment(SA_CENTER),
 			NWidget(WWT_RESIZEBOX, COLOUR_BROWN, WID_GRAPH_RESIZE), SetResizeWidgetTypeTip(RWV_HIDE_BEVEL, STR_TOOLTIP_RESIZE),
 		EndContainer(),
 	EndContainer(),
@@ -1864,6 +1796,6 @@ void ShowPerformanceRatingDetail()
 void InitializeGraphGui()
 {
 	_legend_excluded_companies = CompanyMask{};
-	_legend_excluded_cargo_payment_rates = 0;
-	_legend_excluded_cargo_production_history = 0;
+	PaymentRatesGraphWindow::excluded_cargo_types = {};
+	IndustryProductionGraphWindow::excluded_cargo_types = {};
 }

src/group.h

@@ -11,6 +11,7 @@
 #define GROUP_H
 
 #include "group_type.h"
+#include "core/flatset_type.hpp"
 #include "core/pool_type.hpp"
 #include "company_type.h"
 #include "vehicle_type.h"
@@ -78,6 +79,7 @@ struct Group : GroupPool::PoolItem<&_group_pool> {
 	Livery livery{}; ///< Custom colour scheme for vehicles in this group
 	GroupStatistics statistics{}; ///< NOSAVE: Statistics and caches on the vehicles in the group.
 
+	FlatSet<GroupID> children; ///< NOSAVE: child groups belonging to this group.
 	bool folded = false; ///< NOSAVE: Is this group folded in the group view?
 
 	GroupID parent = GroupID::Invalid(); ///< Parent group
@@ -104,6 +106,7 @@ inline bool IsAllGroupID(GroupID id_g)
 }
 
 
+void UpdateGroupChildren();
 uint GetGroupNumEngines(CompanyID company, GroupID id_g, EngineID id_e);
 uint GetGroupNumVehicle(CompanyID company, GroupID id_g, VehicleType type);
 uint GetGroupNumVehicleMinAge(CompanyID company, GroupID id_g, VehicleType type);

src/group_cmd.cpp

@@ -41,6 +41,16 @@ void GroupStatistics::Clear()
 	this->num_engines.clear();
 }
 
+/**
+ * Update children list for each group.
+ */
+void UpdateGroupChildren()
+{
+	for (Group *g : Group::Iterate()) {
+		if (g->parent != GroupID::Invalid()) Group::Get(g->parent)->children.insert(g->index);
+	}
+}
+
 /**
  * Get number of vehicles of a specific engine ID.
  * @param engine Engine ID.
@@ -294,12 +304,11 @@ static void PropagateChildLivery(const Group *g, bool reset_cache)
 		}
 	}
 
-	for (Group *cg : Group::Iterate()) {
-		if (cg->parent == g->index) {
-			if (!HasBit(cg->livery.in_use, 0)) cg->livery.colour1 = g->livery.colour1;
-			if (!HasBit(cg->livery.in_use, 1)) cg->livery.colour2 = g->livery.colour2;
-			PropagateChildLivery(cg, reset_cache);
-		}
+	for (const GroupID &childgroup : g->children) {
+		Group *cg = Group::Get(childgroup);
+		if (!HasBit(cg->livery.in_use, 0)) cg->livery.colour1 = g->livery.colour1;
+		if (!HasBit(cg->livery.in_use, 1)) cg->livery.colour2 = g->livery.colour2;
+		PropagateChildLivery(cg, reset_cache);
 	}
 }
 
@@ -333,7 +342,7 @@ std::tuple<CommandCost, GroupID> CmdCreateGroup(DoCommandFlags flags, VehicleTyp
 
 	if (!Group::CanAllocateItem()) return { CMD_ERROR, GroupID::Invalid() };
 
-	const Group *pg = Group::GetIfValid(parent_group);
+	Group *pg = Group::GetIfValid(parent_group);
 	if (pg != nullptr) {
 		if (pg->owner != _current_company) return { CMD_ERROR, GroupID::Invalid() };
 		if (pg->vehicle_type != vt) return { CMD_ERROR, GroupID::Invalid() };
@@ -353,6 +362,7 @@ std::tuple<CommandCost, GroupID> CmdCreateGroup(DoCommandFlags flags, VehicleTyp
 			g->livery.colour1 = pg->livery.colour1;
 			g->livery.colour2 = pg->livery.colour2;
 			g->flags = pg->flags;
+			pg->children.insert(g->index);
 		}
 
 		InvalidateWindowData(GetWindowClassForVehicleType(vt), VehicleListIdentifier(VL_GROUP_LIST, vt, _current_company).ToWindowNumber());
@@ -380,10 +390,8 @@ CommandCost CmdDeleteGroup(DoCommandFlags flags, GroupID group_id)
 	Command<CMD_REMOVE_ALL_VEHICLES_GROUP>::Do(flags, group_id);
 
 	/* Delete sub-groups */
-	for (const Group *gp : Group::Iterate()) {
-		if (gp->parent == g->index) {
-			Command<CMD_DELETE_GROUP>::Do(flags, gp->index);
-		}
+	for (const GroupID &childgroup : g->children) {
+		Command<CMD_DELETE_GROUP>::Do(flags, childgroup);
 	}
 
 	if (flags.Test(DoCommandFlag::Execute)) {
@@ -401,6 +409,11 @@ CommandCost CmdDeleteGroup(DoCommandFlags flags, GroupID group_id)
 			c->freegroups.ReleaseID(g->number);
 		}
 
+		if (g->parent != GroupID::Invalid()) {
+			Group *pg = Group::Get(g->parent);
+			pg->children.erase(g->index);
+		}
+
 		VehicleType vt = g->vehicle_type;
 
 		/* Delete the Replace Vehicle Windows */
@@ -445,6 +458,9 @@ CommandCost CmdAlterGroup(DoCommandFlags flags, AlterGroupMode mode, GroupID gro
 			}
 		}
 	} else if (mode == AlterGroupMode::SetParent) {
+		/* Do nothing if the parent group isn't actually changed. */
+		if (g->parent == parent_id) return CommandCost();
+
 		/* Set group parent */
 		const Group *pg = Group::GetIfValid(parent_id);
 
@@ -458,7 +474,10 @@ CommandCost CmdAlterGroup(DoCommandFlags flags, AlterGroupMode mode, GroupID gro
 		}
 
 		if (flags.Test(DoCommandFlag::Execute)) {
+			if (g->parent != GroupID::Invalid()) Group::Get(g->parent)->children.erase(g->index);
 			g->parent = (pg == nullptr) ? GroupID::Invalid() : pg->index;
+			if (g->parent != GroupID::Invalid()) Group::Get(g->parent)->children.insert(g->index);
+
 			GroupStatistics::UpdateAutoreplace(g->owner);
 
 			if (!HasBit(g->livery.in_use, 0) || !HasBit(g->livery.in_use, 1)) {
@@ -696,8 +715,8 @@ static void SetGroupFlag(Group *g, GroupFlag flag, bool set, bool children)
 
 	if (!children) return;
 
-	for (Group *pg : Group::Iterate()) {
-		if (pg->parent == g->index) SetGroupFlag(pg, flag, set, true);
+	for (const GroupID &childgroup : g->children) {
+		SetGroupFlag(Group::Get(childgroup), flag, set, true);
 	}
 }
 
@@ -790,11 +809,14 @@ void UpdateTrainGroupID(Train *v)
 uint GetGroupNumEngines(CompanyID company, GroupID id_g, EngineID id_e)
 {
 	uint count = 0;
-	const Engine *e = Engine::Get(id_e);
-	for (const Group *g : Group::Iterate()) {
-		if (g->parent == id_g) count += GetGroupNumEngines(company, g->index, id_e);
+
+	if (Group *g = Group::GetIfValid(id_g); g != nullptr) {
+		for (const GroupID &childgroup : g->children) {
+			count += GetGroupNumEngines(company, childgroup, id_e);
+		}
 	}
-	return count + GroupStatistics::Get(company, id_g, e->type).GetNumEngines(id_e);
+
+	return count + GroupStatistics::Get(company, id_g, Engine::Get(id_e)->type).GetNumEngines(id_e);
 }
 
 /**
@@ -808,9 +830,13 @@ uint GetGroupNumEngines(CompanyID company, GroupID id_g, EngineID id_e)
 uint GetGroupNumVehicle(CompanyID company, GroupID id_g, VehicleType type)
 {
 	uint count = 0;
-	for (const Group *g : Group::Iterate()) {
-		if (g->parent == id_g) count += GetGroupNumVehicle(company, g->index, type);
+
+	if (Group *g = Group::GetIfValid(id_g); g != nullptr) {
+		for (const GroupID &childgroup : g->children) {
+			count += GetGroupNumVehicle(company, childgroup, type);
+		}
 	}
+
 	return count + GroupStatistics::Get(company, id_g, type).num_vehicle;
 }
 
@@ -825,9 +851,13 @@ uint GetGroupNumVehicle(CompanyID company, GroupID id_g, VehicleType type)
 uint GetGroupNumVehicleMinAge(CompanyID company, GroupID id_g, VehicleType type)
 {
 	uint count = 0;
-	for (const Group *g : Group::Iterate()) {
-		if (g->parent == id_g) count += GetGroupNumVehicleMinAge(company, g->index, type);
+
+	if (Group *g = Group::GetIfValid(id_g); g != nullptr) {
+		for (const GroupID &childgroup : g->children) {
+			count += GetGroupNumVehicleMinAge(company, childgroup, type);
+		}
 	}
+
 	return count + GroupStatistics::Get(company, id_g, type).num_vehicle_min_age;
 }
 
@@ -842,9 +872,13 @@ uint GetGroupNumVehicleMinAge(CompanyID company, GroupID id_g, VehicleType type)
 Money GetGroupProfitLastYearMinAge(CompanyID company, GroupID id_g, VehicleType type)
 {
 	Money sum = 0;
-	for (const Group *g : Group::Iterate()) {
-		if (g->parent == id_g) sum += GetGroupProfitLastYearMinAge(company, g->index, type);
+
+	if (Group *g = Group::GetIfValid(id_g); g != nullptr) {
+		for (const GroupID &childgroup : g->children) {
+			sum += GetGroupProfitLastYearMinAge(company, childgroup, type);
+		}
 	}
+
 	return sum + GroupStatistics::Get(company, id_g, type).profit_last_year_min_age;
 }
 

src/group_gui.cpp

@@ -111,65 +111,12 @@ static constexpr NWidgetPart _nested_group_widgets[] = {
 	EndContainer(),
 };
 
-/**
- * Add children to GUI group list to build a hierarchical tree.
- * @param dst Destination list.
- * @param src Source list.
- * @param fold Whether to handle group folding/hiding.
- * @param parent Current tree parent (set by self with recursion).
- * @param indent Current tree indentation level (set by self with recursion).
- */
-static void GuiGroupListAddChildren(GUIGroupList &dst, const GUIGroupList &src, bool fold, GroupID parent = GroupID::Invalid(), uint8_t indent = 0)
+static void SortGUIGroupList(std::vector<GUIGroupListItem> &list)
 {
-	for (const auto &item : src) {
-		if (item.group->parent != parent) continue;
-
-		dst.emplace_back(item.group, indent);
-
-		if (fold && item.group->folded) {
-			/* Test if this group has children at all. If not, the folded flag should be cleared to avoid lingering unfold buttons in the list. */
-			GroupID groupid = item.group->index;
-			bool has_children = std::any_of(src.begin(), src.end(), [groupid](const auto &child) { return child.group->parent == groupid; });
-			Group::Get(item.group->index)->folded = has_children;
-		} else {
-			GuiGroupListAddChildren(dst, src, fold, item.group->index, indent + 1);
-		}
-	}
-
-	if (indent > 0 || dst.empty()) return;
-
-	/* Hierarchy is complete, traverse in reverse to find where indentation levels continue. */
-	uint16_t level_mask = 0;
-	for (auto it = std::rbegin(dst); std::next(it) != std::rend(dst); ++it) {
-		auto next_it = std::next(it);
-		AssignBit(level_mask, it->indent, it->indent <= next_it->indent);
-		next_it->level_mask = level_mask;
-	}
-}
-
-/**
- * Build GUI group list, a sorted hierarchical list of groups for owner and vehicle type.
- * @param dst Destination list, owned by the caller.
- * @param fold Whether to handle group folding/hiding.
- * @param owner Owner of groups.
- * @param veh_type Vehicle type of groups.
- */
-void BuildGuiGroupList(GUIGroupList &dst, bool fold, Owner owner, VehicleType veh_type)
-{
-	GUIGroupList list;
-
-	for (const Group *g : Group::Iterate()) {
-		if (g->owner == owner && g->vehicle_type == veh_type) {
-			list.emplace_back(g, 0);
-		}
-	}
-
-	list.ForceResort();
-
 	/* Sort the groups by their name */
 	std::array<std::pair<const Group *, std::string>, 2> last_group{};
 
-	list.Sort([&last_group](const GUIGroupListItem &a, const GUIGroupListItem &b) -> bool {
+	std::ranges::sort(list, [&last_group](const GUIGroupListItem &a, const GUIGroupListItem &b) -> bool {
 		if (a.group != last_group[0].first) {
 			last_group[0] = {a.group, GetString(STR_GROUP_NAME, a.group->index)};
 		}
@@ -182,8 +129,68 @@ void BuildGuiGroupList(GUIGroupList &dst, bool fold, Owner owner, VehicleType ve
 		if (r == 0) return a.group->number < b.group->number;
 		return r < 0;
 	});
+}
 
-	GuiGroupListAddChildren(dst, list, fold, GroupID::Invalid(), 0);
+/**
+ * Add children to GUI group list to build a hierarchical tree.
+ * @param list Destination list.
+ * @param item Group item to add children to.
+ * @param fold Whether to handle group folding/hiding.
+ * @param indent Current tree indentation level (set by self with recursion).
+ */
+static void GuiGroupListAddChildren(GUIGroupList &list, GUIGroupListItem &item, bool fold, uint8_t indent = 1)
+{
+	if (fold && item.group->folded) {
+		Group::Get(item.group->index)->folded = !item.group->children.empty();
+		return;
+	}
+
+	if (item.group->children.empty()) return;
+
+	std::vector<GUIGroupListItem> sublist;
+	for (const GroupID &group : item.group->children) {
+		sublist.emplace_back(Group::Get(group), indent);
+	}
+	SortGUIGroupList(sublist);
+
+	for (const GUIGroupListItem &subitem : sublist) {
+		GuiGroupListAddChildren(list, list.emplace_back(subitem), fold, indent + 1);
+	}
+}
+
+/**
+ * Build GUI group list, a sorted hierarchical list of groups for owner and vehicle type.
+ * @param dst Destination list, owned by the caller.
+ * @param fold Whether to handle group folding/hiding.
+ * @param owner Owner of groups.
+ * @param veh_type Vehicle type of groups.
+ */
+void BuildGuiGroupList(GUIGroupList &list, bool fold, Owner owner, VehicleType veh_type)
+{
+	/* Make a temporary list of parent groups */
+	std::vector<GUIGroupListItem> sublist;
+	for (const Group *g : Group::Iterate()) {
+		if (g->parent != GroupID::Invalid()) continue;
+		if (g->owner != owner) continue;
+		if (g->vehicle_type != veh_type) continue;
+		sublist.emplace_back(g, 0);
+	}
+	SortGUIGroupList(sublist);
+
+	/* Now add each parent group, and its children if necessary, to the list. */
+	for (auto &item : sublist) {
+		GuiGroupListAddChildren(list, list.emplace_back(item), fold);
+	}
+
+	if (list.empty()) return;
+
+	/* Hierarchy is complete, traverse in reverse to find where indentation levels continue. */
+	uint16_t level_mask = 0;
+	for (auto it = std::rbegin(list); std::next(it) != std::rend(list); ++it) {
+		auto next_it = std::next(it);
+		AssignBit(level_mask, it->indent, it->indent <= next_it->indent);
+		next_it->level_mask = level_mask;
+	}
 }
 
 class VehicleGroupWindow : public BaseVehicleListWindow {
@@ -423,8 +430,7 @@ public:
 		switch (widget) {
 			case WID_GL_LIST_GROUP:
 				size.width = this->ComputeGroupInfoSize();
-				resize.height = this->tiny_step_height;
-				fill.height = this->tiny_step_height;
+				fill.height = resize.height = this->tiny_step_height;
 				break;
 
 			case WID_GL_ALL_VEHICLES:
@@ -443,7 +449,7 @@ public:
 
 			case WID_GL_LIST_VEHICLE:
 				this->ComputeGroupInfoSize();
-				resize.height = GetVehicleListHeight(this->vli.vtype, this->tiny_step_height);
+				fill.height = resize.height = GetVehicleListHeight(this->vli.vtype, this->tiny_step_height);
 				size.height = 4 * resize.height;
 				break;
 
@@ -981,7 +987,7 @@ public:
 		this->vscroll->SetCapacityFromWidget(this, WID_GL_LIST_VEHICLE);
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		switch (widget) {
 			case WID_GL_GROUP_BY_DROPDOWN:

src/industry_cmd.cpp

@@ -2735,14 +2735,14 @@ int WhoCanServiceIndustry(Industry *ind)
 		 * We cannot check the first of shared orders only, since the first vehicle in such a chain
 		 * may have a different cargo type.
 		 */
-		for (const Order *o : v->Orders()) {
-			if (o->IsType(OT_GOTO_STATION) && !(o->GetUnloadType() & OUFB_TRANSFER)) {
+		for (const Order &o : v->Orders()) {
+			if (o.IsType(OT_GOTO_STATION) && !(o.GetUnloadType() & OUFB_TRANSFER)) {
 				/* Vehicle visits a station to load or unload */
-				Station *st = Station::Get(o->GetDestination().ToStationID());
+				Station *st = Station::Get(o.GetDestination().ToStationID());
 				assert(st != nullptr);
 
 				/* Same cargo produced by industry is dropped here => not serviced by vehicle v */
-				if ((o->GetUnloadType() & OUFB_UNLOAD) && !c_accepts) break;
+				if ((o.GetUnloadType() & OUFB_UNLOAD) && !c_accepts) break;
 
 				if (ind->stations_near.find(st) != ind->stations_near.end()) {
 					if (v->owner == _local_company) return 2; // Company services industry

src/industry_gui.cpp

@@ -444,7 +444,7 @@ public:
 				for (const auto &indtype : this->list) {
 					d = maxdim(d, GetStringBoundingBox(GetIndustrySpec(indtype)->name));
 				}
-				resize.height = std::max<uint>({this->legend.height, d.height, count.height}) + padding.height;
+				fill.height = resize.height = std::max<uint>({this->legend.height, d.height, count.height}) + padding.height;
 				d.width += this->badge_classes.GetTotalColumnsWidth() + this->legend.width + WidgetDimensions::scaled.hsep_wide + WidgetDimensions::scaled.hsep_normal + count.width + padding.width;
 				d.height = 5 * resize.height;
 				size = maxdim(size, d);
@@ -1165,7 +1165,7 @@ public:
 		if (!str.has_value() || str->empty()) return;
 
 		Industry *i = Industry::Get(this->window_number);
-		auto value = ParseInteger(*str);
+		auto value = ParseInteger(*str, 10, true);
 		if (!value.has_value()) return;
 		switch (this->editbox_line) {
 			case IL_NONE: NOT_REACHED();
@@ -1343,10 +1343,6 @@ static bool CargoFilter(const Industry * const *industry, const std::pair<CargoT
 
 static GUIIndustryList::FilterFunction * const _industry_filter_funcs[] = { &CargoFilter };
 
-/** Enum referring to the Hotkeys in the industry directory window */
-enum IndustryDirectoryHotkeys : int32_t {
-	IDHK_FOCUS_FILTER_BOX, ///< Focus the filter box
-};
 /**
  * The list of industries.
  */
@@ -1784,7 +1780,7 @@ public:
 
 			case WID_ID_INDUSTRY_LIST: {
 				Dimension d = GetStringBoundingBox(STR_INDUSTRY_DIRECTORY_NONE);
-				resize.height = d.height;
+				fill.height = resize.height = d.height;
 				d.height *= 5;
 				d.width += padding.width;
 				d.height += padding.height;
@@ -1846,7 +1842,7 @@ public:
 		}
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		switch (widget) {
 			case WID_ID_DROPDOWN_CRITERIA: {
@@ -1921,21 +1917,8 @@ public:
 		}
 	}
 
-	EventState OnHotkey(int hotkey) override
-	{
-		switch (hotkey) {
-			case IDHK_FOCUS_FILTER_BOX:
-				this->SetFocusedWidget(WID_ID_FILTER);
-				SetFocusedWindow(this); // The user has asked to give focus to the text box, so make sure this window is focused.
-				break;
-			default:
-				return ES_NOT_HANDLED;
-		}
-		return ES_HANDLED;
-	}
-
 	static inline HotkeyList hotkeys {"industrydirectory", {
-		Hotkey('F', "focus_filter_box", IDHK_FOCUS_FILTER_BOX),
+		Hotkey('F', "focus_filter_box", WID_ID_FILTER),
 	}};
 };
 
@@ -2661,7 +2644,7 @@ struct IndustryCargoesWindow : public Window {
 	{
 		switch (widget) {
 			case WID_IC_PANEL:
-				resize.height = CargoesField::normal_height;
+				fill.height = resize.height = CargoesField::normal_height;
 				size.width = CargoesField::industry_width * 3 + CargoesField::cargo_field_width * 2 + WidgetDimensions::scaled.frametext.Horizontal();
 				size.height = CargoesField::small_height + 2 * resize.height + WidgetDimensions::scaled.frametext.Vertical();
 				break;
@@ -3149,7 +3132,7 @@ struct IndustryCargoesWindow : public Window {
 		}
 	}
 
-	void OnDropdownSelect(WidgetID widget, int index) override
+	void OnDropdownSelect(WidgetID widget, int index, int) override
 	{
 		if (index < 0) return;
 

src/intro_gui.cpp

@@ -350,16 +350,16 @@ static constexpr NWidgetPart _nested_select_game_widgets[] = {
 
 			/* Single player */
 			NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_normal, 0),
-				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_GENERATE_GAME), SetSpriteStringTip(SPR_IMG_LANDSCAPING, STR_INTRO_NEW_GAME, STR_INTRO_TOOLTIP_NEW_GAME), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
-				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_PLAY_HEIGHTMAP), SetSpriteStringTip(SPR_IMG_SHOW_COUNTOURS, STR_INTRO_PLAY_HEIGHTMAP, STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
-				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_PLAY_SCENARIO), SetSpriteStringTip(SPR_IMG_SUBSIDIES, STR_INTRO_PLAY_SCENARIO, STR_INTRO_TOOLTIP_PLAY_SCENARIO), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
-				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_LOAD_GAME), SetSpriteStringTip(SPR_IMG_SAVE, STR_INTRO_LOAD_GAME, STR_INTRO_TOOLTIP_LOAD_GAME), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
-				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_HIGHSCORE), SetSpriteStringTip(SPR_IMG_COMPANY_LEAGUE, STR_INTRO_HIGHSCORE, STR_INTRO_TOOLTIP_HIGHSCORE), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
+				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_GENERATE_GAME), SetToolbarMinimalSize(1), SetSpriteStringTip(SPR_IMG_LANDSCAPING, STR_INTRO_NEW_GAME, STR_INTRO_TOOLTIP_NEW_GAME), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
+				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_PLAY_HEIGHTMAP), SetToolbarMinimalSize(1), SetSpriteStringTip(SPR_IMG_SHOW_COUNTOURS, STR_INTRO_PLAY_HEIGHTMAP, STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
+				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_PLAY_SCENARIO), SetToolbarMinimalSize(1), SetSpriteStringTip(SPR_IMG_SUBSIDIES, STR_INTRO_PLAY_SCENARIO, STR_INTRO_TOOLTIP_PLAY_SCENARIO), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
+				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_LOAD_GAME), SetToolbarMinimalSize(1), SetSpriteStringTip(SPR_IMG_SAVE, STR_INTRO_LOAD_GAME, STR_INTRO_TOOLTIP_LOAD_GAME), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
+				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_HIGHSCORE), SetToolbarMinimalSize(1), SetSpriteStringTip(SPR_IMG_COMPANY_LEAGUE, STR_INTRO_HIGHSCORE, STR_INTRO_TOOLTIP_HIGHSCORE), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
 			EndContainer(),
 
 			/* Multi player */
 			NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_normal, 0),
-				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_PLAY_NETWORK), SetSpriteStringTip(SPR_IMG_COMPANY_GENERAL, STR_INTRO_MULTIPLAYER, STR_INTRO_TOOLTIP_MULTIPLAYER), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
+				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_PLAY_NETWORK), SetToolbarMinimalSize(1), SetSpriteStringTip(SPR_IMG_COMPANY_GENERAL, STR_INTRO_MULTIPLAYER, STR_INTRO_TOOLTIP_MULTIPLAYER), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
 			EndContainer(),
 
 			NWidget(NWID_SELECTION, INVALID_COLOUR, WID_SGI_BASESET_SELECTION),
@@ -376,14 +376,14 @@ static constexpr NWidgetPart _nested_select_game_widgets[] = {
 
 			/* Other */
 			NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_normal, 0),
-				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_OPTIONS), SetSpriteStringTip(SPR_IMG_SETTINGS, STR_INTRO_GAME_OPTIONS, STR_INTRO_TOOLTIP_GAME_OPTIONS), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
-				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_CONTENT_DOWNLOAD), SetSpriteStringTip(SPR_IMG_SHOW_VEHICLES, STR_INTRO_ONLINE_CONTENT, STR_INTRO_TOOLTIP_ONLINE_CONTENT), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
-				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_EDIT_SCENARIO), SetSpriteStringTip(SPR_IMG_SMALLMAP, STR_INTRO_SCENARIO_EDITOR, STR_INTRO_TOOLTIP_SCENARIO_EDITOR), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
-				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_HELP), SetSpriteStringTip(SPR_IMG_QUERY, STR_INTRO_HELP, STR_INTRO_TOOLTIP_HELP), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
+				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_OPTIONS), SetToolbarMinimalSize(1), SetSpriteStringTip(SPR_IMG_SETTINGS, STR_INTRO_GAME_OPTIONS, STR_INTRO_TOOLTIP_GAME_OPTIONS), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
+				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_CONTENT_DOWNLOAD), SetToolbarMinimalSize(1), SetSpriteStringTip(SPR_IMG_SHOW_VEHICLES, STR_INTRO_ONLINE_CONTENT, STR_INTRO_TOOLTIP_ONLINE_CONTENT), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
+				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_EDIT_SCENARIO), SetToolbarMinimalSize(1), SetSpriteStringTip(SPR_IMG_SMALLMAP, STR_INTRO_SCENARIO_EDITOR, STR_INTRO_TOOLTIP_SCENARIO_EDITOR), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
+				NWidget(WWT_PUSHIMGTEXTBTN, COLOUR_ORANGE, WID_SGI_HELP), SetToolbarMinimalSize(1), SetSpriteStringTip(SPR_IMG_QUERY, STR_INTRO_HELP, STR_INTRO_TOOLTIP_HELP), SetAlignment(SA_LEFT | SA_VERT_CENTER), SetFill(1, 0),
 			EndContainer(),
 
 			NWidget(NWID_VERTICAL),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_EXIT), SetMinimalSize(0, 20 + WidgetDimensions::unscaled.framerect.Vertical()), SetStringTip(STR_INTRO_QUIT, STR_INTRO_TOOLTIP_QUIT),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_EXIT), SetToolbarMinimalSize(1), SetStringTip(STR_INTRO_QUIT, STR_INTRO_TOOLTIP_QUIT),
 			EndContainer(),
 		EndContainer(),
 	EndContainer(),

src/lang/afrikaans.txt

@@ -865,8 +865,8 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spel Ops
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Geldeenheid
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Geld eendheid keuse
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Geldeenheid
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Geld eendheid keuse
 
 
 ###length 45
@@ -910,21 +910,21 @@ STR_GAME_OPTIONS_CURRENCY_NTD                                   :Nuwe Taiwan dol
 STR_GAME_OPTIONS_CURRENCY_CNY                                   :Chinese Renminbi
 STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hong Kong Dollar
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Outostoor
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Kies interval tussen outomatiese store
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Outostoor
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Kies interval tussen outomatiese store
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Af
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Taal
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Kies die koppelvlak taal om te gebruik
+STR_GAME_OPTIONS_LANGUAGE                                       :Taal
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Kies die koppelvlak taal om te gebruik
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Volskerm
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Kies die blokkie om OpenTTD in volleskerm te speel
+STR_GAME_OPTIONS_FULLSCREEN                                     :Volskerm
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Kies die blokkie om OpenTTD in volleskerm te speel
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Skerm resolusie
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Kies die skerm resolusie om te gebruik
+STR_GAME_OPTIONS_RESOLUTION                                     :Skerm resolusie
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Kies die skerm resolusie om te gebruik
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :ander
 
 
@@ -938,17 +938,17 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :ander
 
 
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Basis-grafikastel
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Kies die basis-grafikastel stel om te gebruik
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Meer inligting oor die basis-grafikastel
+STR_GAME_OPTIONS_BASE_GRF                                       :Basis-grafikastel
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Kies die basis-grafikastel stel om te gebruik
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Meer inligting oor die basis-grafikastel
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Basis klank stel
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Kies die basis klank stel om te gebruik
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Addisionele informasie oor die basis klank stel
+STR_GAME_OPTIONS_BASE_SFX                                       :Basis klank stel
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Kies die basis klank stel om te gebruik
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Addisionele informasie oor die basis klank stel
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Basis musiek stel
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Kies die basis musiek stel om te gebruik
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Addisionele informasie oor die basis musiek stel
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Basis musiek stel
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Kies die basis musiek stel om te gebruik
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Addisionele informasie oor die basis musiek stel
 
 
 
@@ -1052,9 +1052,9 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Permissief
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Geen geskikte KI beskikbaar...{}Jy kan verskeie KI's aflaai deur middel van die 'Aanlyn Inhoud' stelsel
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filter string:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Brei alles uit
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Krimp alles in
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filter string:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Brei alles uit
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Krimp alles in
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(geen verduideliking beskikbaar)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Standaard waarde: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Stelling tipe: {ORANGE}{STRING}
@@ -1064,9 +1064,9 @@ STR_CONFIG_SETTING_TYPE_GAME_INGAME                             :Maatskappy inst
 STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :Maatskappy instelling (word gestoor in Spaarspeletjies; raak net nuwe speletjies)
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Maatskappy instelling (word gestoor in spaarspeletjie; raak net die huidige maatskappy)
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategorie:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Tipe:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Beperk die lys hier onder deur voorafgestelde "filters" te gebruik slegs veranderde verstellings
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategorie:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Tipe:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Beperk die lys hier onder deur voorafgestelde "filters" te gebruik slegs veranderde verstellings
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Basiese (wys net belangrik verstellings)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Gevorderde (wys meeste verstellings)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Ekspert (wys alle verstellings, insluitend vreemde verstellings)
@@ -1083,9 +1083,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Maatskappy-inst
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Geen -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Wys alle soekresultate deur oprigting{}{SILVER}Kategorie {BLACK}tot {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Wys alle soekresultate deur oprigting{}{SILVER}Tik {BLACK}tot {WHITE}Alle opstel tipes
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Wys alle soekresultate deur oprigting{}{SILVER}Kategorie {BLACK}tot {WHITE}{STRING} {BLACK}en {SILVER}Tik {BLACK}tot {WHITE}Alle opstel tipes
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Wys alle soekresultate deur oprigting{}{SILVER}Kategorie {BLACK}tot {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Wys alle soekresultate deur oprigting{}{SILVER}Tik {BLACK}tot {WHITE}Alle opstel tipes
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Wys alle soekresultate deur oprigting{}{SILVER}Kategorie {BLACK}tot {WHITE}{STRING} {BLACK}en {SILVER}Tik {BLACK}tot {WHITE}Alle opstel tipes
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Af
@@ -2584,6 +2584,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Kies dor
 STR_FOUND_TOWN_CITY                                             :{BLACK}Stad
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Stede groei viniger as gewone dorpe{}Afhangende van stellings, is hulle grooter waneer hulle gestig word
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Straat uitleg van dorp:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Kies straat uitleg wat vir die dorp gebruik word
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Oorspronklik
@@ -4053,7 +4054,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Rooster
 STR_TIMETABLE_NO_TRAVEL                                         :Geen reis
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Reis (outomaties; getabuleer volgens eiehandige bevel)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Reis (Nie op rooster nie)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Reis nie meer as {2:VELOCITY} nie (nie volgens tydrooster nie)
 STR_TIMETABLE_TRAVEL_FOR                                        :Reis vir {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Reis vir {STRING} met die meeste {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Reis (vir {STRING}, nie volgens tydrooster nie)

src/lang/arabic_egypt.txt

@@ -880,8 +880,8 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}إعدا
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}وحدة العملة
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}اختيار وحدة العملة
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :وحدة العملة
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :اختيار وحدة العملة
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -930,8 +930,8 @@ STR_GAME_OPTIONS_CURRENCY_IDR                                   :الروبية
 STR_GAME_OPTIONS_CURRENCY_MYR                                   :رينغيت ماليزي
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :لاتفيا لاتس
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}حفظ آلي
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}اختار مدة الحفظ الآلي
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :حفظ آلي
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :اختار مدة الحفظ الآلي
 
 # Autosave dropdown
 ###length 5
@@ -941,57 +941,57 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :كل 30 دقي
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :كل 60 دقيقة
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :كل 120 دقيقة
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}لغة
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}اختر لغة الواجهه
+STR_GAME_OPTIONS_LANGUAGE                                       :لغة
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :اختر لغة الواجهه
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% مكتمل)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}شاشة كاملة
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}اختر هذا المربع للعب OpenTTD على لشاشة الكاملة
+STR_GAME_OPTIONS_FULLSCREEN                                     :شاشة كاملة
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :اختر هذا المربع للعب OpenTTD على لشاشة الكاملة
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}دقة الشاشة
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}اختر دقة الشاشة
+STR_GAME_OPTIONS_RESOLUTION                                     :دقة الشاشة
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :اختر دقة الشاشة
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :اخرى
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}تسريع الأجهزة
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}اخترهذا المربع للسماح لـ OpenTTD بمحاولة استخدام تسريع الأجهزة. سيتم تطبيق الإعداد الذي تم تغييره فقط عند إعادة تشغيل اللعبة
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :تسريع الأجهزة
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :اخترهذا المربع للسماح لـ OpenTTD بمحاولة استخدام تسريع الأجهزة. سيتم تطبيق الإعداد الذي تم تغييره فقط عند إعادة تشغيل اللعبة
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}لن يعمل الإعداد إلا بعد إعادة تشغيل اللعبة
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}حدد هذا المربع لمزامنة الشاشة (v-sync). سيتم تطبيق الإعداد الذي تم تغييره فقط عند إعادة تشغيل اللعبة. يعمل فقط مع تمكين تسريع الأجهزة (hardware acceleration)
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :حدد هذا المربع لمزامنة الشاشة (v-sync). سيتم تطبيق الإعداد الذي تم تغييره فقط عند إعادة تشغيل اللعبة. يعمل فقط مع تمكين تسريع الأجهزة (hardware acceleration)
 
 
 
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}اسحب شريط التمرير لتعيين حجم الواجهة. اضغط مع الاستمرار على Ctrl للتعديل المستمر
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}الكشف التلقائي عن الحجم
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}اختر هذا المربع لكشف حجم الواجهة تلقائيا
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :اسحب شريط التمرير لتعيين حجم الواجهة. اضغط مع الاستمرار على Ctrl للتعديل المستمر
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :الكشف التلقائي عن الحجم
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :اختر هذا المربع لكشف حجم الواجهة تلقائيا
 
 
 
 
 
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}معدل تحديث الشاشة
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}حدد معدل تحديث الشاشة
+STR_GAME_OPTIONS_REFRESH_RATE                                   :معدل تحديث الشاشة
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :حدد معدل تحديث الشاشة
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}هرتز
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}قد تؤثر معدلات التحديث الأعلى من 60 هرتز على الأداء.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK} الواجهة الرسومية الاساسية
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK} اختر مجموعة الواجهة الرسومية
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK} معلومات اضافية عن القاعدة الرسومية
+STR_GAME_OPTIONS_BASE_GRF                                       : الواجهة الرسومية الاساسية
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               : اختر مجموعة الواجهة الرسومية
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   : معلومات اضافية عن القاعدة الرسومية
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}قاعدة الاصوات الاساسية
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}اختر الاصوات الاساسية للاستخدام
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}معلومات اضافية حول مجوعة الصوت
+STR_GAME_OPTIONS_BASE_SFX                                       :قاعدة الاصوات الاساسية
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :اختر الاصوات الاساسية للاستخدام
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :معلومات اضافية حول مجوعة الصوت
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}قاعده الموسيقى الاساسيه
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}اختر الموسيقى الاساسية التي تود استخدامها
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}معلومات اضافية عن الموسيقى الاساسية
+STR_GAME_OPTIONS_BASE_MUSIC                                     :قاعده الموسيقى الاساسيه
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :اختر الموسيقى الاساسية التي تود استخدامها
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :معلومات اضافية عن الموسيقى الاساسية
 
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(لا توجد اضافات مثبتة للتكامل مع منصات التواصل)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}المنصة:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}حالة الاضافة:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :المنصة:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :حالة الاضافة:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}فشلت التهيئة
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_PLATFORM_NOT_RUNNING       :{ORANGE}{STRING} غير مفعلة
@@ -1098,15 +1098,15 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :متساهل (
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}لايوجد ذكاء اصطناعي متاح ...{}تستطيع تجميل العديد من الذكاء الاصطناعي عن طريق اللانترنت
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}تصفية القائمة:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}مدد الكل
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}إسحب الكل
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}اعادة ضبط جميع القيم
+STR_CONFIG_SETTING_FILTER_TITLE                                 :تصفية القائمة:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :مدد الكل
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :إسحب الكل
+STR_CONFIG_SETTING_RESET_ALL                                    :اعادة ضبط جميع القيم
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(لا يوجد تفسير متوفر)
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}تحذير!
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK} فئة:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}نوع:
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            : فئة:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :نوع:
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :اﻹعدادات الاساسيه
 
 STR_CONFIG_SETTING_TYPE_DROPDOWN_HELPTEXT                       :{BLACK}احصر القائمة على انواع اعدادات محددة
@@ -1119,7 +1119,7 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :اعدادات
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE} - بدون -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}عرض جميع النتائج بالنسبة للإعداد{}{SILVER} الفئة {BLACK} إلى {WHITE}{STRING} {BLACK}و{SILVER}نوع {BLACK} إلى{WHITE} جميع انواع الإعدادات
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :عرض جميع النتائج بالنسبة للإعداد{}{SILVER} الفئة {BLACK} إلى {WHITE}{STRING} {BLACK}و{SILVER}نوع {BLACK} إلى{WHITE} جميع انواع الإعدادات
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :قفل
@@ -2498,6 +2498,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}حدد
 STR_FOUND_TOWN_CITY                                             :{BLACK}مدينة
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK} المدن الكبيرة تنمو اسرع من المدن العادية.{} كلما كانت اكبر عند انشائها, بالاعتماد على الاعدادات.
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW} تصميم طرق المدينة
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK} اختر تصميم الطرق لهذه المدينة
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK} اصلي
@@ -3928,7 +3929,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}جدول
 STR_TIMETABLE_NO_TRAVEL                                         :لا رحيل
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :مسافرة (ذاتي: مجدول بواسطة الامر اليدوي التالي)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :مسافرة (غير مجدول)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :مسافرة (ليس مجدول) بسرعة لا تتعدى {2:VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :مسافر لـ {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :سافر لي {STRING} بمعدل {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :مسافرة (ل {STRING}، ليس مجدول)

src/lang/basque.txt

@@ -842,8 +842,8 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Jokoaren
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Diru unitateak
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Diru unitatearen aukeraketa
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Diru unitateak
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Diru unitatearen aukeraketa
 
 
 ###length 45
@@ -882,21 +882,21 @@ STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Pertsonalizatua
 STR_GAME_OPTIONS_CURRENCY_GEL                                   :Lari Georgiarra
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :Rial Iraniarra
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Auto-gordea
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Aukeratu jokoa automatikoki gordetzeko denbora
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Auto-gordea
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Aukeratu jokoa automatikoki gordetzeko denbora
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Ez
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Hizkuntza
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Aukeratu interfazean erabiltzeko hizkuntza
+STR_GAME_OPTIONS_LANGUAGE                                       :Hizkuntza
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Aukeratu interfazean erabiltzeko hizkuntza
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Pantaila osoa
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Markatu kaxa hau OpenTTD pantaila osoko moduan jolasteko
+STR_GAME_OPTIONS_FULLSCREEN                                     :Pantaila osoa
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Markatu kaxa hau OpenTTD pantaila osoko moduan jolasteko
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Pantailaren resoluzioa
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Pantailaren resulozioa aukeratu
+STR_GAME_OPTIONS_RESOLUTION                                     :Pantailaren resoluzioa
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Pantailaren resulozioa aukeratu
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :besteak
 
 
@@ -910,17 +910,17 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :besteak
 
 
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Grafiko basea markatu
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Aukeratu erabili beharreko grafiko paketea
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Markatutako grafiko basearen informazio gehiago
+STR_GAME_OPTIONS_BASE_GRF                                       :Grafiko basea markatu
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Aukeratu erabili beharreko grafiko paketea
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Markatutako grafiko basearen informazio gehiago
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Base musika paketea
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Aukeratu erabili beharreko soinu paketea
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Soinu paketearen informazio gehiago
+STR_GAME_OPTIONS_BASE_SFX                                       :Base musika paketea
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Aukeratu erabili beharreko soinu paketea
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Soinu paketearen informazio gehiago
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Base musika konfiguratu
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Aukeratu erabili beharreko musika paketea
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Musika paketearen informazio gehiago
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Base musika konfiguratu
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Aukeratu erabili beharreko musika paketea
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Musika paketearen informazio gehiago
 
 
 
@@ -1023,9 +1023,9 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Jasankorra
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Ez dago IA egokirik aukeratzeko..{}IA asko jaitsi ditzakezu 'Online edukiera' sistemaren bidez
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Lokarri iragazkia:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Guztia haunditu
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Guztia kolapsatu
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Lokarri iragazkia:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Guztia haunditu
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Guztia kolapsatu
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(Ez dago azalpen erabilgarririk)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Balio lehenetsia: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Mota ezarpena: {ORANGE}{STRING}
@@ -1035,9 +1035,9 @@ STR_CONFIG_SETTING_TYPE_GAME_INGAME                             :Joko ezarpenak
 STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :Konpainia ezarpenak (Gorden bilduta; bakarrik joko berriei eragingo die)
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Konpainia ezarpenak (Gorden bilduta; bakarrik uneko konpainiari eragiten dio)
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategoria:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Mota:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Beheko zerrenda laburtu bakarrik aldatutako ezarpenak erakutsiz
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategoria:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Mota:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Beheko zerrenda laburtu bakarrik aldatutako ezarpenak erakutsiz
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Oinarrizkoa (ezarpen garrantzitsuak bakarrik erakutsi)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Aurreratua (ezarpen gehienak erakutsi)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Aditua (ezarpen guztiak erakutsi, arraroak barne)
@@ -2459,6 +2459,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Herriare
 STR_FOUND_TOWN_CITY                                             :{BLACK}Hiria
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Hiriak herriak baino azkarrago hazten dira{}Ezarpenen arabera sortzerakoan handiagoak izan daitezke
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Herri errepideen diseinua:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Herriaren errepide diseinua aukeratu
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Jatorrizkoa
@@ -3825,7 +3826,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Ordutegi
 STR_TIMETABLE_NO_TRAVEL                                         :Bidaiarik ez
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Bidaia (automatikoa)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Bidaia (ordutegirik gabe)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Gehienez {2:VELOCITY}-ko abiadurara bidaiatu (ordutegirik gabe)
 STR_TIMETABLE_TRAVEL_FOR                                        :{STRING} bidaiatu
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :{STRING}-ra bidaiatu gehienez {VELOCITY}ra
 STR_TIMETABLE_STAY_FOR                                          :{STRING} gelditu

src/lang/belarusian.txt

@@ -1257,13 +1257,13 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Пера
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Наладкі гульні
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Асноўныя
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Асноўныя наладкі гульні
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Асноўныя наладкі гульні
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Графіка
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Наладкі графікі
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Наладкі графікі
 STR_GAME_OPTIONS_TAB_SOUND                                      :Гук
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Наладкі гуку і музыкі
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Наладкі гуку і музыкі
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Сацыяльныя
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Наладкі сацыяльнай інтэграцыі
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Наладкі сацыяльнай інтэграцыі
 
 STR_GAME_OPTIONS_VOLUME                                         :Гучнасць
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Гукавыя эфекты
@@ -1271,8 +1271,8 @@ STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Музыка
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Валюта
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Выбар валюты
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Валюта
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Выбар валюты
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1321,8 +1321,8 @@ STR_GAME_OPTIONS_CURRENCY_IDR                                   :Інданэз
 STR_GAME_OPTIONS_CURRENCY_MYR                                   :Малайзійскі рынгіт
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :Латвійскі лат
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Аўтазахаваньне
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Інтэрвал паміж аўтаматычнымі захаваньнямі гульні
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Аўтазахаваньне
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Інтэрвал паміж аўтаматычнымі захаваньнямі гульні
 
 # Autosave dropdown
 ###length 5
@@ -1332,74 +1332,74 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :кожныя 30
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :кожныя 60 хвілін
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :кожныя 120 хвілін
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Мова
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Выбраць мову інтэрфэйсу
+STR_GAME_OPTIONS_LANGUAGE                                       :Мова
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Выбраць мову інтэрфэйсу
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% перакладзены)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Поўны экран
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Уключыць/выключыць поўнаэкранны рэжым
+STR_GAME_OPTIONS_FULLSCREEN                                     :Поўны экран
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Уключыць/выключыць поўнаэкранны рэжым
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Вырашэньне экрана
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Выбар вырашэньня экрана
+STR_GAME_OPTIONS_RESOLUTION                                     :Вырашэньне экрана
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Выбар вырашэньня экрана
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Iншае
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Апаратнае паскарэньне
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Уключыць/выключыць апаратнае паскарэньне. Пасля гэтага гульню запатрабуецца перазапусціць.
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Апаратнае паскарэньне
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Уключыць/выключыць апаратнае паскарэньне. Пасля гэтага гульню запатрабуецца перазапусціць.
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Гэта наладка будзе ўжыта толькі пасля перазапуску гульні
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}Вертыкальная сінхранізацыя
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Уключыць/выключыць вертыкальную сінхранізацыю. Пасля гэтага гульню запатрабуецца перазапусціць. Працуе толькі пры ўключаным апаратным паскарэньні.
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :Вертыкальная сінхранізацыя
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Уключыць/выключыць вертыкальную сінхранізацыю. Пасля гэтага гульню запатрабуецца перазапусціць. Працуе толькі пры ўключаным апаратным паскарэньні.
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Відэадрайвер: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Відэадрайвер: {STRING}
 
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Маштаб інтэрфейсу
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Змяняйце маштаб інтэрфейсу з дапамогай паўзунка. Утрымлівайце Ctrl для дакладнай наладкі.
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Аўтавызначэньне
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Пастаўце адзнаку для аўтаматычнай усталёўкі маштабу інтэрфейсу
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Маштаб інтэрфейсу
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Змяняйце маштаб інтэрфейсу з дапамогай паўзунка. Утрымлівайце Ctrl для дакладнай наладкі.
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Аўтавызначэньне
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Пастаўце адзнаку для аўтаматычнай усталёўкі маштабу інтэрфейсу
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Рэльефныя элементы
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Пастаўце адзнаку, каб маштабаваць рэльефныя элементы інтэрфейсу
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Рэльефныя элементы
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Пастаўце адзнаку, каб маштабаваць рэльефныя элементы інтэрфейсу
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Выкарыстоўваць растравы шрыфт
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Пастаўце адзнаку, каб выкарыстоўваць класічны растравы шрыфт фіксаванага памеру.
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Згладжваньне шрыфтоў
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Пастаўце адзнаку, каб уключыць згладжваньне маштабуемых шрыфтоў
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Выкарыстоўваць растравы шрыфт
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Пастаўце адзнаку, каб выкарыстоўваць класічны растравы шрыфт фіксаванага памеру.
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Згладжваньне шрыфтоў
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Пастаўце адзнаку, каб уключыць згладжваньне маштабуемых шрыфтоў
 
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Аўтаматычны збор дадзеных
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Дазволіць збор і адпраўку дадзеных
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Дазволіць аўтаматычны збор дадзеных пра вашы наладкі гульні і выкарыстаныя модулі. OpenTTD адправіць гэтыя дадзеныя пры зачыненьні гульні.
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Пра збор дадзеных і прыватнасьць
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Адкрыць спасылку з інфармацыяй пра аўтаматычны збор дадзеных
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Прагляд сабраных дадзеных
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Паказаць дадзеныя, сабраныя ў бягучым сеансе і падрыхтаваныя да адпраўкі
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Аўтаматычны збор дадзеных
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Дазволіць збор і адпраўку дадзеных
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Дазволіць аўтаматычны збор дадзеных пра вашы наладкі гульні і выкарыстаныя модулі. OpenTTD адправіць гэтыя дадзеныя пры зачыненьні гульні.
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Пра збор дадзеных і прыватнасьць
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Адкрыць спасылку з інфармацыяй пра аўтаматычны збор дадзеных
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Прагляд сабраных дадзеных
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Паказаць дадзеныя, сабраныя ў бягучым сеансе і падрыхтаваныя да адпраўкі
 
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Чашчыня абнаўлення экрана
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Выбар чашчыні абнаўленьня экрана
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Чашчыня абнаўлення экрана
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Выбар чашчыні абнаўленьня экрана
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}{NBSP}Гц
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Чашчыня абнаўленьня вышэй 60{NBSP}Гц можа адмоўна адбіцца на прадукцыйнасці.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Набор базавай ґрафікі
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Выбар асноўнага ґрафічнага пакета (яго нельга змяніць у гульні; толькі ў галоўным меню)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Дадатковая інфармацыя аб базавым ґрафічным наборы
+STR_GAME_OPTIONS_BASE_GRF                                       :Набор базавай ґрафікі
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Выбар асноўнага ґрафічнага пакета (яго нельга змяніць у гульні; толькі ў галоўным меню)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Дадатковая інфармацыя аб базавым ґрафічным наборы
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Базавы набор гукаў
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Выбар асноўнага пакета гукавых эфектаў (яго нельга змяніць у гульні; толькі ў галоўным меню)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Дадатковая інфармацыя аб базавым гукавым наборы
+STR_GAME_OPTIONS_BASE_SFX                                       :Базавы набор гукаў
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Выбар асноўнага пакета гукавых эфектаў (яго нельга змяніць у гульні; толькі ў галоўным меню)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Дадатковая інфармацыя аб базавым гукавым наборы
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Базавы набор музыкі
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Выберыце базавы музычны набор для выкарыстаньня
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Дадатковая інфармацыя аб базавым музычным наборы
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Базавы набор музыкі
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Выберыце базавы музычны набор для выкарыстаньня
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Дадатковая інфармацыя аб базавым музычным наборы
 
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(модулі ўзаемадзеяньня з сацыяльнымі платформамі не ўсталяваны)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Платформа:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Стан модуля:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Платформа:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Стан модуля:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Запушчаны
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Не атрымалася ініцыялізаваць
@@ -1513,10 +1513,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Дазваля
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Модулі штучнага інтэлекту (ШІ/AI) адсутнічаюць.{}Іх можна спампаваць праз сістэму праверкі "анлайн-кантэнту".
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Фільтар:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Разгарнуць усё
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Згарнуць усё
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Скінуць усе значэньні
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Фільтар:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Разгарнуць усё
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Згарнуць усё
+STR_CONFIG_SETTING_RESET_ALL                                    :Скінуць усе значэньні
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(няма тлумачэньня)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Значэньне па змоўчаньні: {ORANGE}{STRING}
@@ -1529,9 +1529,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Наладкі
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Увага!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Вы ўпэўнены, што жадаеце скінуць усе наладкі гульні да значэньняў па змаўчаньні?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Катэґорыя:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Тып:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Адлюстроўваць у спісе толькі наладкі, якія адпавядаюць абранай катэгорыі
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Катэґорыя:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Тып:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Адлюстроўваць у спісе толькі наладкі, якія адпавядаюць абранай катэгорыі
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Асноўныя наладкі (толькі самыя важныя)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Пашыраныя наладкі (практычна ўсе)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Спэцыяльныя наладкі (усе, уключаючы самыя незразумелыя)
@@ -1548,9 +1548,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Наладкі
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Няма -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Паказаць усе вынікі пошуку па наладках{}{SILVER}Катэґорыя {BLACK}да {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Паказаць усе вынікі пошуку па наладках{}{SILVER}Тып {BLACK}да {WHITE}Усе тыпы наладак
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Паказаць усе вынікі пошуку па наладках{}{SILVER}Катэґорыя {BLACK}да {WHITE}{STRING} {BLACK}і {SILVER}Тып {BLACK}да {WHITE}Усе тыпы наладак
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Паказаць усе вынікі пошуку па наладках{}{SILVER}Катэґорыя {BLACK}да {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Паказаць усе вынікі пошуку па наладках{}{SILVER}Тып {BLACK}да {WHITE}Усе тыпы наладак
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Паказаць усе вынікі пошуку па наладках{}{SILVER}Катэґорыя {BLACK}да {WHITE}{STRING} {BLACK}і {SILVER}Тып {BLACK}да {WHITE}Усе тыпы наладак
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :не
@@ -3320,6 +3320,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Выбе
 STR_FOUND_TOWN_CITY                                             :{BLACK}Мэґаполіс
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Мэґаполісы растуць хутчэй за звычайныя гарады (мястэчкі).{}У залежнасьці ад наладак, яны большыя ўжо падчас заснаваньня.
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Сетка гарадзкіх дарогаў:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Выберыце альґарытм будаўніцтва дарогаў гэтым горадам
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Арыґінальная
@@ -4998,7 +4999,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Раск
 STR_TIMETABLE_NO_TRAVEL                                         :Няма назначэньня
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Прабег (аўтаматычна; у расклад наступным заданьнем уручную)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Час у шляху (не зададзены)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Рухацца не хутчэй за {2:VELOCITY} (расклад ня вызначаны)
 STR_TIMETABLE_TRAVEL_FOR                                        :Час у шляху — {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Рухацца да {STRING} не хутчэй за {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :У дарозе прыкладна {STRING} (графік не складзены)

src/lang/brazilian_portuguese.txt

@@ -3074,6 +3074,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Escolher
 STR_FOUND_TOWN_CITY                                             :{BLACK}Cidade
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Cidades crescem mais depressa do que as localidades normais{}Dependendo das configurações, elas são maiores quando fundadas
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Expansão da cidade:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Construções
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Aumentar as construções das cidades
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Estradas
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Aumentar as estradas das localidades
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Disposição das estradas na localidade:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Selecionar disposição das estradas utilizada nesta localidade
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
@@ -3697,6 +3703,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Alterar
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Expandir
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Aumentar o tamanho da localidade
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Expandir com construções
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Aumentar as construções da localidade
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Expandir com estradas
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Aumentar as estradas da localidade
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Remover
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Remover completamente esta localidade
 
@@ -4762,7 +4772,7 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horário
 STR_TIMETABLE_NO_TRAVEL                                         :Não viajar
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Viajar (automático; programado pela próxima ordem manual)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Viajar (não programado)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Viajar (não programado) no máximo a {2:VELOCITY}
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Viajar (não programado) no máximo a {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Viajar durante {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Viajar durante {STRING} no máximo a {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Viajar (durante {STRING}, não programado)
@@ -5918,3 +5928,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Abrir configuração de crachá
+STR_BADGE_CONFIG_RESET                                          :Restaurar
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Ícones de Crachá
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Filtros de Crachá
+STR_BADGE_CONFIG_PREVIEW                                        :Pré-visualizar imagem
+STR_BADGE_CONFIG_NAME                                           :Nome
+STR_BADGE_FILTER_ANY_LABEL                                      :Qualquer {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} é {STRING}

src/lang/bulgarian.txt

@@ -951,13 +951,13 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Прем
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Игрови настройки
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Основни
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Изберете основни настройки
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Изберете основни настройки
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Графични
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Изберете графични настройки
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Изберете графични настройки
 STR_GAME_OPTIONS_TAB_SOUND                                      :Звукови
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Изберете звукови и музикални настройки
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Изберете звукови и музикални настройки
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Социални
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Изберете настройки за социална интеграция
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Изберете настройки за социална интеграция
 
 STR_GAME_OPTIONS_VOLUME                                         :Височина на звук
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Звукови ефекти
@@ -966,8 +966,8 @@ STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Музика
 
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Парична единица
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Избор на парична единица
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Парична единица
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Избор на парична единица
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1017,8 +1017,8 @@ STR_GAME_OPTIONS_CURRENCY_MYR                                   :Малайзи
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :Латвийски лат
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Португалско ескудо
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Автоматично записване
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Изберете интервала между две автоматични записваня
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Автоматично записване
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Изберете интервала между две автоматични записваня
 
 # Autosave dropdown
 ###length 5
@@ -1028,77 +1028,77 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Всеки 30
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Всеки 60 минути
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Всеки 120 минути
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Език
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Избор на език
+STR_GAME_OPTIONS_LANGUAGE                                       :Език
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Избор на език
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% завършени)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Цял екран
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Изберете тази настройка, за да играете OpenTTD на цял екран
+STR_GAME_OPTIONS_FULLSCREEN                                     :Цял екран
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Изберете тази настройка, за да играете OpenTTD на цял екран
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Размер на екрана
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Избор размера на екран
+STR_GAME_OPTIONS_RESOLUTION                                     :Размер на екрана
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Избор размера на екран
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :друго
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Хардуерно ускорение
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Отметнете тук, за да позволите на OpenTTD да опита да ползва хардуерно ускорение. Променена настройка ще бъде приложена само след рестартиране на играта
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Хардуерно ускорение
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Отметнете тук, за да позволите на OpenTTD да опита да ползва хардуерно ускорение. Променена настройка ще бъде приложена само след рестартиране на играта
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Настройката ще се промени след рестарт на играта
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Отметнете тук, за да използвате v-sync с екрана. Променена настройка ще бъде приложена само след рестартиране на играта. Работи единствено с хардуерно ускорение
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Отметнете тук, за да използвате v-sync с екрана. Променена настройка ще бъде приложена само след рестартиране на играта. Работи единствено с хардуерно ускорение
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Настоящ драйвер: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Настоящ драйвер: {STRING}
 
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Размер на интерфейса
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Плъзнете, за да зададете размер на интерфейса. Ctrl+плъзгане за непрекъснато регулиране
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Автоматично разпознаване на размера
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Отметнете тук, за да се разпознае автоматично размера на интерфейса
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Размер на интерфейса
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Плъзнете, за да зададете размер на интерфейса. Ctrl+плъзгане за непрекъснато регулиране
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Автоматично разпознаване на размера
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Отметнете тук, за да се разпознае автоматично размера на интерфейса
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Мащабни скосявания
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Отметнете тук, за да се скоси мащаба спрямо размера на интерфейса
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Мащабни скосявания
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Отметнете тук, за да се скоси мащаба спрямо размера на интерфейса
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Използвай традиционен sprite шрифт
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Отметнете тук, за да се използват традиционни sprite шрифтове с фиксиран размер
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Анти-Alias шрифтове
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Отметнете тук, за да се добави anti-alias към променливи шрифтове
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Използвай традиционен sprite шрифт
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Отметнете тук, за да се използват традиционни sprite шрифтове с фиксиран размер
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Анти-Alias шрифтове
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Отметнете тук, за да се добави anti-alias към променливи шрифтове
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Автоматизирано проучване
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Участвайте в автоматизирано проучване
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Когато е активирана, OpenTTD ще предаде анкета при напускане на играта
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Относно проучването и поверителност
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Това отваря браузър с повече информация за автоматизираната анкета
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Покажи резултати от проучването
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Покажи резултати от проучването от текущата игра
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Автоматизирано проучване
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Участвайте в автоматизирано проучване
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Когато е активирана, OpenTTD ще предаде анкета при напускане на играта
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Относно проучването и поверителност
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Това отваря браузър с повече информация за автоматизираната анкета
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Покажи резултати от проучването
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Покажи резултати от проучването от текущата игра
 
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Покажи честота на опресняване
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Избери честота на опресняване
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Покажи честота на опресняване
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Избери честота на опресняване
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Честота на опресняване над 60Hz може да повлияе на производителността
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Базов графичен набор
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Изберете основния графичен набор, който да използвате (не може да се променя в играта, само от главното меню)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Допълнителна информация за базовия графичен пакет
+STR_GAME_OPTIONS_BASE_GRF                                       :Базов графичен набор
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Изберете основния графичен набор, който да използвате (не може да се променя в играта, само от главното меню)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Допълнителна информация за базовия графичен пакет
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Базов звуков пакет
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Изберете базовите звуци, които да използвате (не могат да се променят в играта, само от главното меню)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Допълнителна информация за базовите звуци
+STR_GAME_OPTIONS_BASE_SFX                                       :Базов звуков пакет
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Изберете базовите звуци, които да използвате (не могат да се променят в играта, само от главното меню)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Допълнителна информация за базовите звуци
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Пакет базова музика
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Избери пакет базова музика
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Допълнителна информация за пакетa базова музика
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Пакет базова музика
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Избери пакет базова музика
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Допълнителна информация за пакетa базова музика
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Изтегляне на съдържание
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Проверка за ново и актуализирано съдържание за изтегляне
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(няма инсталирани плъгини за интеграция със социални платформи)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Платформа:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Състояние на плъгин:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Платформа:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Състояние на плъгин:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Активен
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Неуспешна инициализация
@@ -1212,10 +1212,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Разреша
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Няма подходящи ИИ...{}Може да свалите допълнителни ИИ чрез системата Online Content (Онлайн Съдържание)
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Филтър:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Разгъни всички
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Сгъни всички
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Върни всичко към начални стойности
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Филтър:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Разгъни всички
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Сгъни всички
+STR_CONFIG_SETTING_RESET_ALL                                    :Върни всичко към начални стойности
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(липсва пояснение)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Стойност по подразбиране: {ORANGE}{STRING}
@@ -1228,9 +1228,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Настрой
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Внимание!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Връщане на всички настройки на играта до техните стойности по подразбиране.{}Сигурни ли сте, че искате да продължите?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Категория:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Тип:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Ограничи долният списък, да показва само променените настройки
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Категория:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Тип:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Ограничи долният списък, да показва само променените настройки
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Прости настройки
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Разширени настройки
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Експертни настройки / всички настройки
@@ -1247,9 +1247,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Настрой
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Нищо -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Показване на всички резултати от търсенето чрез задаване{}{SILVER}Категория {BLACK}на {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Показване на всички резултати от търсенето, като зададете{}{SILVER}Тип {BLACK}на {WHITE}Всички типове настройки
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Покажете всички резултати от търсенето като зададете{}{SILVER}Категория {BLACK}на {WHITE}{STRING} {BLACK}и {SILVER}Тип {BLACK}на {WHITE}Всички видове настройки
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Показване на всички резултати от търсенето чрез задаване{}{SILVER}Категория {BLACK}на {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Показване на всички резултати от търсенето, като зададете{}{SILVER}Тип {BLACK}на {WHITE}Всички типове настройки
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Покажете всички резултати от търсенето като зададете{}{SILVER}Категория {BLACK}на {WHITE}{STRING} {BLACK}и {SILVER}Тип {BLACK}на {WHITE}Всички видове настройки
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Изключено
@@ -3044,6 +3044,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Избе
 STR_FOUND_TOWN_CITY                                             :{BLACK}Метрополис
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Метрополисите се разрастват по-бързо от градовете.{}В зависимост от настройките те са по-големи при тяхното създаване
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}План на пътищата:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Изберете план за пътищата в този град
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Оргинален
@@ -4721,7 +4722,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Разп
 STR_TIMETABLE_NO_TRAVEL                                         :Без преминаване
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Пътувай (автоматично; включено в разписанието чрез следващата ваша заповед)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Пътувай (без разписание)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Пътувай (без разписание) с не повече от {2:VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Пътувай за {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Пътувай за {STRING} с не повече от {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Пътувай (за {STRING}, без разписание)

src/lang/catalan.txt

@@ -959,23 +959,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Copia el
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Opcions de la partida
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :General
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Trieu la configuració general.
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Trieu la configuració general.
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Gràfics
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Trieu la configuració dels gràfics.
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Trieu la configuració dels gràfics.
 STR_GAME_OPTIONS_TAB_SOUND                                      :So
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Escolliu la configuració de so i de música.
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Escolliu la configuració de so i de música.
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Social
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Trieu les opcions d'integració social.
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Trieu les opcions d'integració social.
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Avançada
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Canvia la configuració avançada.
 
 STR_GAME_OPTIONS_VOLUME                                         :Volum
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Efectes de so
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Música
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}
 
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}{NBSP}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Moneda
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Selecció de la unitat monetària
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Moneda
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Selecció de la unitat monetària
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1026,8 +1029,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lats letó
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Escut portuguès
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Hryvnia ucraïnès
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Desa automàticament
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Selecciona l'interval de desada automàtica de la partida
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Desa automàticament
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Selecciona l'interval de desada automàtica de la partida
 
 # Autosave dropdown
 ###length 5
@@ -1037,77 +1040,79 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Cada 30 minuts
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Cada 60 minuts
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Cada 120 minuts
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Idioma
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Selecciona l'idioma de la interfície
+STR_GAME_OPTIONS_LANGUAGE                                       :Idioma
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Selecciona l'idioma de la interfície
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}{NBSP}% completat)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Pantalla completa
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Marqueu la casella per mostrar l'OpenTTD a pantalla completa.
+STR_GAME_OPTIONS_FULLSCREEN                                     :Pantalla completa
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Marqueu la casella per mostrar l'OpenTTD a pantalla completa.
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Resolució de pantalla
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Selecciona la resolució de pantalla
+STR_GAME_OPTIONS_RESOLUTION                                     :Resolució de pantalla
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Selecciona la resolució de pantalla
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :altres
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Acceleració per maquinari
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Seleccioneu aquesta opció per permetre que l'OpenTTD provi d'usar acceleració per maquinari. Si es canvia l'opció, s'aplicarà quan es reiniciï el programa.
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Acceleració per maquinari
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Seleccioneu aquesta opció per permetre que l'OpenTTD provi d'usar acceleració per maquinari. Si es canvia l'opció, s'aplicarà quan es reiniciï el programa.
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}La configuració tindrà efecte quan es reiniciï el programa.
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Selecciona aquesta casella per activar la sincronització vertical de la pantalla. Els canvis s'aplicaran quan es reiniciï el programa. Només funciona si s'activa l'acceleració per maquinari.
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Selecciona aquesta casella per activar la sincronització vertical de la pantalla. Els canvis s'aplicaran quan es reiniciï el programa. Només funciona si s'activa l'acceleració per maquinari.
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Controlador actual: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Controlador actual: {STRING}
 
+STR_GAME_OPTIONS_INTERFACE                                      :Interfície
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Mida de la interfície
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Arrossegueu el botó lliscant per a triar la mida de la interfície. Amb Ctrl+arrossega, s'aplica un ajust continu.
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Detecta la mida automàticament
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Marqueu aquesta opció si voleu que s'ajusti la mida de la interfície automàticament.
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Mida de la interfície
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Arrossegueu el botó lliscant per a triar la mida de la interfície. Amb Ctrl+arrossega, s'aplica un ajust continu.
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Detecta la mida automàticament
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Marqueu aquesta opció si voleu que s'ajusti la mida de la interfície automàticament.
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Escala els bisells
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Marqueu aquesta opció si voleu que s'escalin els bisells segons la mida de la interfície.
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Escala els bisells
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Marqueu aquesta opció si voleu que s'escalin els bisells segons la mida de la interfície.
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Fes servir la font tradicional
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Marqueu aquesta casella si preferiu fer servir la font tradicional de mida fixa i pixelada.
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Aplica anti-àlies a les fonts
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Marqueu aquesta casella per a fer servir tècniques d'anti-àlies a les fonts redimensionables.
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Fes servir la font tradicional
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Marqueu aquesta casella si preferiu fer servir la font tradicional de mida fixa i pixelada.
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Aplica anti-àlies a les fonts
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Marqueu aquesta casella per a fer servir tècniques d'anti-àlies a les fonts redimensionables.
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Sondeig automatitzat
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Participa al sondeig automatitzat
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Quan s'activa, l'OpenTTD transmetrà dades sobre l'ús del joc del sondeig quan se surti d'una partida.
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Sobre el sondeig i la privacitat
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Obre una pàgina amb més informació sobre el sondeig automatitzat.
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Vista prèvia del resultat del sondeig
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Mostra el resultat del sondeig automatitzat de la partida actual.
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Sondeig automatitzat
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Participa al sondeig automatitzat
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Quan s'activa, l'OpenTTD transmetrà dades sobre l'ús del joc del sondeig quan se surti d'una partida.
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Sobre el sondeig i la privacitat
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Obre una pàgina amb més informació sobre el sondeig automatitzat.
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Vista prèvia del resultat del sondeig
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Mostra el resultat del sondeig automatitzat de la partida actual.
 
+STR_GAME_OPTIONS_DISPLAY                                        :Pantalla
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Rati de refresc de la pantalla
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Seleccioneu el rati de refresc de la pantalla que voleu usar.
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Rati de refresc de la pantalla
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Seleccioneu el rati de refresc de la pantalla que voleu usar.
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}{NBSP}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Ratis de refresc major a 60{NBSP}Hz poden causar problemes de rendiment.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Conjunt de gràfics base
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selecciona el conjunt de gràfics base a utilitzar (no es pot canviar des de dins de la partida; s'ha de canviar des del menú principal).
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Informació addicional sobre el conjunt de gràfics base
+STR_GAME_OPTIONS_BASE_GRF                                       :Conjunt de gràfics base
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Selecciona el conjunt de gràfics base a utilitzar (no es pot canviar des de dins de la partida; s'ha de canviar des del menú principal).
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Informació addicional sobre el conjunt de gràfics base
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Conjunt de sons base
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Selecciona un conjunt de sons base a utilitzar (no es pot canviar des de dins de la partida; s'ha de canviar des del menú principal).
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Informació addicional sobre el joc de sons base
+STR_GAME_OPTIONS_BASE_SFX                                       :Conjunt de sons base
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Selecciona un conjunt de sons base a utilitzar (no es pot canviar des de dins de la partida; s'ha de canviar des del menú principal).
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Informació addicional sobre el joc de sons base
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Conjunt de peces de música base
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Selecciona el conjunt de peces de música base a utilitzar
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Informació addicional sobre el conjunt de peces de música base
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Conjunt de peces de música base
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Selecciona el conjunt de peces de música base a utilitzar
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Informació addicional sobre el conjunt de peces de música base
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Descarrega contingut
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Comprova si hi ha continguts nous o actualitzats per a descarregar.
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(no s'han instal·lat complements per a interactuar amb plataformes socials)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Plataforma:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Estat del complement:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Plataforma:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Estat del complement:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}En funcionament
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}No s'ha pogut inicialitzar.
@@ -1222,9 +1227,9 @@ STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}No hi ha
 
 # Settings tree in the Game Options window
 STR_CONFIG_SETTING_FILTER_TITLE                                 :{G=Masculin}{BLACK}Filtre:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Desplega-ho tot
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Plega-ho tot
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Restableix tots els valors
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Desplega-ho tot
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Plega-ho tot
+STR_CONFIG_SETTING_RESET_ALL                                    :Restableix tots els valors
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(cap explicació disponible)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Valor per defecte: {ORANGE}{STRING}
@@ -1237,9 +1242,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Paràmetre de l
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Avís!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Aquesta acció restablirà la configuració de la partida als seus valors per defecte.{}Esteu segur que voleu fer-ho?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Categoria:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Tipus:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Restringeix la llista de sota usant els filtres predefinits
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Categoria:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Tipus:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Restringeix la llista de sota usant els filtres predefinits
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Paràmetres bàsics (mostra només els paràmetres importants)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Paràmetres avançats (mostra la majoria dels paràmetres)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Paràmetres per experts (mostra tots els paràmetres, fins i tot els rars)
@@ -1256,9 +1261,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Paràmetres de
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Cap -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Mostra tots els resultats establint {SILVER}«Categoria» {BLACK}a {WHITE}«{STRING}»{BLACK}.
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Mostrar tots els resultats de la cerca filtrada amb {WHITE}tots els tipus de paràmetres
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Mostra tots els resultats de la cerca establint {SILVER}«Categoria» {BLACK}a {WHITE}«{STRING}» {BLACK}i {SILVER}«Tipus» {BLACK}a {WHITE}«Tots els paràmetres»{BLACK}.
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Mostra tots els resultats establint {SILVER}«Categoria» {BLACK}a {WHITE}«{STRING}»{BLACK}.
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Mostrar tots els resultats de la cerca filtrada amb {WHITE}tots els tipus de paràmetres
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Mostra tots els resultats de la cerca establint {SILVER}«Categoria» {BLACK}a {WHITE}«{STRING}» {BLACK}i {SILVER}«Tipus» {BLACK}a {WHITE}«Tots els paràmetres»{BLACK}.
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Inactiu
@@ -2191,6 +2196,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... no s
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... el controlador de la GPU ha fallat durant la partida. Es desactiva l'acceleració per maquinari.
 
 # Intro window
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Partida nova
 STR_INTRO_LOAD_GAME                                             :{BLACK}Carrega una partida
@@ -3067,6 +3074,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Seleccio
 STR_FOUND_TOWN_CITY                                             :{BLACK}Ciutat
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Les ciutats creixen més ràpid que els pobles{}Depenent de la configuració, són més grans quan es funden
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Disposició de les carreteres de la població:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Selecciona la disposició de les carreteres utilitzades per a aquesta població
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Distribució original
@@ -4755,7 +4763,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horari -
 STR_TIMETABLE_NO_TRAVEL                                         :Sense viatge
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Viatge (automàtic; programat per la següent ordre manual)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Viatge (fora d'horari)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Viatja (sense horari) com a molt a {2:VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Viatge a {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Viatja durant {STRING} com a molt a {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Viatja (durant {STRING}, sense horari)
@@ -5871,6 +5878,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}G
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}T
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}

src/lang/chuvash.txt

@@ -465,17 +465,17 @@ STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Пӗлт
 ###length 45
 STR_GAME_OPTIONS_CURRENCY_RUR                                   :Вырӑсла тенкӗ
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Хӑй управ
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Хӑй управ
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Сӳнтер
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Чӗлхи
+STR_GAME_OPTIONS_LANGUAGE                                       :Чӗлхи
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Тулли экран
+STR_GAME_OPTIONS_FULLSCREEN                                     :Тулли экран
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Экрана сӑнарлама пултарни
+STR_GAME_OPTIONS_RESOLUTION                                     :Экрана сӑнарлама пултарни
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :расна
 
 
@@ -1141,6 +1141,7 @@ STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Ӑнсӑ
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Хула пысӑкӑшӗ суйла
 STR_FOUND_TOWN_CITY                                             :{BLACK}Тӑп хула
 
+
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Чӑн
 STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 серепе
 STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 серепе

src/lang/croatian.txt

@@ -964,8 +964,8 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Postavke
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Novčane jedinice
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Izbor novčanih jedinica
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Novčane jedinice
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Izbor novčanih jedinica
 
 
 ###length 45
@@ -1010,26 +1010,26 @@ STR_GAME_OPTIONS_CURRENCY_CNY                                   :Kineski Renminb
 STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hongkonški Dolar
 STR_GAME_OPTIONS_CURRENCY_INR                                   :Indijska Rupija
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Automatsko spremanje
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Odaberi interval između automatskih spremanja igre
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Automatsko spremanje
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Odaberi interval između automatskih spremanja igre
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Isključeno
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Jezik
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Odaberi jezik sučelja
+STR_GAME_OPTIONS_LANGUAGE                                       :Jezik
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Odaberi jezik sučelja
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Cijeli zaslon
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Označi ovu kućicu kako bi igrao OpenTTD preko cijelog zaslona
+STR_GAME_OPTIONS_FULLSCREEN                                     :Cijeli zaslon
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Označi ovu kućicu kako bi igrao OpenTTD preko cijelog zaslona
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Razlučivost zaslona
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Odaberi razlučivost zaslona
+STR_GAME_OPTIONS_RESOLUTION                                     :Razlučivost zaslona
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Odaberi razlučivost zaslona
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :ostalo
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
 
 
 
@@ -1040,17 +1040,17 @@ STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
 
 
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Osnovni set grafike
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Odaberi osnovni grafički set za igru
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Dodatne informacije o osnovnom grafičkom setu
+STR_GAME_OPTIONS_BASE_GRF                                       :Osnovni set grafike
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Odaberi osnovni grafički set za igru
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Dodatne informacije o osnovnom grafičkom setu
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Set osnovnih zvukova
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Odaberite osnovni set zvukova
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Dodatne informacije o setu osnovnih zvukova
+STR_GAME_OPTIONS_BASE_SFX                                       :Set osnovnih zvukova
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Odaberite osnovni set zvukova
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Dodatne informacije o setu osnovnih zvukova
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Set osnovne glazbe
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Odaberi set osnovne glazbe za uporabu
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Dodatne informacije o setu osnovne glazbe
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Set osnovne glazbe
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Odaberi set osnovne glazbe za uporabu
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Dodatne informacije o setu osnovne glazbe
 
 
 
@@ -1154,10 +1154,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Dopustiv
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Odgovarajuća UI nije dostupna...{}Možete preuzeti nekoliko UI pomoću sustava 'Online sadržaja'
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtriraj slijed:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Otvori sve
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Zatvori sve
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Ponovno postavi sve vrijednosti
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtriraj slijed:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Otvori sve
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Zatvori sve
+STR_CONFIG_SETTING_RESET_ALL                                    :Ponovno postavi sve vrijednosti
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(nema dostupnog pojašnjenja)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Osnovna vrijednost: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Vrsta postavki: {ORANGE}{STRING}
@@ -1167,9 +1167,9 @@ STR_CONFIG_SETTING_TYPE_GAME_INGAME                             :Postavke igre (
 STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :Postavke tvrtke (pohranjene u snimljenoj datoteci; utječu samo na nove igre)
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Postavke tvrtke (pohranjene u snimljenoj datoteci; utječu samo na trenutnu tvrtku)
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategorija:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Tip:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Sužava doljnju listu koristeći samo predpostavljene filtere
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategorija:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Tip:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Sužava doljnju listu koristeći samo predpostavljene filtere
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Osnovno (prikaži samo važne postavke)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Napredno (prikaži većinu postavki)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Stručno (prikaži sve postavke, uključujući i one neobične)
@@ -1186,9 +1186,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Postavke tvrtke
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Nijedna -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Prikaži sve rezultate pretraga po postavkama{}{SILVER}Kategorija {BLACK}do {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Prikaži sve rezultate pretraga po postavkama{}{SILVER}Tip {BLACK}do {WHITE}Svi tipovi postavki
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Prikaži sve rezultate pretrage po postavkama{}{SILVER}Kategorija {BLACK}do {WHITE}{STRING} {BLACK}i {SILVER}Tip {BLACK}do {WHITE}Svi tipovi postavki
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Prikaži sve rezultate pretraga po postavkama{}{SILVER}Kategorija {BLACK}do {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Prikaži sve rezultate pretraga po postavkama{}{SILVER}Tip {BLACK}do {WHITE}Svi tipovi postavki
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Prikaži sve rezultate pretrage po postavkama{}{SILVER}Kategorija {BLACK}do {WHITE}{STRING} {BLACK}i {SILVER}Tip {BLACK}do {WHITE}Svi tipovi postavki
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Isključeno
@@ -2728,6 +2728,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Odaberi
 STR_FOUND_TOWN_CITY                                             :{BLACK}Grad
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Velegradovi rastu brže od običnih gradova{}Ovisno o postavkama, veći su prilikom osnivanja
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Raspored gradskih cesta
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Odaberi raspored cesta za ovaj grad
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
@@ -4239,7 +4240,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Vozni re
 STR_TIMETABLE_NO_TRAVEL                                         :Nema putovanja
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Putovanje (automatsko; prema rasporedu sljedeće ručno određene naredbe)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Putovanje (izvan voznog reda)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Putovanje (nije mjereno) uz najviše {2:VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Putovanje za {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Putuj prema {STRING} uz najviše {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Putovanje (za {STRING}, nije mjereno)

src/lang/czech.txt

@@ -1045,13 +1045,13 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Nastavit
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Možnosti hry
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Obecné
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Zobrazit obecná nastavení
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Zobrazit obecná nastavení
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafika
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Zobrazit nastavení grafiky
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Zobrazit nastavení grafiky
 STR_GAME_OPTIONS_TAB_SOUND                                      :Zvuk
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Zobrazit nastavení zvuku a hudby
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Zobrazit nastavení zvuku a hudby
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Sociální
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Zobrazit nastavení pro sociální interakci
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Zobrazit nastavení pro sociální interakci
 
 STR_GAME_OPTIONS_VOLUME                                         :Hlasitost
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Zvukové efekty
@@ -1060,8 +1060,8 @@ STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Hudba
 
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Měna
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Výběr jednotek měny
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Měna
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Výběr jednotek měny
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1112,8 +1112,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lotyšský lat
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portugalské escudo
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Ukrajinská hřivna
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Automatické ukládání
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Volba intervalu mezi automatickým ukládáním hry
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Automatické ukládání
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Volba intervalu mezi automatickým ukládáním hry
 
 # Autosave dropdown
 ###length 5
@@ -1123,77 +1123,77 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Každých 30 mi
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Každých 60 minut
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Každých 120 minut
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Jazyk
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Zvolit jazyk uživatelského rozhraní
+STR_GAME_OPTIONS_LANGUAGE                                       :Jazyk
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Zvolit jazyk uživatelského rozhraní
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% dokončeno)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Na celou obrazovku
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Zaškrtnutím této volby poběží OpenTTD na celé obrazovce
+STR_GAME_OPTIONS_FULLSCREEN                                     :Na celou obrazovku
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Zaškrtnutím této volby poběží OpenTTD na celé obrazovce
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Rozlišení obrazovky
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Zvolit rozlišení obrazovky
+STR_GAME_OPTIONS_RESOLUTION                                     :Rozlišení obrazovky
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Zvolit rozlišení obrazovky
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :jiné
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Hardwarová akcelerace
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Zaškrtni, pokud chceš OpenTTD povolit použití hardwarové akcelerace. Změněné nastavení bude aplikováno po restartu hry
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Hardwarová akcelerace
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Zaškrtni, pokud chceš OpenTTD povolit použití hardwarové akcelerace. Změněné nastavení bude aplikováno po restartu hry
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Nastavení vstoupí v platnost pouze po restartu hry
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Zaškrtní tento box pro v-sync obrazovky. Změna se projeví po znovu spuštění hry. Funguje to pouze pro povolenou hardwarovou akceleraci.
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Zaškrtní tento box pro v-sync obrazovky. Změna se projeví po znovu spuštění hry. Funguje to pouze pro povolenou hardwarovou akceleraci.
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Aktuální ovladač: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Aktuální ovladač: {STRING}
 
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Velikost uživatelského rozhraní
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Přetažením posuvníku změníš velikost rozhraní. Drž Ctrl pro plynulé přizpůsobení
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Automaticky detekovat velikost
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Zaškrtni pro automatické nastavení velikosti uživatelského rozhraní
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Velikost uživatelského rozhraní
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Přetažením posuvníku změníš velikost rozhraní. Drž Ctrl pro plynulé přizpůsobení
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Automaticky detekovat velikost
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Zaškrtni pro automatické nastavení velikosti uživatelského rozhraní
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Škálovat úkosy
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Zaškrtni toto políčko pro škálování úkosů dle velikosti uživatelského rozhraní
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Škálovat úkosy
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Zaškrtni toto políčko pro škálování úkosů dle velikosti uživatelského rozhraní
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Používat tradiční písma ze sprite
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Zaškrtni toto políčko, pokud dáváš přednost tradičním písmům pevné velikosti ze sprite
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Anti-aliasovat písma
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Zaškrtni toto políčko pro zapnutí anti-aliasování škálovatelných písem
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Používat tradiční písma ze sprite
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Zaškrtni toto políčko, pokud dáváš přednost tradičním písmům pevné velikosti ze sprite
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Anti-aliasovat písma
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Zaškrtni toto políčko pro zapnutí anti-aliasování škálovatelných písem
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Automatický průzkum
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Účastnit se automatického průzkumu
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Pokud je zapnuto, OpenTTD odešle průzkum při opuštění hry
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}O anketě a ochraně soukromí
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Otevře prohlížeč s více informacemi o automatickém průzkumu
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Náhled výsledků průzkumu
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Zobrazovat výsledek průzkumu z aktuálně běžící hry
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Automatický průzkum
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Účastnit se automatického průzkumu
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Pokud je zapnuto, OpenTTD odešle průzkum při opuštění hry
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :O anketě a ochraně soukromí
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Otevře prohlížeč s více informacemi o automatickém průzkumu
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Náhled výsledků průzkumu
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Zobrazovat výsledek průzkumu z aktuálně běžící hry
 
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Obnovovací frekvence obrazovky
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Zvolit obnovovací frekvenci obrazovky
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Obnovovací frekvence obrazovky
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Zvolit obnovovací frekvenci obrazovky
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Obnovovací frekvence vyšší než 60Hz může mít dopad výkon.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Základní sada grafiky
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Vyber si základní sadu grafiky (nemůže být změněna během hry, ale pouze z hlavního menu)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Další informace o základní sadě grafiky
+STR_GAME_OPTIONS_BASE_GRF                                       :Základní sada grafiky
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Vyber si základní sadu grafiky (nemůže být změněna během hry, ale pouze z hlavního menu)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Další informace o základní sadě grafiky
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Základní sada zvuků
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Vyber si základní sadu zvuků (nemůže být změněna během hry, ale pouze z hlavního menu)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Další informace o základní sadě zvuků
+STR_GAME_OPTIONS_BASE_SFX                                       :Základní sada zvuků
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Vyber si základní sadu zvuků (nemůže být změněna během hry, ale pouze z hlavního menu)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Další informace o základní sadě zvuků
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Základní hudební set
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Vyberte jaký základní hudební set použít
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Další informace o základním hudebním setu
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Základní hudební set
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Vyberte jaký základní hudební set použít
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Další informace o základním hudebním setu
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Získat obsah
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Zkontrolovat nový a aktualizovaný obsah ke stažení
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(nejsou nainstalovány žádné zásuvné moduly pro integraci sociálních platforem)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Platforma:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Stav zásuvného modulu:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Platforma:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Stav zásuvného modulu:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Spuštěn
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Inicializace selhala
@@ -1306,10 +1306,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Nezaujatý (bez
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Žádná vhodná AI není k dispozici...{}Některé AI lze stáhnout pomocí služby "Stahovat součásti"
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtrovat:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Rozbalit vše
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Sbalit vše
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Vymazat všechny hodnoty
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtrovat:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Rozbalit vše
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Sbalit vše
+STR_CONFIG_SETTING_RESET_ALL                                    :Vymazat všechny hodnoty
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(žádné vysvětlení není k dispozici)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Výchozí hodnota: {ORANGE}{STRING}
@@ -1322,9 +1322,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Nastavení spol
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Pozor!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Tato akce resetuje všechna nastavení hry na výchozí hodnoty.{}Jste si jistý, že chcete pokračovat?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategorie:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Druh:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Omezit nastavení v seznamu níže pomocí předdefinovaných filtrů
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategorie:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Druh:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Omezit nastavení v seznamu níže pomocí předdefinovaných filtrů
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Základní (zobrazí pouze důležitá nastavení)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Pokročilé (zobrazí většinu nastavení)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Expertní (zobrazí všechna nastavení, včetně těch podivných)
@@ -1341,9 +1341,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Nastavení spol
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Nic -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Všechny výsledky vyhledávání zobrazíš nastavením{}{SILVER}kategorie {BLACK}na {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Všechny výsledky vyhledávání zobrazíš nastavením{}{SILVER}typu {BLACK}na {WHITE}Všechny typy nastavení
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Všechny výsledky vyhledávání zobrazíš nastavením{}{SILVER}kategorie {BLACK}na {WHITE}{STRING} {BLACK}a {SILVER}typu {BLACK}na {WHITE}Všechny typy nastavení
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Všechny výsledky vyhledávání zobrazíš nastavením{}{SILVER}kategorie {BLACK}na {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Všechny výsledky vyhledávání zobrazíš nastavením{}{SILVER}typu {BLACK}na {WHITE}Všechny typy nastavení
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Všechny výsledky vyhledávání zobrazíš nastavením{}{SILVER}kategorie {BLACK}na {WHITE}{STRING} {BLACK}a {SILVER}typu {BLACK}na {WHITE}Všechny typy nastavení
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Vypnuto
@@ -3142,6 +3142,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Zvolte v
 STR_FOUND_TOWN_CITY                                             :{BLACK}Velkoměsto
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Velkoměsta rostou rychleji než běžná města. V závislosti na nastavení jsou při založení větší
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Silniční síť města:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Zvolte rozvržení silniční sítě v tomto městě
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Původní
@@ -4832,7 +4833,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Jízdní
 STR_TIMETABLE_NO_TRAVEL                                         :Nikam nejet
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Jet do (automatický; jizdní řád podle následujícího ručního příkazu)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Jet do (mimo jízdní řád)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Jet (mimo jízdní řád) maximální rychlostí {2:VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Jet do {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Jeď {STRING} a maximálně {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Jeď ({STRING}, mimo jízdní řád)

src/lang/danish.txt

@@ -285,7 +285,7 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Luk vind
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Vinduestitel - træk her for at flytte vinduet
 STR_TOOLTIP_SHADE                                               :{BLACK}Oprul vindue - vis kun titellinien
 STR_TOOLTIP_DEBUG                                               :{BLACK}Vis information om NewGRF fejl
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}Gendan vinduets standardstørrelse. Ctrl+Klik for at gemme nuværende størrelse som standard
+STR_TOOLTIP_DEFSIZE                                             :{BLACK}Ændre vinduesstørrelsen til standardstørrelsen. Ctrl+klik for at gemme den aktuelle størrelse som standard. Dobbelt Ctrl+klik for at nulstille den gemte standardstørrelse.
 STR_TOOLTIP_STICKY                                              :{BLACK}Marker dette vindue som ulukkeligt af 'Luk ALLE vinduer' tasten. Ctrl+Klik for også at gemme tilstand som standart
 STR_TOOLTIP_RESIZE                                              :{BLACK}Klik og træk for at ændre vinduets størrelse
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Skift mellem stort/lille vindue
@@ -451,7 +451,12 @@ STR_SETTINGS_MENU_SANDBOX_OPTIONS                               :Sandkasse mulig
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Gennemsigtighedsvalg
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Bynavne vist
 STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED                       :Stationsnavne vist
+STR_SETTINGS_MENU_STATION_NAMES_TRAIN                           :Togstationer
+STR_SETTINGS_MENU_STATION_NAMES_LORRY                           :Lastbilen stopper
 STR_SETTINGS_MENU_STATION_NAMES_BUS                             :Busstoppesteder
+STR_SETTINGS_MENU_STATION_NAMES_SHIP                            :Havne
+STR_SETTINGS_MENU_STATION_NAMES_PLANE                           :Lufthavne
+STR_SETTINGS_MENU_STATION_NAMES_GHOST                           :Spøgelse
 STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED                           :Rutepunkt-navne vist
 STR_SETTINGS_MENU_SIGNS_DISPLAYED                               :Viste skilte
 STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Modstander skilte og navne vist
@@ -932,7 +937,7 @@ STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIG_FONT}{BLAC
 STR_NEWS_SERVICE_SUBSIDY_OFFERED                                :{BIG_FONT}{BLACK}Tilskudsordning i udbud:{}{}Første {STRING} fra {STRING} til {STRING} vil udløse et {UNITS_YEARS_OR_MINUTES}s tilskud fra den lokale myndighed!
 ###length 4
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF                           :{BIG_FONT}{BLACK}Servicetilskud tildelt til {STRING}!{}{}{STRING} fra {STRING} til {STRING} vil betale 50% ekstra for de næste {UNITS_YEARS_OR_MINUTES}!
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIG_FONT}{BLACK}Tilskudsordning tildelt {STRING}!{}{}{STRING} fra {STRING} til {STRING} vil betale dobbelt takster for den næste {UNITS_YEARS_OR_MINUTES}!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIG_FONT}{BLACK}Servicetilskud tildelt {STRING}!{}{}{STRING} fra {STRING} til {STRING} vil betale dobbelt takster for den næste {UNITS_YEARS_OR_MINUTES}!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIG_FONT}{BLACK}Tilskudsordning tildelt {STRING}!{}{}{STRING} fra {STRING} til {STRING} betaler tredobbelte takster for de næste {UNITS_YEARS_OR_MINUTES}!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIG_FONT}{BLACK}Tilskudsordning tildelt {STRING}!{}{}{STRING} fra {STRING} til {STRING} betaler firedobbelt takster for de næste {UNITS_YEARS_OR_MINUTES}!
 
@@ -953,23 +958,26 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Bevæg h
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Opsætning
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Generel
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Vælg generelle indstillinger
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Vælg generelle indstillinger
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafik
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Vælg grafikindstillinger
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Vælg grafikindstillinger
 STR_GAME_OPTIONS_TAB_SOUND                                      :Lyd
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Vælg lyd og musik indstillinger
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Vælg lyd og musik indstillinger
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Social
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Vælg sociale integrationsindstillinger
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Vælg indstillinger for social integration
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Avanceret
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Skift avancerede indstillinger
 
 STR_GAME_OPTIONS_VOLUME                                         :Lydstyrke
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Lydeffekter
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :musik
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}
 
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valutaenhed
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Valg af valutaenhed
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Valutaenheder
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Valg af valutaenheder
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1018,9 +1026,10 @@ STR_GAME_OPTIONS_CURRENCY_IDR                                   :Indonesisk Rupi
 STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malaysisk Ringgit
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :lettiske lats
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portugisiske Escudo
+STR_GAME_OPTIONS_CURRENCY_UAH                                   :Ukrainsk hryvnia
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Automatisk gemning
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Vælg interval imellem automatisk gemning
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Automatisk gem spil
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Vælg interval imellem automatisk gem spil
 
 # Autosave dropdown
 ###length 5
@@ -1030,77 +1039,79 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Hvert 30. minut
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Hvert 60. minut
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Hvert 120. minut
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Sprog
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Vælg sprog til brugerfladen
+STR_GAME_OPTIONS_LANGUAGE                                       :Sprog
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Vælg sprog til brugerfladen
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% færdig)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Fuld skærm
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Afkryds for at spille OpenTTD i fuld skærm
+STR_GAME_OPTIONS_FULLSCREEN                                     :Fuld skærm
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Afkryds for at spille OpenTTD i fuld skærm
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Skærmopløsning
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Vælg ønsket skærmopløsning
+STR_GAME_OPTIONS_RESOLUTION                                     :Skærmopløsning
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Vælg ønsket skærmopløsning
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :andet
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Hardware-acceleration
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Marker dette felt for at tillade at OpenTTD forsøger at bruge hardwareacceleration. Ændringer af indstillingen er først effektiv efter spillet er genstartet.
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Hardware-acceleration
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Marker dette felt for at tillade at OpenTTD forsøger at bruge hardwareacceleration. Ændringer af indstillingen er først effektiv efter spillet er genstartet.
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Indstillingen er først effektiv efter spillet er genstartet.
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Afmærk dette felt for at v-synkronisere skærmen. Ændringer af indstillingen er først effektiv efter spillet er genstartet. Fungerer kun med hardware-acceleration aktiveret.
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Afmærk dette felt for at v-synkronisere skærmen. Ændringer af indstillingen er først effektiv efter spillet er genstartet. Fungerer kun med hardware-acceleration aktiveret.
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Nuværende fører: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Nuværende fører: {STRING}
 
+STR_GAME_OPTIONS_INTERFACE                                      :Grænseflade
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Interface størrelse
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Træk skyderen for at indstille grænsefladestørrelsen. Hold Ctrl nede for kontinuerlig justering
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Automatisk registrering af størrelse
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Marker dette felt for automatisk at registrere grænsefladestørrelse
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Interface størrelse
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Træk skyderen for at indstille grænsefladestørrelsen. Hold Ctrl nede for kontinuerlig justering
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Automatisk registrering af størrelse
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Marker dette felt for automatisk at registrere grænsefladestørrelse
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Skalere facetter
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Marker dette afkrydsningsfelt for at skalere facetter efter grænsefladestørrelse
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Skalere facetter
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Marker dette afkrydsningsfelt for at skalere facetter efter grænsefladestørrelse
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Brug traditionel sprite-skrifttype
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Marker dette felt, hvis du foretrækker at bruge den traditionelle sprite-skrifttype med fast størrelse
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Anti-alias skrifttyper
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Marker dette felt for at skrifttyper, der kan ændres størrelse, kan udlignes
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Brug traditionel sprite-skrifttype
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Marker dette felt, hvis du foretrækker at bruge den traditionelle sprite-skrifttype med fast størrelse
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Anti-alias skrifttyper
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Marker dette felt for at skrifttyper, der kan ændres størrelse, kan udlignes
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Automatiseret undersøgelse
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Deltag i automatiseret undersøgelse
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Når det er aktiveret, sender OpenTTD en undersøgelse, når du forlader et spil
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Automatiseret undersøgelse
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Deltag i automatiseret undersøgelse
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Når det er aktiveret, sender OpenTTD en undersøgelse, når du forlader et spil
 STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Om GPDR og privatliv
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Dette åbner en browser med mere information om den automatiserede undersøgelse
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Forhåndsvisning af undersøgelsesresultat
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Vis undersøgelsesresultatet af det aktuelle spil
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Dette åbner en browser med mere information om den automatiserede undersøgelse
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Forhåndsvisning af undersøgelsesresultat
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Vis undersøgelsesresultatet af det aktuelle spil
 
+STR_GAME_OPTIONS_DISPLAY                                        :Vis
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Skærm opdateringshastighed
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Vælg den opdateringshastighed der skal bruges på skærmen
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Skærm opdateringshastighed
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Vælg den opdateringshastighed der skal bruges på skærmen
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Opdateringshastigheder over 60Hz kan påvirke ydeevnen.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Basis-grafiksæt
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Vælg det grundlæggende grafiksæt, der skal bruges
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Yderligere information om basis-grafiksættet
+STR_GAME_OPTIONS_BASE_GRF                                       :Basis-grafiksæt
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Vælg det grundlæggende grafiksæt, der skal bruges (kan ikke ændres i spillet, kun fra hovedmenuen)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Yderligere information om basis-grafiksættet
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Basis-lydsæt
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Vælg det grundlæggende lyd sæt, der skal bruges
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Mere information om basis-lydsættet
+STR_GAME_OPTIONS_BASE_SFX                                       :Basis lydsæt
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Vælg det grundlæggende lyd sæt, der skal bruges (kan ikke ændres i spillet, kun fra hovedmenuen)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Mere information om basis lydsættet
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Basis-musiksæt
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Vælg basismusik-sæt
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Yderligere information om basismusik-sættet
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Basis musiksæt
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Vælg basismusik sæt
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Yderligere information om basismusik-sættet
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Hent indhold
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Søg efter nyt og opdateret indhold, der skal downloades
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(ingen plugins til at integrere med sociale platforme installeret)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Platform:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Plugin-tilstand:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Platform:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Plugin-tilstand:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Køre
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Initialisering mislykkedes
@@ -1214,10 +1225,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Passiv (ingen i
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Der blev ikke fundet en egnet computer-spiller...{}Du kan downloade flere forskellige computer-spillere gennem 'Online Indhold'.
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filterstreng:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Udvid alle
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Skjul alle
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Nulstil alle værdier
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filterstreng:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Udvid alle
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Skjul alle
+STR_CONFIG_SETTING_RESET_ALL                                    :Nulstil alle værdier
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(ingen forklaring tilgængelig)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Standard: {ORANGE}{STRING}
@@ -1230,9 +1241,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Firma indstilli
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Advarsel!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Denne handling vil nulstille alle spilindstillinger til deres standardværdier.{}Ønsker du at fortsætte?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategori:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Type:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Begrænser listen nedenfor så den kun viser ændrede indstillinger
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategori:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Type:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Begrænser listen nedenfor så den kun viser ændrede indstillinger
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Grund Indstillinger
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Avancerede indstillinger
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Ekspertindstillinger / alle indstillinger
@@ -1249,9 +1260,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Firma indstilli
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Ingen -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Vis alle søgeresultater ved at sætte{}{SILVER}Kategori {BLACK}to {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Vis alle søgeresultater ved at sætte{}{SILVER}Indtast {BLACK}til {WHITE}Alle Indstillingstyper
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Vis alle søgeresultater ved at sætte{} {SILVER}Kategori {BLACK}til {WHITE} {STRING} {BLACK}og {SILVER} Indtast {BLACK}til {WHITE}Alle Indstillingstyper
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Vis alle søgeresultater ved at sætte{}{SILVER}Kategori {BLACK}to {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Vis alle søgeresultater ved at sætte{}{SILVER}Indtast {BLACK}til {WHITE}Alle Indstillingstyper
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Vis alle søgeresultater ved at sætte{} {SILVER}Kategori {BLACK}til {WHITE} {STRING} {BLACK}og {SILVER} Indtast {BLACK}til {WHITE}Alle Indstillingstyper
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Fra
@@ -1924,6 +1935,7 @@ STR_CONFIG_SETTING_ENDING_YEAR_ZERO                             :Aldrig
 STR_CONFIG_SETTING_ECONOMY_TYPE                                 :Økonomitype: {STRING}
 ###length 2
 STR_CONFIG_SETTING_ECONOMY_TYPE_HELPTEXT                        :Udjævnet økonomi ændrer produktionsniveauet oftere, og i mindre trin. Frossen økonomi forhindrer ændringer i produktionsniveauet og industrilukninger. Denne indstilling kan muligvis ikke have nogen effekt hvis industrityperne stammer fra en NewGRF
+STR_CONFIG_SETTING_ECONOMY_TYPE_HELPTEXT_PERIOD                 :Jævn økonomi ændrer produktionen oftere og i mindre trin. En frossen økonomi stopper produktionsændringer og industrilukninger. Denne indstilling har muligvis ingen effekt, hvis industrityper leveres af en NewGRF.{}{}Industriens produktion pr. minut kan stadig synes at variere, hvis økonomien er frossen, fordi produktionen udløses med faste intervaller, der ikke præcist svarer til minutter.
 
 ###length 3
 STR_CONFIG_SETTING_ECONOMY_TYPE_ORIGINAL                        :Original
@@ -1978,7 +1990,12 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_FORBIDDEN                      :Forbudt
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED                        :Tilladt
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :Tilladt, tilpasset by-layout
 
+STR_CONFIG_SETTING_HOUSE_PLACER                                 :Placering af individuelle byhuse:{STRING}
+STR_CONFIG_SETTING_HOUSE_PLACER_HELPTEXT                        :Aktivering af denne indstilling giver spillerne mulighed for at placere byhuse manuelt
 ###length 3
+STR_CONFIG_SETTING_HOUSE_PLACER_FORBIDDEN                       :Forbudt
+STR_CONFIG_SETTING_HOUSE_PLACER_ALLOWED                         :Tilladt
+STR_CONFIG_SETTING_HOUSE_PLACER_FULLY_CONSTRUCTED               :Tilladt, fuldt konstrueret
 
 STR_CONFIG_SETTING_TOWN_CARGOGENMODE                            :Godsgenerering i byer: {STRING}
 STR_CONFIG_SETTING_TOWN_CARGOGENMODE_HELPTEXT                   :Hvor meget gods der bliver produceret af byers bygninger, i forhold til byens samlede indbyggertal.{}Kvadratisk vækst: En by med dobbelt indbyggertal genererer fire gange så mange passagerer.{}Lineær vækst: En by med dobbelt indbyggertal genererer dobbelt så mange passagerer
@@ -2178,6 +2195,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... inge
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... GPU-driver fik spillet til at gå ned. Hardwareacceleration deaktiveret
 
 # Intro window
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Nyt spil
 STR_INTRO_LOAD_GAME                                             :{BLACK}Fortsæt spil
@@ -2189,7 +2208,7 @@ STR_INTRO_MULTIPLAYER                                           :{BLACK}Netværk
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Opsætning
 STR_INTRO_HIGHSCORE                                             :{BLACK} Topresultater
 STR_INTRO_HELP                                                  :{BLACK}Hjælp og manualer
-STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Tjek Online Indhold
+STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Online Indhold
 STR_INTRO_QUIT                                                  :{BLACK}Afslut
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Start et nyt spil. Ctrl+Klik springer kortindstillingerne over.
@@ -2232,6 +2251,7 @@ STR_HELP_WINDOW_README                                          :{BLACK}Læs mig
 STR_HELP_WINDOW_CHANGELOG                                       :{BLACK}Ændringslog
 STR_HELP_WINDOW_KNOWN_BUGS                                      :{BLACK}Kendte Bugs
 STR_HELP_WINDOW_LICENSE                                         :{BLACK}Licens
+STR_HELP_WINDOW_FONTS                                           :{BLACK}Skrifttyper
 STR_HELP_WINDOW_MAIN_WEBSITE                                    :{BLACK}OpenTTD
 STR_HELP_WINDOW_MANUAL_WIKI                                     :{BLACK}Manual / Wiki
 STR_HELP_WINDOW_BUGTRACKER                                      :{BLACK}Anmeld en fejl
@@ -2636,7 +2656,7 @@ STR_NETWORK_ERROR_COORDINATOR_ISOLATED                          :{WHITE}Din serv
 STR_NETWORK_ERROR_COORDINATOR_ISOLATED_DETAIL                   :{WHITE}Andre spillere vil ikke kunne forbinde til din server
 
 # Content downloading window
-STR_CONTENT_TITLE                                               :{WHITE}Download af indhold
+STR_CONTENT_TITLE                                               :{WHITE}Online indhold
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Type
 STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Indholdstype
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Navn
@@ -2835,6 +2855,7 @@ STR_HOUSE_PICKER_YEARS_FROM                                     :{BLACK}År: {OR
 STR_HOUSE_PICKER_YEARS_UNTIL                                    :{BLACK}År: {ORANGE}til {NUM}
 STR_HOUSE_PICKER_SIZE                                           :{BLACK}Størrelse: {ORANGE}{NUM}x{NUM} fliser
 STR_HOUSE_PICKER_CARGO_ACCEPTED                                 :{BLACK}Gods accepteret: {ORANGE}
+STR_HOUSE_PICKER_CARGO_PRODUCED                                 :{BLACK}Produceret last: {ORANGE}{CARGO_LIST}
 
 STR_HOUSE_PICKER_CLASS_ZONE1                                    :Kant
 STR_HOUSE_PICKER_CLASS_ZONE2                                    :Udkant
@@ -2842,6 +2863,8 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Ydre Forstæder
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Indre Forstæder
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Bymidte
 
+STR_HOUSE_PICKER_PROTECT_TITLE                                  :Forhindre opgraderinger
+STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Vælg om dette hus skal beskyttes mod udskiftning i takt med at byen vokser
 STR_HOUSE_PICKER_PROTECT_OFF                                    :Slukket
 STR_HOUSE_PICKER_PROTECT_ON                                     :tændt
 
@@ -3050,6 +3073,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Vælg by
 STR_FOUND_TOWN_CITY                                             :{BLACK}Storby
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Storbyer vokser hurtigere en almindelige byer{}Afhængig af indstillingerne kan de være større ved grundlæggelsen
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Byudvidelse:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Bygninger
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Forøg bygningerne i byerne
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Veje
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Forøg byernes veje
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Byens vej-layout:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Vælg vej-layout for denne by
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Originalt
@@ -3121,6 +3150,8 @@ STR_LANG_AREA_INFORMATION_TRAM_TYPE                             :{BLACK}Sporvejs
 STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Togspors hastighedsgrænse: {LTBLUE}{VELOCITY}
 STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT                      :{BLACK}Vej hastighedsbegrænsning: {LTBLUE}{VELOCITY}
 STR_LANG_AREA_INFORMATION_TRAM_SPEED_LIMIT                      :{BLACK}Sporvogn hastighedsgrænse: {LTBLUE}{VELOCITY}
+STR_LAND_AREA_INFORMATION_TOWN_CAN_UPGRADE                      :{BLACK}Byen kan opgraderes: {LTBLUE}Ja
+STR_LAND_AREA_INFORMATION_TOWN_CANNOT_UPGRADE                   :{BLACK}Byen kan opgraderes: {LTBLUE}Nej
 
 # Description of land area of different tiles
 STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Klipper
@@ -3129,6 +3160,9 @@ STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Bart land
 STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Græs
 STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Marker
 STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Ørken
+STR_LAI_CLEAR_DESCRIPTION_SNOWY_ROCKS                           :Snedækkede klipper
+STR_LAI_CLEAR_DESCRIPTION_SNOWY_ROUGH_LAND                      :Snedækket, ujævnt land
+STR_LAI_CLEAR_DESCRIPTION_SNOWY_GRASS                           :Snedækket græs
 
 STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Jernbanespor
 STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Jernbanespor med bloksignaler
@@ -3668,6 +3702,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Ændre n
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Udvid
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Forøg størrelsen af byen
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Udvid bygninger
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Forøg byens bygninger
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Udvid veje
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Forøg byens veje
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Slet
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Slet denne by fuldstændigt
 
@@ -4003,6 +4041,10 @@ STR_INDUSTRY_VIEW_PRODUCES_N_CARGO                              :{BLACK}Producer
 STR_INDUSTRY_VIEW_CARGO_LIST_EXTENSION                          :, {STRING}{STRING}
 
 STR_INDUSTRY_VIEW_REQUIRES                                      :{BLACK}Kræver:
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_SUFFIX                           :{YELLOW}{0:STRING}{BLACK}{3:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_SUFFIX                    :{YELLOW}{0:STRING}{BLACK}: {1:CARGO_SHORT} venter{3:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_NOSUFFIX                         :{YELLOW}{0:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_NOSUFFIX                  :{YELLOW}{0:STRING}{BLACK}: {1:CARGO_SHORT} venter
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Skift produktion (multipla af 8, op til 2040)
 STR_CONFIG_GAME_PRODUCTION_LEVEL                                :{WHITE}Ændre produktions niveauet (Op til 800%)
@@ -4660,6 +4702,7 @@ STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Værksted
 STR_ORDER_SHIP_DEPOT                                            :Skibsdok
 ###next-name-looks-similar
 
+STR_ORDER_GO_TO_NEAREST_HANGAR_FORMAT                           :{STRING} den nærmeste hangar
 STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} den nærmeste {STRING}
 STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {DEPOT}
 
@@ -4682,10 +4725,10 @@ STR_ORDER_UNLOAD_FULL_LOAD                                      :(Los og vent p
 STR_ORDER_UNLOAD_FULL_LOAD_ANY                                  :(Los og vent på fuld last af hvilken som helst type fragt)
 STR_ORDER_UNLOAD_NO_LOAD                                        :(Los og efterlad tom)
 STR_ORDER_TRANSFER                                              :(Overfør og last fragt)
-STR_ORDER_TRANSFER_FULL_LOAD                                    :(Overfør og vent på fuld last)
-STR_ORDER_TRANSFER_FULL_LOAD_ANY                                :(Overfør og vent på fuld last af hvilken som helst type fragt)
+STR_ORDER_TRANSFER_FULL_LOAD                                    :{SPACE}(Overfør og vent på fuld last)
+STR_ORDER_TRANSFER_FULL_LOAD_ANY                                :{SPACE}(Overfør og vent på fuld last af hvilken som helst type fragt)
 STR_ORDER_TRANSFER_NO_LOAD                                      :(Overfør og efterlad tom)
-STR_ORDER_NO_UNLOAD                                             :(Los ikke og last fragt)
+STR_ORDER_NO_UNLOAD                                             :{SPACE}(Los ikke og last fragt)
 STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Los ikke og vent på fuld last)
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Los ikke af og vent på fuld last af hvilken som helst type)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Los ikke og last ikke)
@@ -4697,8 +4740,8 @@ STR_ORDER_UNLOAD_REFIT                                          :(Los og medtag
 STR_ORDER_UNLOAD_FULL_LOAD_REFIT                                :(Los og vent på fuld last med auto-tilpas til {STRING})
 STR_ORDER_UNLOAD_FULL_LOAD_ANY_REFIT                            :(Los og vent på fuld vilkårlig last med auto-tilpas til {STRING})
 STR_ORDER_TRANSFER_REFIT                                        :(Overfør og medtag last med auto-tilpas til {STRING})
-STR_ORDER_TRANSFER_FULL_LOAD_REFIT                              :(Overfør og vent på fuld last med auto-tilpas til {STRING})
-STR_ORDER_TRANSFER_FULL_LOAD_ANY_REFIT                          :(Overfør og vent på fuld vilkårlig last med auto-tilpas til {STRING})
+STR_ORDER_TRANSFER_FULL_LOAD_REFIT                              :{SPACE}(Overfør og vent på fuld last med auto-tilpas til {STRING})
+STR_ORDER_TRANSFER_FULL_LOAD_ANY_REFIT                          :{SPACE}(Overfør og vent på fuld vilkårlig last med auto-tilpas til {STRING})
 STR_ORDER_NO_UNLOAD_REFIT                                       :(Ingen losning og medtag last med with auto-tilpas til {STRING})
 STR_ORDER_NO_UNLOAD_FULL_LOAD_REFIT                             :(Ingen losning og vent på fuld last med with auto-tilpas til {STRING})
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY_REFIT                         :(Ingen losning og vent på fuld vilkårlig last med with auto-tilpas til {STRING})
@@ -4728,7 +4771,7 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Kørepla
 STR_TIMETABLE_NO_TRAVEL                                         :Rejs ikke
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Rejs (automatisk; planlagt med næste manuelle ordre)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Rejs (ikke iflg. køreplan)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Rejs med højst {2:VELOCITY} (ikke skemalagt)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Rejs med højst {VELOCITY} (ikke skemalagt)
 STR_TIMETABLE_TRAVEL_FOR                                        :Rejs i {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Rejs mod {STRING} med højst {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Køreplan (for {STRING}, ikke skemalagt)
@@ -4755,6 +4798,7 @@ STR_TIMETABLE_START_SECONDS_QUERY                               :Sekunder til ti
 
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Ændre tid
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Ændre den tid, som den fremhævede rækkefølge skal tage. Ctrl+klik angiver tidspunktet for alle ordrer
+STR_TIMETABLE_CHANGE_TIME_QUERY                                 :Skift tid
 
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Nulstil tid
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Nulstil tiden for den markerede ordre. Ctrl+klik for at rydde tiden for alle ordrer
@@ -5290,11 +5334,16 @@ STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Kan ikke
 STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Kan ikke sælge flyet...
 
 ###length VEHICLE_TYPES
+STR_ERROR_CAN_T_SELL_ALL_TRAIN                                  :{WHITE}Kan ikke sælge alle jernbanevogne...
 STR_ERROR_CAN_T_SELL_ALL_ROAD_VEHICLE                           :{WHITE}Kan ikke sælge alle vejkøretøjer...
 STR_ERROR_CAN_T_SELL_ALL_SHIP                                   :{WHITE}Kan ikke sælge alle skibe...
 STR_ERROR_CAN_T_SELL_ALL_AIRCRAFT                               :{WHITE}Kan ikke sælge alle fly...
 
 ###length VEHICLE_TYPES
+STR_ERROR_CAN_T_AUTOREPLACE_TRAIN                               :{WHITE}Kan ikke automatisk erstatte jernbanevogne...
+STR_ERROR_CAN_T_AUTOREPLACE_ROAD_VEHICLE                        :{WHITE}Kan ikke automatisk erstatte vejkøretøjer...
+STR_ERROR_CAN_T_AUTOREPLACE_SHIP                                :{WHITE}Kan ikke automatisk erstatte skibe...
+STR_ERROR_CAN_T_AUTOREPLACE_AIRCRAFT                            :{WHITE}Kan ikke automatisk erstatte fly...
 
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}For mange køretøjer i spillet
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Kan ikke ændre serviceinterval...
@@ -5838,6 +5887,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}bn
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}tn
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -5877,3 +5927,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Åbn badgekonfiguration
+STR_BADGE_CONFIG_RESET                                          :Nulstil
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Badge-ikoner
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Badgefiltre
+STR_BADGE_CONFIG_PREVIEW                                        :Forhåndsvisningsbillede
+STR_BADGE_CONFIG_NAME                                           :Navn
+STR_BADGE_FILTER_ANY_LABEL                                      :Enhver {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} er {STRING}

src/lang/dutch.txt

@@ -2195,6 +2195,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... geen
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... Spel is vastgelopen door het GPU-stuurprogramma. Hardwareversnelling wordt uitgeschakeld
 
 # Intro window
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Nieuw spel
 STR_INTRO_LOAD_GAME                                             :{BLACK}Spel laden
@@ -3071,6 +3073,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Stadsgro
 STR_FOUND_TOWN_CITY                                             :{BLACK}Groeistad
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Groeisteden groeien sneller dan gewone steden{}Afhankelijk van de instellingen kunnen ze ook groter zijn als ze gesticht worden
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Uitbreiding van stad:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Gebouwen
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Meer gebouwen in steden
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Wegen
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Meer wegen in steden
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Wegpatroon
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Wegpatroon voor deze stad kiezen
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Origineel
@@ -3694,6 +3702,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Hiermee
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Vergroot
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Vergroot stadsgrootte
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Gebouwen uitbreiden
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Meer gebouwen in stad
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Wegen uitbreiden
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Meer wegen in steden
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Verwijder
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Verwijder deze hele stad
 
@@ -4759,7 +4771,7 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Dienstre
 STR_TIMETABLE_NO_TRAVEL                                         :Niet rijden
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Rijden (automatisch; volgens dienstregeling bij volgende handmatige bestemming)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Reis (geen dienstregeling)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Reis met maximaal {2:VELOCITY} (geen dienstregeling)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Reis met maximaal {VELOCITY} (geen dienstregeling)
 STR_TIMETABLE_TRAVEL_FOR                                        :Reis naar {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Reis {STRING} met maximaal {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Reis (gedurende {STRING}, geen dienstregeling)
@@ -5915,3 +5927,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Badgeconfiguratie openen
+STR_BADGE_CONFIG_RESET                                          :Terugstellen
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Badgepictogrammen
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Badgefilters
+STR_BADGE_CONFIG_PREVIEW                                        :Voorbeeld
+STR_BADGE_CONFIG_NAME                                           :Naam
+STR_BADGE_FILTER_ANY_LABEL                                      :Willekeurige {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} is {STRING}

src/lang/english.txt

@@ -3073,6 +3073,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Select t
 STR_FOUND_TOWN_CITY                                             :{BLACK}City
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Cities grow faster than regular towns{}Depending on settings, they are bigger when founded
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Town expansion:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Buildings
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Increase buildings of towns
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Roads
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Increase roads of towns
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Town road layout:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Select road layout used for this town
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
@@ -3696,6 +3702,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Change t
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Expand
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Increase size of town
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Expand buildings
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Increase buildings of town
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Expand roads
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Increase roads of town
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Delete
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Delete this town completely
 
@@ -4761,7 +4771,7 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Timetabl
 STR_TIMETABLE_NO_TRAVEL                                         :No travel
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Travel (automatic; timetabled by next manual order)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Travel (not timetabled)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Travel (not timetabled) with at most {2:VELOCITY}
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Travel (not timetabled) with at most {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Travel for {STRING1}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Travel for {STRING1} with at most {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Travel (for {STRING1}, not timetabled)
@@ -5917,3 +5927,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{RAW_STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Open badge configuration
+STR_BADGE_CONFIG_RESET                                          :Reset
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Badge Icons
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Badge Filters
+STR_BADGE_CONFIG_PREVIEW                                        :Preview Image
+STR_BADGE_CONFIG_NAME                                           :Name
+STR_BADGE_FILTER_ANY_LABEL                                      :Any {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} is {STRING}

src/lang/english_AU.txt

@@ -3073,6 +3073,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Select t
 STR_FOUND_TOWN_CITY                                             :{BLACK}City
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Cities grow faster than regular towns{}Depending on settings, they are bigger when founded
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Town expansion:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Buildings
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Increase buildings of towns
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Roads
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Increase roads of towns
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Town road layout:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Select road layout used for this town
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
@@ -3696,6 +3702,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Change t
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Expand
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Increase size of town
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Expand buildings
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Increase buildings of town
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Expand roads
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Increase roads of town
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Delete
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Delete this town completely
 
@@ -4761,7 +4771,7 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Timetabl
 STR_TIMETABLE_NO_TRAVEL                                         :No travel
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Travel (automatic; timetabled by next manual order)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Travel (not timetabled)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Travel (not timetabled) with at most {2:VELOCITY}
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Travel (not timetabled) with at most {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Travel for {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Travel for {STRING} with at most {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Travel (for {STRING}, not timetabled)
@@ -5917,3 +5927,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Open badge configuration
+STR_BADGE_CONFIG_RESET                                          :Reset
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Badge Icons
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Badge Filters
+STR_BADGE_CONFIG_PREVIEW                                        :Preview Image
+STR_BADGE_CONFIG_NAME                                           :Name
+STR_BADGE_FILTER_ANY_LABEL                                      :Any {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} is {STRING}

src/lang/english_US.txt

@@ -2195,6 +2195,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... no c
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... GPU driver crashed the game. Hardware acceleration disabled
 
 # Intro window
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}New Game
 STR_INTRO_LOAD_GAME                                             :{BLACK}Load Game
@@ -3071,6 +3073,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Select t
 STR_FOUND_TOWN_CITY                                             :{BLACK}City
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Cities grow faster than regular towns{}Depending on settings, they are bigger when founded
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Town expansion:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Buildings
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Increase buildings of towns
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Roads
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Increase roads of towns
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Town road layout:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Select road layout used for this town
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
@@ -3694,6 +3702,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Change t
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Expand
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Increase size of town
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Expand buildings
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Increase buildings of town
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Expand roads
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Increase roads of town
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Delete
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Delete this town completely
 
@@ -4432,10 +4444,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Show shi
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Show aircraft's orders. Ctrl+Click to show aircraft's timetable
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Show train details
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Show road vehicle details
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Show ship details
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Show aircraft details
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Show train details. Ctrl+Click to show train's group
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Show vehicle details. Ctrl+Click to show vehicle's group
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Show ship details. Ctrl+Click to show ship's group
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Show aircraft details. Ctrl+Click to show aircraft's group
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}Current train action - click to stop/start train
@@ -4759,15 +4771,15 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Timetabl
 STR_TIMETABLE_NO_TRAVEL                                         :No travel
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Travel (automatic; timetabled by next manual order)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Travel (not timetabled)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Travel (not timetabled) with at most {2:VELOCITY}
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Travel (not timetabled) with at most {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Travel for {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Travel for {STRING} with at most {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Travel (for {STRING}, not timetabled)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Travel (for {STRING}, not timetabled) with at most {VELOCITY}
 STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(stay for {STRING}, not timetabled)
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(travel for {STRING}, not timetabled)
-STR_TIMETABLE_STAY_FOR                                          :and stay for {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :and travel for {STRING}
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}and stay for {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}and travel for {STRING}
 
 STR_TIMETABLE_APPROX_TIME                                       :{BLACK}This timetable will take approximately {STRING} to complete
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}This timetable will take {STRING} to complete
@@ -5875,6 +5887,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}bn
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}tn
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -5914,3 +5927,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Open badge configuration
+STR_BADGE_CONFIG_RESET                                          :Reset
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Badge Icons
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Badge Filters
+STR_BADGE_CONFIG_PREVIEW                                        :Preview Image
+STR_BADGE_CONFIG_NAME                                           :Name
+STR_BADGE_FILTER_ANY_LABEL                                      :Any {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} is {STRING}

src/lang/esperanto.txt

@@ -1010,11 +1010,11 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Gluu la
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Ludaj agordoj
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Ĝenerale
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Elektu ĝeneralajn agordojn
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Elektu ĝeneralajn agordojn
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafiko
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Elektu agordojn pri grafiko
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Elektu agordojn pri grafiko
 STR_GAME_OPTIONS_TAB_SOUND                                      :Sono
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Elektu agordojn pri sono kaj muziko
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Elektu agordojn pri sono kaj muziko
 
 STR_GAME_OPTIONS_VOLUME                                         :Laŭteco
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Sonefektoj
@@ -1022,8 +1022,8 @@ STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Muziko
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Monunuoj
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Elekto de monunuoj
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Monunuoj
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Elekto de monunuoj
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1073,8 +1073,8 @@ STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malajzia ringit
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :Latvaj Latoj
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portugalaj Eskudoj
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Aŭtomata konservado
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Elektu intervalon inter aŭtomataj konservadoj de la ludo
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Aŭtomata konservado
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Elektu intervalon inter aŭtomataj konservadoj de la ludo
 
 # Autosave dropdown
 ###length 5
@@ -1084,67 +1084,67 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Ĉiujn 30 minut
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Ĉiujn 60 minutojn
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Ĉiujn 120 minutojn
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Lingvo
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Elektu uzotan interfacan lingvon
+STR_GAME_OPTIONS_LANGUAGE                                       :Lingvo
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Elektu uzotan interfacan lingvon
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% kompleta)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Plena ekrano
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Ŝaltu ĉi tiun kvadrateton por plenekrane ludi OpenTTD
+STR_GAME_OPTIONS_FULLSCREEN                                     :Plena ekrano
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Ŝaltu ĉi tiun kvadrateton por plenekrane ludi OpenTTD
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Ekrana montrogrando
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Elektu uzotan ekranan montrograndon
+STR_GAME_OPTIONS_RESOLUTION                                     :Ekrana montrogrando
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Elektu uzotan ekranan montrograndon
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :alia
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Aparatara plirapidigo
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Elektu tiun ĉi agordon por ke OpenTTD klopodu uzi aparataran akceladon. Se vi ŝanĝas tiun ĉi agordon, la nova agordo validos nur ekde restartigo de la ludo
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Aparatara plirapidigo
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Elektu tiun ĉi agordon por ke OpenTTD klopodu uzi aparataran akceladon. Se vi ŝanĝas tiun ĉi agordon, la nova agordo validos nur ekde restartigo de la ludo
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Tiu ĉi agordo ekefikos nur post restartigo de la ludo
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}Vertikala sinkronigo
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :Vertikala sinkronigo
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Nuna pelilo: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Nuna pelilo: {STRING}
 
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Interfacgrandeco
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Aŭtomate rekonu grandecon
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Ŝaltu ĉi tiun kvadrateton por aŭtomate detekti grandecon de la interfaco
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Interfacgrandeco
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Aŭtomate rekonu grandecon
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Ŝaltu ĉi tiun kvadrateton por aŭtomate detekti grandecon de la interfaco
 
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Uzu tradician bildetan tiparon
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Ŝaltu ĉi tiun kvadrateton se vi preferas uzi la tradician fiksgrandecan bildetan tiparon.
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Glatigu tiparojn
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Ŝaltu ĉi tiun kvadrateton por glatigi aligrandigeblajn tiparojn
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Uzu tradician bildetan tiparon
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Ŝaltu ĉi tiun kvadrateton se vi preferas uzi la tradician fiksgrandecan bildetan tiparon.
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Glatigu tiparojn
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Ŝaltu ĉi tiun kvadrateton por glatigi aligrandigeblajn tiparojn
 
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Aŭtomata sondado
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Partopreni aŭtomatan sondadon
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Kiam tiu ĉi agordo estas aktiva, OpenTTD sendos sondaĵon je forlaso de ludo
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Pri sondado kaj privateco
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Tio ĉi malfermos retumilon kun pli da informoj pri la aŭtomata sondado
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Antaŭmontru sondaĵrezulton
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Montru la sondaĵrezulton de la kuranta ludo
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Aŭtomata sondado
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Partopreni aŭtomatan sondadon
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Kiam tiu ĉi agordo estas aktiva, OpenTTD sendos sondaĵon je forlaso de ludo
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Pri sondado kaj privateco
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Tio ĉi malfermos retumilon kun pli da informoj pri la aŭtomata sondado
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Antaŭmontru sondaĵrezulton
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Montru la sondaĵrezulton de la kuranta ludo
 
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Montru aktualigoftecon
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Elektu ekranan aktualigoftecon
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Montru aktualigoftecon
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Elektu ekranan aktualigoftecon
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Aktualigoftecoj pli altaj ol 60Hz povas kaŭzi malrapidiĝon.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Baza grafikaro
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selektu la uzotan bazan grafikaron (ne eblas ŝanĝi ene de la ludo, nur de la ĉefa menuo)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Aldonaj informoj pri la baza grafikaro
+STR_GAME_OPTIONS_BASE_GRF                                       :Baza grafikaro
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Selektu la uzotan bazan grafikaron (ne eblas ŝanĝi ene de la ludo, nur de la ĉefa menuo)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Aldonaj informoj pri la baza grafikaro
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Baza sonaro
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Elektu la uzotan bazan sonaron (ne eblas ŝanĝi ene de la ludo, nur de la ĉefa menuo)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Aldonaj informoj pri la baza sonaro
+STR_GAME_OPTIONS_BASE_SFX                                       :Baza sonaro
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Elektu la uzotan bazan sonaron (ne eblas ŝanĝi ene de la ludo, nur de la ĉefa menuo)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Aldonaj informoj pri la baza sonaro
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Baza muzikaro.
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Elekti bazan muzikaron por uzi.
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Pluaj informoj pri la baza muzikaro.
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Baza muzikaro.
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Elekti bazan muzikaron por uzi.
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Pluaj informoj pri la baza muzikaro.
 
 
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Stato de la kromprogramo:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Stato de la kromprogramo:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_DUPLICATE                  :{RED}Duplikata kromprogramo
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_INVALID_SIGNATURE          :{RED}Malvalida subskribo
@@ -1250,11 +1250,11 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Permesema (ne e
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Neniu taŭga AI estas disponebla...{}Kelkaj AI-oj estas elŝuteblaj per la sistemo 'Enreta Enhavo'.
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtrilo:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Etendu ĉion
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Maletendu ĉiujn
-STR_CONFIG_SETTING_COLLAPSE_ALL.n                               :{BLACK}Collapse all
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Restarigu ĉiujn valorojn
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtrilo:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Etendu ĉion
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Maletendu ĉiujn
+STR_CONFIG_SETTING_COLLAPSE_ALL.n                               :Collapse all
+STR_CONFIG_SETTING_RESET_ALL                                    :Restarigu ĉiujn valorojn
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(neniu ekspliko disponeble)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Defaŭlta valoro: {ORANGE}{STRING}
@@ -1267,9 +1267,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Kompania agordo
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Atentu!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Tiu ĉi ago reagordos ĉiujn agordojn al la defaŭltaj valoroj.{}Ĉu vi certas ke vi volas daŭrigi?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategorio:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Tipo:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Limigas la liston per antaŭdifinitaj filtroj
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategorio:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Tipo:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Limigas la liston per antaŭdifinitaj filtroj
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Bazniveloj agordoj
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Altnivelaj agordoj
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Altnivelaj agordoj / ĉiu agordoj
@@ -1286,9 +1286,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Kompaniaj agord
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Neniu -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Montru ĉiujn serĉrezultojn ŝanĝante{}{SILVER}Kategorion {BLACK}al {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Montru ĉiujn serĉrezultojn ŝanĝante{}{SILVER}Tipon {BLACK}al {WHITE}Ĉiuj agordoj
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Montru ĉiujn serĉrezultojn ŝanĝante{}{SILVER}Kategorion {BLACK}al {WHITE}{STRING}{BLACK}kaj {SILVER}Tipon {BLACK}al {WHITE}Ĉiuj agordoj
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Montru ĉiujn serĉrezultojn ŝanĝante{}{SILVER}Kategorion {BLACK}al {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Montru ĉiujn serĉrezultojn ŝanĝante{}{SILVER}Tipon {BLACK}al {WHITE}Ĉiuj agordoj
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Montru ĉiujn serĉrezultojn ŝanĝante{}{SILVER}Kategorion {BLACK}al {WHITE}{STRING}{BLACK}kaj {SILVER}Tipon {BLACK}al {WHITE}Ĉiuj agordoj
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Malaktiva
@@ -2951,6 +2951,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Elektu u
 STR_FOUND_TOWN_CITY                                             :{BLACK}Urbo
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Urbegoj kreskas pli rapide ol kutimaj urboj{}Depende de agordoj, ili pli grandas je fondiĝo
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Urba strataranĝo:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Selektu strataranĝon uzendan por ĉi tiu urbo
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Originale
@@ -4542,7 +4543,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horaro -
 STR_TIMETABLE_NO_TRAVEL                                         :Neniu veturo
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Veturu (aŭtomata; horara ĝis sekvanta mana ordono)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Veturo (ne horarita)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Veturu (sen horaro) je maksimume {2:VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Veturu dum {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Veturu dum {STRING} je maksimume {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Veturu (dum {STRING}, sen horaro)

src/lang/estonian.txt

@@ -1000,13 +1000,13 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Vaateala
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Liidese seadistus
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Üldine
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Vali üldised seaded
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Vali üldised seaded
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Graafika
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Vali graafika seaded
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Vali graafika seaded
 STR_GAME_OPTIONS_TAB_SOUND                                      :Heli
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Vali heli ja muusika seaded
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Vali heli ja muusika seaded
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Sotsiaal
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Vali sotsiaalse integratsiooni seaded
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Vali sotsiaalse integratsiooni seaded
 
 STR_GAME_OPTIONS_VOLUME                                         :Helitase
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Heliefektid
@@ -1015,8 +1015,8 @@ STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Muusika
 
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valuuta
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Valuuta valimine
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Valuuta
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Valuuta valimine
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1066,8 +1066,8 @@ STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malaisia ringit
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :Läti Latt
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portugali eskuudo
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Salvestusvälp
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Vali salvestamise välp
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Salvestusvälp
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Vali salvestamise välp
 
 # Autosave dropdown
 ###length 5
@@ -1077,75 +1077,75 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Iga 30. minut
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Iga 60. minut
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Iga 120. minut
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Keel
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Valib kasutajaliideses kasutatava keele
+STR_GAME_OPTIONS_LANGUAGE                                       :Keel
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Valib kasutajaliideses kasutatava keele
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% valmis)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Täisekraan
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Märgi see kast, et OpenTTD täisekraanirežiimis mängida
+STR_GAME_OPTIONS_FULLSCREEN                                     :Täisekraan
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Märgi see kast, et OpenTTD täisekraanirežiimis mängida
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Ekraanilahutus
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Ekraanilahutuse valimine
+STR_GAME_OPTIONS_RESOLUTION                                     :Ekraanilahutus
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Ekraanilahutuse valimine
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :muu
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Riistvarakiirendus
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Märkides selle ruudu, lubad OpenTTD-l üritada kasutada riistvarakiirendust. Muudetud seade omab mõju pärast mängu taaskäivitust
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Riistvarakiirendus
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Märkides selle ruudu, lubad OpenTTD-l üritada kasutada riistvarakiirendust. Muudetud seade omab mõju pärast mängu taaskäivitust
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Seade omab mõju alles pärast mängu taaskäivitust
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Märgi, et ekraani v-sync sisse lülitada. Seade kohaldub alles pärast mängu taaskäivitust. Töötab vaid, kui riistvarakiirendus on peal
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Märgi, et ekraani v-sync sisse lülitada. Seade kohaldub alles pärast mängu taaskäivitust. Töötab vaid, kui riistvarakiirendus on peal
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Hetke draiver: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Hetke draiver: {STRING}
 
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Liidese suurus
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Lohista liugurit liidesesuuruse seadmiseks. Ctrl+lohistamisel pidevkohendamine
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Tuvasta automaatselt suurus
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Märgi see kast, et tuvastada liidese suurus automaatselt
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Liidese suurus
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Lohista liugurit liidesesuuruse seadmiseks. Ctrl+lohistamisel pidevkohendamine
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Tuvasta automaatselt suurus
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Märgi see kast, et tuvastada liidese suurus automaatselt
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Skaleeri kaldeid
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Skaleeri kaldeid liidese suuruse järgi
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Skaleeri kaldeid
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Skaleeri kaldeid liidese suuruse järgi
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Kasuta traditsioonilist märgipõhist fonti
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Märgi, kui eelistad traditsioonilist kindla suurusega märgipõhist fonti
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Anti-alias fondid
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Kasti märkimisel tehakse muudetava suurusega fontidele anti-alias
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Kasuta traditsioonilist märgipõhist fonti
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Märgi, kui eelistad traditsioonilist kindla suurusega märgipõhist fonti
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Anti-alias fondid
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Kasti märkimisel tehakse muudetava suurusega fontidele anti-alias
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Automaatne uuring
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Osale automaatses uuringus
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Kui võimaldatud, saadab OpenTTD uuringu mängu sulgemisel
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Uuringust ja privaatsusest
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}See avab brauseriakna, kus on lisateave automaatsest uuringust
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Uuringutulemuste eelvaade
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Näita käimasoleva mängu uuringutulemusi
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Automaatne uuring
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Osale automaatses uuringus
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Kui võimaldatud, saadab OpenTTD uuringu mängu sulgemisel
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Uuringust ja privaatsusest
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :See avab brauseriakna, kus on lisateave automaatsest uuringust
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Uuringutulemuste eelvaade
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Näita käimasoleva mängu uuringutulemusi
 
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Ekraani värskendussagedus
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Vali, mis värskendussagedust kasutada
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Ekraani värskendussagedus
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Vali, mis värskendussagedust kasutada
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Värskendussagedused üle 60Hz võivad jõudlusele löögi anda.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Põhigraafika komplekt
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Vali kasutatav põhigraafika komplekt (mängus ei saa muuta, ainult peamenüüst)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Lisateave põhigraafika komplekti kohta
+STR_GAME_OPTIONS_BASE_GRF                                       :Põhigraafika komplekt
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Vali kasutatav põhigraafika komplekt (mängus ei saa muuta, ainult peamenüüst)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Lisateave põhigraafika komplekti kohta
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Põhihelide komplekt
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Vali põhihelide komplekt (mängus ei saa muuta, ainult peamenüüst)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Lisateave põhihelide komplekti kohta
+STR_GAME_OPTIONS_BASE_SFX                                       :Põhihelide komplekt
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Vali põhihelide komplekt (mängus ei saa muuta, ainult peamenüüst)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Lisateave põhihelide komplekti kohta
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Põhimuusika komplekt
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Valib kasutatava põhimuusika komplekti
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Rohkem teavet põhimuusika komplekti kohta
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Põhimuusika komplekt
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Valib kasutatava põhimuusika komplekti
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Rohkem teavet põhimuusika komplekti kohta
 
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(puuduvad pistikprogrammid sotsiaalplatvormidega integreerumiseks)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Platvorm:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Pistikprogrammi olek:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Platvorm:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Pistikprogrammi olek:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Töötab
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Alglaadimine ebaõnnestus
@@ -1259,10 +1259,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Lubav (ei oma m
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Sobiv AI puudub...{}Mitmesuguseid AI-sid saab alla laadida 'aineste allalaadimise' kaudu
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Märksõna:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Ava kõik
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Sulge kõik
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Nulli kõik väärtused
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Märksõna:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Ava kõik
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Sulge kõik
+STR_CONFIG_SETTING_RESET_ALL                                    :Nulli kõik väärtused
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(seletus puudub)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Vaikeväärtus: {ORANGE}{STRING}
@@ -1275,9 +1275,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Ettevõtte sead
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Ettevaatust!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}See toiming nullib kõik mänguseaded.{}Oled sa kindel, et jätkata?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Jagu:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Liik:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Piirab varem tehtud filtridega alljärgnevat loendit
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Jagu:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Liik:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Piirab varem tehtud filtridega alljärgnevat loendit
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Põhilised (kuva vaid tähtsad seaded)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Täpsustatud (näita enamikke seadeid)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Asjatundja (näita kõiki seaded, s.h. ebatavalisi)
@@ -1294,9 +1294,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Firma seaded (h
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Puudub -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Kõiki otsingu tulemusi näeb, kui{}{SILVER}jagu {BLACK}on {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Kõiki otsingu tulemusi näeb, kui{}{SILVER}liik {BLACK}on {WHITE}Kõik seadistuste liigid
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Kõiki otsingu tulemusi näeb, kui{}{SILVER}jagu {BLACK}on {WHITE}{STRING} {BLACK}ja {SILVER}liik {BLACK}on {WHITE}Kõik seadistuste liigid
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Kõiki otsingu tulemusi näeb, kui{}{SILVER}jagu {BLACK}on {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Kõiki otsingu tulemusi näeb, kui{}{SILVER}liik {BLACK}on {WHITE}Kõik seadistuste liigid
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Kõiki otsingu tulemusi näeb, kui{}{SILVER}jagu {BLACK}on {WHITE}{STRING} {BLACK}ja {SILVER}liik {BLACK}on {WHITE}Kõik seadistuste liigid
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Väljas
@@ -3063,6 +3063,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Vali asu
 STR_FOUND_TOWN_CITY                                             :{BLACK}Linn
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Linnad kasvavad kiiremini, kui tavalised asulad{}Sõltuvalt seadetest on need ka alguses suuremad
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Asula teeplaneering
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Vali selle asula teeplaneering
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Algne
@@ -4724,7 +4725,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Graafik
 STR_TIMETABLE_NO_TRAVEL                                         :Sõitu pole
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Reisi (automaatne; ajakava järgmise manuaalse käsu järgi)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Sõitmine (graafikuta)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Reisi kõike suurema {2:VELOCITY} (ei ole ajastatud)
 STR_TIMETABLE_TRAVEL_FOR                                        :Sõida {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Reisi selleks {STRING} kõige rohkema {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Sõit ({STRING}, ei ole ajastatud)

src/lang/faroese.txt

@@ -823,8 +823,8 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spæli m
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Gjaldsoyra eindir
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Úrval av gjaldsoyra eindum
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Gjaldsoyra eindir
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Úrval av gjaldsoyra eindum
 
 
 ###length 45
@@ -863,21 +863,21 @@ STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Sjálvgjørt...
 STR_GAME_OPTIONS_CURRENCY_GEL                                   :Georgiskur Lari
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iranskur Rial
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Sjálvgoymsla
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Vel títtleika av sjálvgoymslu
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Sjálvgoymsla
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Vel títtleika av sjálvgoymslu
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Sløkt
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Mál
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Vel mál at nýta í takførisflatu
+STR_GAME_OPTIONS_LANGUAGE                                       :Mál
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Vel mál at nýta í takførisflatu
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Fullan skerm
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Marka hendan kassan fyri at spæla OpenTTD í fullum skermi
+STR_GAME_OPTIONS_FULLSCREEN                                     :Fullan skerm
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Marka hendan kassan fyri at spæla OpenTTD í fullum skermi
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Skerm upploysn
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Vel hvørja skermupploysn tú vil brúka
+STR_GAME_OPTIONS_RESOLUTION                                     :Skerm upploysn
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Vel hvørja skermupploysn tú vil brúka
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :annað
 
 
@@ -891,17 +891,17 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :annað
 
 
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Base grafikk sett
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Vel ta base grafikk setti tú vil brúka
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Meira kunning um base grafikk setti
+STR_GAME_OPTIONS_BASE_GRF                                       :Base grafikk sett
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Vel ta base grafikk setti tú vil brúka
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Meira kunning um base grafikk setti
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Base ljóð sett
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Vel ta base ljóð setti tú vil brúka
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Meira kunning um base ljóð setti
+STR_GAME_OPTIONS_BASE_SFX                                       :Base ljóð sett
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Vel ta base ljóð setti tú vil brúka
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Meira kunning um base ljóð setti
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Base tónleika sett
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Vel ta base tónleika setti tú vil brúka
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Meira kunning um base tónleika setti
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Base tónleika sett
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Vel ta base tónleika setti tú vil brúka
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Meira kunning um base tónleika setti
 
 
 
@@ -1003,9 +1003,9 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Eftirgevandi
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Einki hóskandi AI til taks...{}Tú kann heinta niður fleiri ymisk AI gjøgnum 'Online tilfar' kervi
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtur strongur:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Víðka alt
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Toga alt saman
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtur strongur:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Víðka alt
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Toga alt saman
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(eingin frágreiðing tøk)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Vanligt virði: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Slag av instilling: {ORANGE}{STRING}
@@ -1015,7 +1015,7 @@ STR_CONFIG_SETTING_TYPE_GAME_INGAME                             :Goymslu instill
 STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :Fyritøku instilling (goymt í goymslufílum; ávirkar einans nýggj spøl)
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Fyritøku instilling (goymt í goymslufílum; ávirkar einans núverðandi fyritøku)
 
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Avmarkar listan niðanfyr so hann einans vísur broyttar instillingar
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Avmarkar listan niðanfyr so hann einans vísur broyttar instillingar
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Grund innstillingar
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Víðkaðir innstillingar
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Serfrøðinga innstillingar / allir innstillingar
@@ -2305,6 +2305,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Vel stø
 STR_FOUND_TOWN_CITY                                             :{BLACK}Býur
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Býir vaksa skjótari enn vanligar bygdir{}Treyta av innstillingum, eru teir størri tá teir verða stovnaðir
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Bygda vegakervi:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Vel hvat vegakervi skal nýtast í hesi bygdini
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Upprunaligt

src/lang/finnish.txt

@@ -3073,6 +3073,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Valitse
 STR_FOUND_TOWN_CITY                                             :{BLACK}Kaupunki
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Kaupungit kasvavat nopeammin kuin tavalliset kunnat{}Asetuksista riippuen, ne ovat suurempia perustettaessa
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Kuntien laajentaminen:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Rakennukset
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Kasvata rakennusten määrää kunnissa
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Tiet
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Kasvata teiden määrää kunnissa
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Kunnan tiekaava:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Valitse tiekaava tälle kunnalle
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Alkuperäinen
@@ -3696,6 +3702,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Vaihda k
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Laajenna
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Laajenna kuntaa
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Laajenna rakennuksia
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Kasvata rakennusten määrää kunnassa
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Laajenna teitä
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Kasvata teiden määrää kunnassa
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Poista
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Poista tämä kunta kokonaan.
 
@@ -4163,7 +4173,7 @@ STR_PURCHASE_INFO_AIRCRAFT_TYPE                                 :{BLACK}Ilma-alu
 
 ###length 3
 STR_CARGO_TYPE_FILTER_ALL                                       :Kaikki rahtityypit
-STR_CARGO_TYPE_FILTER_FREIGHT                                   :Rahti
+STR_CARGO_TYPE_FILTER_FREIGHT                                   :Rahtitavara
 STR_CARGO_TYPE_FILTER_NONE                                      :Ei mikään
 
 ###length VEHICLE_TYPES
@@ -4761,7 +4771,7 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Aikataul
 STR_TIMETABLE_NO_TRAVEL                                         :Ei kulkua
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Kulje (automaattinen; aikataulu seuraavan manuaalisen käskyn mukaisesti)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Kiertävä (ei aikataulua)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Kulje (ilman aikataulua) enimmillään {2:VELOCITY}
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Kulje (ilman aikataulua) enimmillään {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Kulje kohteeseen {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Kulje kohteeseen {STRING} enintään {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Kulje ({STRING}, ei aikataulua)
@@ -5917,3 +5927,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Avaa tunnusasetukset
+STR_BADGE_CONFIG_RESET                                          :Palauta
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Tunnuskuvakkeet
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Tunnussuodattimet
+STR_BADGE_CONFIG_PREVIEW                                        :Esikatselu
+STR_BADGE_CONFIG_NAME                                           :Nimi
+STR_BADGE_FILTER_ANY_LABEL                                      :Mikä tahansa {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} on {STRING}

src/lang/french.txt

@@ -967,12 +967,13 @@ STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Afficher les pa
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Social
 STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Afficher les paramètres d'intégration sociale
 STR_GAME_OPTIONS_TAB_ADVANCED                                   :Avancé
-STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Modifier les options avancées
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Afficher les paramètres avancés
 
 STR_GAME_OPTIONS_VOLUME                                         :Volume
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Effets sonores
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Musique
 
+STR_GAME_OPTIONS_SETTING                                        :{STRING}{NBSP}: {ORANGE}{STRING}
 
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
@@ -1082,8 +1083,8 @@ STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Participer à l
 STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Si activé, OpenTTD transmettra les données d'analyse recueillies en quittant une partie
 STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :À propos des données et de la confidentialité
 STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Ouvre une fenêtre dans votre navigateur à propos de la confidentialité des données d'analyse envoyées
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Prévisualisation des données d'analyse recueillies
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Voir les données d'analyse recueillies de la partie en cours
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Aperçu des données d'analyse
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Voir les données d'analyse de la partie en cours
 
 STR_GAME_OPTIONS_DISPLAY                                        :Affichage
 
@@ -1148,7 +1149,7 @@ STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Définir
 STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Passer à l'euro plus tôt
 STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Passer à l'euro plus tard
 
-STR_CURRENCY_PREVIEW                                            :{LTBLUE}Prévisualisation{NBSP}: {ORANGE}{CURRENCY_LONG}
+STR_CURRENCY_PREVIEW                                            :{LTBLUE}Aperçu{NBSP}: {ORANGE}{CURRENCY_LONG}
 STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10{NBSP}000 livres (£) dans cette devise
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Changer les paramètres de la devise personnalisée
 
@@ -1260,9 +1261,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Paramètres de
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Aucun -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Afficher tous les résultats de la recherche en définissant{}la {SILVER}catégorie {BLACK}sur {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Afficher tous les résultats de la recherche en définissant{}le {SILVER}type {BLACK}sur {WHITE}tous les types
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Afficher tous les résultats de la recherche en définissant{}la{SILVER}catégorie {BLACK}sur {WHITE}{STRING} {BLACK}et le{SILVER} type {BLACK}sur {WHITE}tous les types
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Afficher tous les résultats de la recherche en définissant{}la {PUSH_COLOUR}{SILVER}catégorie {POP_COLOUR}sur {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Afficher tous les résultats de la recherche en définissant{}le {PUSH_COLOUR}{SILVER}type {POP_COLOUR}sur {WHITE}tous les types
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Afficher tous les résultats de la recherche en définissant{}la{PUSH_COLOUR}{SILVER}catégorie {POP_COLOUR}sur {PUSH_COLOUR}{WHITE}{STRING} {POP_COLOUR}et le{PUSH_COLOUR}{SILVER} type {POP_COLOUR}sur {WHITE}tous les types
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Désactivé
@@ -1419,7 +1420,7 @@ STR_CONFIG_SETTING_SHOWFINANCES_PERIOD                          :Afficher le bil
 STR_CONFIG_SETTING_SHOWFINANCES_HELPTEXT                        :Si activé, le bilan financier sera affiché à la fin de chaque année pour permettre un contrôle rapide de l'état de la compagnie.
 STR_CONFIG_SETTING_SHOWFINANCES_HELPTEXT_PERIOD                 :Si activé, le bilan financier sera affiché à la fin de chaque période pour permettre un contrôle rapide de l'état de la compagnie.
 
-STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT                           :Les nouveaux ordres sont « sans arrêt » par défaut{NBSP}: {STRING}
+STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT                           :Les nouveaux ordres sont «{NBSP}sans arrêt{NBSP}» par défaut{NBSP}: {STRING}
 STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT_HELPTEXT                  :Normalement, un véhicule s'arrête dans chaque station qu'il traverse. En activant ce paramètre, il traversera toutes les stations sur le chemin de sa destination finale sans s'arrêter. Noter que ce paramètre définit uniquement une valeur par défaut pour les nouveaux ordres. Les ordres peuvent par après être réglés individuellement avec un autre comportement
 
 STR_CONFIG_SETTING_STOP_LOCATION                                :Les nouveaux ordres arrêtent les trains {G 0 au au "à la"} {STRING} du quai par défaut
@@ -2195,6 +2196,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE} ... auc
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... le pilote du GPU a fait planter le jeu. L'accélération matérielle est désactivée
 
 # Intro window
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Jouer une nouvelle partie
 STR_INTRO_LOAD_GAME                                             :{BLACK}Charger une partie
@@ -2203,7 +2206,7 @@ STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Jouer un
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Éditeur de scénario
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Jouer en multijoueur
 
-STR_INTRO_GAME_OPTIONS                                          :{BLACK}Options globales
+STR_INTRO_GAME_OPTIONS                                          :{BLACK}Options du jeu
 STR_INTRO_HIGHSCORE                                             :{BLACK}Meilleurs scores
 STR_INTRO_HELP                                                  :{BLACK}Aide et manuels
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Contenu en ligne
@@ -2380,7 +2383,7 @@ STR_NETWORK_SERVER_VISIBILITY_INVITE_ONLY                       :Invitation uniq
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multijoueurs
-STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Votre nom de joueur :
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Votre nom de joueur{NBSP}:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Ceci est le nom sous lequel vous serez connu des autres joueurs
 
 STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Nom de la partie
@@ -2539,7 +2542,7 @@ STR_NETWORK_ASK_RELAY_YES_ALWAYS                                :{BLACK}Oui, ne
 
 STR_NETWORK_ASK_SURVEY_CAPTION                                  :Participer à l'envoi automatique de données d'analyse ?
 STR_NETWORK_ASK_SURVEY_TEXT                                     :Souhaitez-vous participer à l'envoi automatique de données d'analyse ?{}OpenTTD transmettra les données d'analyse lorsque vous quitterez une partie.{}Vous pouvez changer ceci à tout moment dans les options du jeu.
-STR_NETWORK_ASK_SURVEY_PREVIEW                                  :Prévisualiser les données d'analyse
+STR_NETWORK_ASK_SURVEY_PREVIEW                                  :Aperçu des données d'analyse
 STR_NETWORK_ASK_SURVEY_LINK                                     :Données d'analyse et confidentialité
 STR_NETWORK_ASK_SURVEY_NO                                       :Non
 STR_NETWORK_ASK_SURVEY_YES                                      :Oui
@@ -3071,6 +3074,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Sélecti
 STR_FOUND_TOWN_CITY                                             :{BLACK}Métropole
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Les métropoles se développent plus vite que les villes.{}Leur taille à la création dépend du paramétrage de la configuration.
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Agencement des routes{NBSP}:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Sélectionner l'agencement des routes pour cette ville
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
@@ -4432,10 +4436,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Afficher
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Afficher les ordres de l'aéronef.{}Ctrl-clic pour afficher son horaire.
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Afficher les détails du train
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Afficher les détails du véhicule routier
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Afficher les détails du navire
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Afficher les détails de l'aéronef
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Afficher les détails du train. Ctrl-clic pour afficher son groupe
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Afficher les détails du véhicule routier. Ctrl-clic pour afficher son groupe
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Afficher les détails du navire. Ctrl-clic pour afficher son groupe
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Afficher les détails de l'aéronef. Ctrl-clic pour afficher son groupe
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}Action courante du train - cliquer pour le démarrer/l'arrêter
@@ -4759,15 +4763,15 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horaire
 STR_TIMETABLE_NO_TRAVEL                                         :Pas de voyage
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Voyager (automatique{NBSP}; horaire au prochain ordre manuel)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Voyager (sans horaire)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Voyager (non planifié) à {2:VELOCITY} max.
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Voyager (non planifié) à {VELOCITY} max.
 STR_TIMETABLE_TRAVEL_FOR                                        :Voyager pendant {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Voyager pendant {STRING} à {VELOCITY} max.
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Voyager (pendant {STRING}, non planifié)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Voyager (pendant {STRING}, non planifié) à {VELOCITY} max.
 STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(rester pendant {STRING}, non planifié)
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(voyager pendant {STRING}, non planifié)
-STR_TIMETABLE_STAY_FOR                                          :et rester pendant {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :et voyager pendant {STRING}
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}et rester pendant {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}et voyager pendant {STRING}
 
 STR_TIMETABLE_APPROX_TIME                                       :{BLACK}C'est horaire prendra approximativement {STRING} pour s'achever
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}Cet horaire prendra {STRING} pour s'achever
@@ -4920,7 +4924,7 @@ STR_TEXTFILE_VIEW_LICENCE_TOOLTIP                               :Afficher la lic
 STR_TEXTFILE_README_CAPTION                                     :{WHITE}Lisez-moi du module {STRING} {STRING}
 STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}Journal des modifications pour le module {STRING} {STRING}
 STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}Licence du module {STRING} {STRING}
-STR_TEXTFILE_SURVEY_RESULT_CAPTION                              :{WHITE}Prévisualisation des données d'analyse
+STR_TEXTFILE_SURVEY_RESULT_CAPTION                              :{WHITE}Aperçu des données d'analyse
 STR_TEXTFILE_GAME_MANUAL_CAPTION                                :{WHITE}Document OpenTTD '{STRING}'
 
 
@@ -5875,6 +5879,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}G
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}T
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -5914,3 +5919,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Ouvrir la configuration des badges
+STR_BADGE_CONFIG_RESET                                          :Réinitialiser
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Icônes de badges
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Filtres de badges
+STR_BADGE_CONFIG_PREVIEW                                        :Aperçu du véhicule
+STR_BADGE_CONFIG_NAME                                           :Nom
+STR_BADGE_FILTER_ANY_LABEL                                      :Tous {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} est {STRING}

src/lang/frisian.txt

@@ -854,8 +854,8 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spulopsj
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Muntienheid
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Muntienheidseleksje
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Muntienheid
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Muntienheidseleksje
 
 
 ###length 45
@@ -902,21 +902,21 @@ STR_GAME_OPTIONS_CURRENCY_INR                                   :Yndyske rupee
 STR_GAME_OPTIONS_CURRENCY_IDR                                   :Yndonezyske Roepia
 STR_GAME_OPTIONS_CURRENCY_MYR                                   :Maleizyske Ringgit
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Automatysk opslaan
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Selektearje de interval foar automatysk opslaan
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Automatysk opslaan
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Selektearje de interval foar automatysk opslaan
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Ut
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Taal
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Selektearje de interfacetaal
+STR_GAME_OPTIONS_LANGUAGE                                       :Taal
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Selektearje de interfacetaal
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Folslein skerm
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Finkje dit fakje oan om OpenTTD te boartsje yn in folslein skerm
+STR_GAME_OPTIONS_FULLSCREEN                                     :Folslein skerm
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Finkje dit fakje oan om OpenTTD te boartsje yn in folslein skerm
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Skermresolúsje
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Selektearje de skermresolutje om te brûken
+STR_GAME_OPTIONS_RESOLUTION                                     :Skermresolúsje
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Selektearje de skermresolutje om te brûken
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :oars
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
@@ -930,19 +930,19 @@ STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
 
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Byldferfaskingssnelheid
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Byldferfaskingssnelheid
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Basisset for ôfbyldings
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selektearje de basis ôfbyldingsset om te brûken
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Oanfoljende ynformaasje oer de basisset foar ôfbyldings
+STR_GAME_OPTIONS_BASE_GRF                                       :Basisset for ôfbyldings
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Selektearje de basis ôfbyldingsset om te brûken
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Oanfoljende ynformaasje oer de basisset foar ôfbyldings
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Basisset foar lûdseffekten
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Selektearje de basislûdsset om te brûken
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Oanfoljende ynformaasje oer de basislûdsset
+STR_GAME_OPTIONS_BASE_SFX                                       :Basisset foar lûdseffekten
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Selektearje de basislûdsset om te brûken
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Oanfoljende ynformaasje oer de basislûdsset
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Basisset foar musyk
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Selektearje de basisset foar musyk om te brûken
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Oanfoljende ynformaasje oer de basisset foar musyk
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Basisset foar musyk
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Selektearje de basisset foar musyk om te brûken
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Oanfoljende ynformaasje oer de basisset foar musyk
 
 
 
@@ -1048,9 +1048,9 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Tajouwend (gjin
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Gjin brûkbere AIs beskikber...{}jo kinne ferskillende AIs downloade fia it 'Online Content' systeem
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filter:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Alles útklappe
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Alles ynklappe
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filter:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Alles útklappe
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Alles ynklappe
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(gjin útlis beskikber)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Standerdwaarde: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Ynstellingstype: {ORANGE}{STRING}
@@ -1060,9 +1060,9 @@ STR_CONFIG_SETTING_TYPE_GAME_INGAME                             :Spulynstellings
 STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :Bedriuwynstellings (wurdt per spul bewarre; hat allinich effekt op nije spullen)
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Bedriuwynstellings (wurdt per spul bewarre; hat allinich effekt op it hjoeddeiske bedriuw)
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategory:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Type:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Behein de ûndersteande list ta feroare ynstellings
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategory:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Type:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Behein de ûndersteande list ta feroare ynstellings
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Basisynstellings (allinich wichtige ynstellings sjen litte)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Wiidweidige ynstellings (measte ynstellings sjen litte)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Ekspêrynstelltings (alle ynstellings sjen litte, wêrûnder fremde)
@@ -1079,9 +1079,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Bedriuwynstelli
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Gjin -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Lit alle sykresultaten per ynstelling sjen{}{SILVER}Katagory {BLACK}oant {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Lit alle sykresultaten per ynstelling sjen{}{SILVER}Type {BLACK}oant {WHITE}Alle ynstellingtypes
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Lit alle sykresyltaten per ynstelling sjen{}{SILVER}Katagory {BLACK}oant {WHITE}{STRING} {BLACK}en {SILVER}Type {BLACK}oant {WHITE}Alle ynstellingtypes
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Lit alle sykresultaten per ynstelling sjen{}{SILVER}Katagory {BLACK}oant {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Lit alle sykresultaten per ynstelling sjen{}{SILVER}Type {BLACK}oant {WHITE}Alle ynstellingtypes
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Lit alle sykresyltaten per ynstelling sjen{}{SILVER}Katagory {BLACK}oant {WHITE}{STRING} {BLACK}en {SILVER}Type {BLACK}oant {WHITE}Alle ynstellingtypes
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Ut
@@ -2431,6 +2431,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Selektea
 STR_FOUND_TOWN_CITY                                             :{BLACK}Stêd
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Stêden groeien flugger as doarpen{}Ôfhinklik fan ynstellings binne se grutter at se makke wurde
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Strjittenpatroan
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Selektear strjittenpatroan foar dit plak
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Orizjiniel

src/lang/gaelic.txt

@@ -1055,8 +1055,8 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Roghainn
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Aonadan airgeadra
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Tagh aonadan airgeadra
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Aonadan airgeadra
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Tagh aonadan airgeadra
 
 
 ###length 45
@@ -1095,21 +1095,21 @@ STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Gnàthaichte...
 STR_GAME_OPTIONS_CURRENCY_GEL                                   :Lari Cairtbheileach
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :Rial Iorànach
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Fèin-shàbhaladh
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Tagh dè cho tric ’s a thèid an geama fèin-shàbhaladh
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Fèin-shàbhaladh
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Tagh dè cho tric ’s a thèid an geama fèin-shàbhaladh
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Dheth
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Cànan
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Tagh cànan an eadar-aghaidh a chleachdas tu
+STR_GAME_OPTIONS_LANGUAGE                                       :Cànan
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Tagh cànan an eadar-aghaidh a chleachdas tu
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Làn-sgrìn
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Cuir cromag sa bhogsa seo gus OpenTTD a chluiche sa mhodh làn-sgrìn
+STR_GAME_OPTIONS_FULLSCREEN                                     :Làn-sgrìn
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Cuir cromag sa bhogsa seo gus OpenTTD a chluiche sa mhodh làn-sgrìn
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Dùmhlachd-bhreacaidh na sgrìn
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Tagh dùmhlachd-bhreacaidh na sgrìn a chleachdas tu
+STR_GAME_OPTIONS_RESOLUTION                                     :Dùmhlachd-bhreacaidh na sgrìn
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Tagh dùmhlachd-bhreacaidh na sgrìn a chleachdas tu
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Gnàthaichte
 
 
@@ -1123,17 +1123,17 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Gnàthaichte
 
 
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Seata grafaigeachd bunasach
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Tagh an seata grafaigeachd bunasach a chleachdas tu
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Barrachd fiosrachaidh mun t-seata ghrafaigeachd bhunasach
+STR_GAME_OPTIONS_BASE_GRF                                       :Seata grafaigeachd bunasach
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Tagh an seata grafaigeachd bunasach a chleachdas tu
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Barrachd fiosrachaidh mun t-seata ghrafaigeachd bhunasach
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Seata fhuaimean bunasach
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Tagh an seata fhuaimean bunasach a chleachdas tu
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Barrachd fiosrachaidh mun t-seata fhuaimean bhunasach
+STR_GAME_OPTIONS_BASE_SFX                                       :Seata fhuaimean bunasach
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Tagh an seata fhuaimean bunasach a chleachdas tu
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Barrachd fiosrachaidh mun t-seata fhuaimean bhunasach
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Seata ciùil bunasach
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Tagh an seata ciùil bunasach a chleachdas tu
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Barrachd fiosrachaidh mun t-seata chiùil bhunasach
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Seata ciùil bunasach
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Tagh an seata ciùil bunasach a chleachdas tu
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Barrachd fiosrachaidh mun t-seata chiùil bhunasach
 
 
 
@@ -1237,9 +1237,9 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Coibhneil
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Chan eil IF freagarrach ri fhaighinn...{}’S urrainn dhut roghainn dhe IFan a luchdadh a-nuas leis an t-siostam “Susbaint air loidhne"
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Sreang criathraige:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Leudaich a h-uile
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Co-theannaich a h-uile
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Sreang criathraige:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Leudaich a h-uile
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Co-theannaich a h-uile
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(chan eil mìneachadh ri làimh)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Luach bunaiteach: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Seòrsa an roghainn: {ORANGE}{STRING}
@@ -1249,9 +1249,9 @@ STR_CONFIG_SETTING_TYPE_GAME_INGAME                             :Roghainnean a'
 STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :Roghainnean na companaidh (thèid an sàbhaladh leis a' gheama; gun bhuaidh ach air geamannan ùra)
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Roghainnean na companaidh (thèid an sàbhaladh leis a' gheama; gun bhuaidh ach air a' chompanaidh seo)
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Roinn-seòrsa:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Seòrsa:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Cuingichidh seo an liosta gu h-ìosal le criathradh ro-shocraichte
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Roinn-seòrsa:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Seòrsa:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Cuingichidh seo an liosta gu h-ìosal le criathradh ro-shocraichte
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Bunasach (na seall ach roghainnean cudromach)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Adhartach (a’ mhòrchuid dhe na roghainnean)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Eòlaiche (a h-uile roghainn, a’ gabhail a-steach an fheadhainn neònach)
@@ -1268,9 +1268,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Roghainnean na
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Chan eil gin -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Seall na h-uile toradh luirg ’s tu a’ suidheachadh{}{SILVER}Roinn-seòrsa {BLACK}air {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Seall na h-uile toradh luirg ’s tu a’ suidheachadh{}{SILVER}Seòrsa {BLACK}air {WHITE}Gach seòrsa
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Seall na h-uile toradh luirg ’s tu a’ suidheachadh{}{SILVER}Roinn-seòrsa {BLACK}air {WHITE}{STRING} {BLACK}agus {SILVER}Seòrsa {BLACK}air {WHITE}Gach seòrsa
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Seall na h-uile toradh luirg ’s tu a’ suidheachadh{}{SILVER}Roinn-seòrsa {BLACK}air {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Seall na h-uile toradh luirg ’s tu a’ suidheachadh{}{SILVER}Seòrsa {BLACK}air {WHITE}Gach seòrsa
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Seall na h-uile toradh luirg ’s tu a’ suidheachadh{}{SILVER}Roinn-seòrsa {BLACK}air {WHITE}{STRING} {BLACK}agus {SILVER}Seòrsa {BLACK}air {WHITE}Gach seòrsa
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Dheth
@@ -2771,6 +2771,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Tagh meu
 STR_FOUND_TOWN_CITY                                             :{BLACK}Mòr-bhaile
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Fàsaidh mòr-bhailtean nas luaithe na bailtean àbhaisteach{}A' crochadh air na roghainnean, tha iad nas motha nuair a thèid an stèidheachadh
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Co-dhealbhachd rathaidean a' bhaile
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Tagh co-dhealbhachd nan rathaidean aig a' bhaile
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Tùsail
@@ -4204,7 +4205,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Clàr-am
 STR_TIMETABLE_NO_TRAVEL                                         :Na siubhail
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Siubhail (fèin-obrachail; clàr-ama ga chruthachadh leis an ath-òrdugh a làimh)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Siubhail (gun chlàr-ama)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Siubhal le {2:VELOCITY} as motha (gun chlàr-ama)
 STR_TIMETABLE_TRAVEL_FOR                                        :Siubhail fad {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Siubhail fad {STRING} le {VELOCITY} as motha
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Siubhail (fad {STRING} gun chlàr-ama)

src/lang/galician.txt

@@ -2196,6 +2196,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... non
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... Os drivers da GPU provocaron un fallo no xogo. Deshabilitada aceleración por hardware.
 
 # Intro window
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}Nova partida
 STR_INTRO_LOAD_GAME                                             :{BLACK}Cargar partida
@@ -3072,6 +3074,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Seleccio
 STR_FOUND_TOWN_CITY                                             :{BLACK}Cidade
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}As cidades crecen máis rápido que os pobos{}Segundo a configuración, son máis grandes cando se fundan
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Disposición das estradas das poboacións:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Selecciona a disposición das estradas para esta poboación
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Orixinal
@@ -4433,10 +4436,10 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Mostra-l
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Mostra-las ordes do avión. Ctrl+click mostra o horario
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Mostra-los detalles do tren
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Mostra-los detalles do vehículo de estrada
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Mostra-los detalles do barco
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Mostra-los detalles do avión
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Mostra-los detalles do tren. Ctrl+Click para amosar o grupo do tren
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Mostra-los detalles do vehículo. Ctrl+Click para amosar o grupo do vehículo
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Mostra-los detalles do barco. Ctrl+Click para amosar o grupo do barco
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Mostra-los detalles do avión. Ctrl+Click para amosar o grupo do avión
 
 ###length VEHICLE_TYPES
 STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}Acción do tren actual - Click para parar/arrancar o tren
@@ -4760,15 +4763,15 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horario
 STR_TIMETABLE_NO_TRAVEL                                         :Sen viaxe
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Viaxar (automático; programado pola próxima orde manual)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Viaxar (sen horario)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Viaxar polo menos a {2:VELOCITY} (sen horarios)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Viaxar polo menos a {VELOCITY} (sen horarios)
 STR_TIMETABLE_TRAVEL_FOR                                        :Viaxar durante {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Viaxar por {STRING} polo menos a {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Viaxe (para {STRING}, non calendarizada)
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Viaxe (para {STRING}, non calendarizado) con como máximo {VELOCITY}
 STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(permanece por {STRING}, non calendarizado)
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(viaxe para {STRING}, sen calendarizar)
-STR_TIMETABLE_STAY_FOR                                          :e parar durante {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :e viaxar durante {STRING}
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}e parar durante {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}e viaxar durante {STRING}
 
 STR_TIMETABLE_APPROX_TIME                                       :{BLACK}Completar este horario levará aproximadamente {STRING}
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}Levará {STRING} completar este horario
@@ -5876,6 +5879,7 @@ STR_CURRENCY_SHORT_GIGA                                         :{NBSP}bn
 STR_CURRENCY_SHORT_TERA                                         :{NBSP}tn
 
 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}

src/lang/german.txt

@@ -950,13 +950,13 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Hauptans
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spieleinstellungen
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Allgemein
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Wähle allgemeine Einstellungen
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Wähle allgemeine Einstellungen
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafik
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Grafikeinstellungen wählen
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Grafikeinstellungen wählen
 STR_GAME_OPTIONS_TAB_SOUND                                      :Sound
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Sound- und Musikeinstellungen auswählen
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Sound- und Musikeinstellungen auswählen
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Soziales
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Soziale-Medien-Integrationseinstellungen auswählen
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Soziale-Medien-Integrationseinstellungen auswählen
 
 STR_GAME_OPTIONS_VOLUME                                         :Lautstärke
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Sound-Effekte
@@ -965,8 +965,8 @@ STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Musik
 
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Währung
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Währung auswählen
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Währung
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Währung auswählen
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1016,8 +1016,8 @@ STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malaysische Rin
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lettlandischer Lats
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portugiesische Escudo
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Autosicherung
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Abstand zwischen den automatischen Spielesicherungen wählen
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Autosicherung
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Abstand zwischen den automatischen Spielesicherungen wählen
 
 # Autosave dropdown
 ###length 5
@@ -1027,77 +1027,77 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Alle 30 Minuten
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Alle 60 Minuten
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Alle 120 Minuten
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Sprache
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Sprache für die Spieloberfläche auswählen
+STR_GAME_OPTIONS_LANGUAGE                                       :Sprache
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Sprache für die Spieloberfläche auswählen
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% abgeschlossen)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Vollbild
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}OpenTTD im Vollbildmodus spielen
+STR_GAME_OPTIONS_FULLSCREEN                                     :Vollbild
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :OpenTTD im Vollbildmodus spielen
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Bildschirmauflösung
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Bildschirmauflösung auswählen
+STR_GAME_OPTIONS_RESOLUTION                                     :Bildschirmauflösung
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Bildschirmauflösung auswählen
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Andere
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Hardware-Beschleunigung
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Dieses Kästchen ankreuzen, um OpenTTD zu erlauben, die Hardwarebeschleunigung zu verwenden. Eine geänderte Einstellung wird nur beim Spielneustart wirksam
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Hardware-Beschleunigung
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Dieses Kästchen ankreuzen, um OpenTTD zu erlauben, die Hardwarebeschleunigung zu verwenden. Eine geänderte Einstellung wird nur beim Spielneustart wirksam
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Die Einstellung tritt nur nach einem Neustart des Spiels in Kraft
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Dieses Kästchen ankreuzen, um VSync zu aktivieren. Eine geänderte Einstellung wird nur beim Spielneustart wirksam. Funktioniert nur mit aktivierter Hardwarebeschleunigung
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Dieses Kästchen ankreuzen, um VSync zu aktivieren. Eine geänderte Einstellung wird nur beim Spielneustart wirksam. Funktioniert nur mit aktivierter Hardwarebeschleunigung
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Aktueller Treiber: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Aktueller Treiber: {STRING}
 
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Oberflächengröße
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Schieberegler ziehen, um die Größe der Benutzeroberfläche zu wählen. Strg+Ziehen für eine stetige Anpassung
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Größe automatisch erkennen
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Dieses Kästchen ankreuzen, um die Größe der Benutzeroberfläche automatisch zu erkennen
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Oberflächengröße
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Schieberegler ziehen, um die Größe der Benutzeroberfläche zu wählen. Strg+Ziehen für eine stetige Anpassung
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Größe automatisch erkennen
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Dieses Kästchen ankreuzen, um die Größe der Benutzeroberfläche automatisch zu erkennen
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Schrägen skalieren
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Dieses Kästchen ankreuzen, um Schrägen nach der Oberflächengröße zu skalieren
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Schrägen skalieren
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Dieses Kästchen ankreuzen, um Schrägen nach der Oberflächengröße zu skalieren
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Nutze die traditionelle Sprite-Schriftart
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Dieses Kästchen ankreuzen, um die traditionelle Sprite-Schrift mit fester Größe zu verwenden
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Kantenglättung für Schriften
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Dieses Kästchen ankreuzen, um Kantenglättung für skalierbare Schriften zu aktivieren
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Nutze die traditionelle Sprite-Schriftart
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Dieses Kästchen ankreuzen, um die traditionelle Sprite-Schrift mit fester Größe zu verwenden
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Kantenglättung für Schriften
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Dieses Kästchen ankreuzen, um Kantenglättung für skalierbare Schriften zu aktivieren
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}×
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Automatische Datenerhebung
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Bei automatischer Datenerhebung teilnehmen
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Falls aktiviert, wird OpenTTD eine Datenerhebung beim Verlassen des Spiels übertragen
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Über Datenerhebung und Privatsphäre
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Dies öffnet einen Browser mit mehr Informationen über die automatische Datenerhebung
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Vorschau des Datenerhebungsergebnisses
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Zeige die Datenerhebungsergebnisse des gerade laufenden Spiels an
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Automatische Datenerhebung
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Bei automatischer Datenerhebung teilnehmen
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Falls aktiviert, wird OpenTTD eine Datenerhebung beim Verlassen des Spiels übertragen
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Über Datenerhebung und Privatsphäre
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Dies öffnet einen Browser mit mehr Informationen über die automatische Datenerhebung
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Vorschau des Datenerhebungsergebnisses
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Zeige die Datenerhebungsergebnisse des gerade laufenden Spiels an
 
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Bildwiederholrate
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Zu verwendende Bildwiederholrate auswählen
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Bildwiederholrate
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Zu verwendende Bildwiederholrate auswählen
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Wiederholraten größer als 60Hz beeinträchtigen möglicherweise die Performance.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Basisgrafiken
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Zu benutzendes Set an Basisgrafiken auswählen (kann nicht im Spiel geändert werden, nur im Hauptmenü)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Zusatzinformationen zu den Basisgrafiken
+STR_GAME_OPTIONS_BASE_GRF                                       :Basisgrafiken
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Zu benutzendes Set an Basisgrafiken auswählen (kann nicht im Spiel geändert werden, nur im Hauptmenü)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Zusatzinformationen zu den Basisgrafiken
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Basissounds
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Basissounds auswählen (kann nicht im Spiel geändert werden, nur im Hauptmenü)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Zusatzinformationen zu den Basissounds
+STR_GAME_OPTIONS_BASE_SFX                                       :Basissounds
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Basissounds auswählen (kann nicht im Spiel geändert werden, nur im Hauptmenü)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Zusatzinformationen zu den Basissounds
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Basismusikset
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Ein Basismusikset auswählen
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Zusätzliche Informationen über das Basismusikset
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Basismusikset
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Ein Basismusikset auswählen
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Zusätzliche Informationen über das Basismusikset
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Inhalt holen
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Nach neuen und aktualisierten Inhalt zum Herunterladen prüfen
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(keine Plugins für Soziale Medien installiert!)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Bahnsteig:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Zustand des Plugins:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Bahnsteig:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Zustand des Plugins:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Am laufen
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Initialisieren fehlgeschlagen
@@ -1211,10 +1211,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Hoch (kein Effe
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Keine KI gefunden ...{}Verschiedene KI sind via „Erweiterungen herunterladen“ verfügbar
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filter:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Alles ausklappen
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Alles einklappen
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Alle Werte zurücksetzen
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filter:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Alles ausklappen
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Alles einklappen
+STR_CONFIG_SETTING_RESET_ALL                                    :Alle Werte zurücksetzen
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(keine Erklärung verfügbar)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Standardwert: {ORANGE}{STRING}
@@ -1227,9 +1227,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Firmen-Einstell
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Achtung!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Diese Aktion setzt alle Spieleinstellungen auf ihre Standardwerte zurück.{}Sind Sie sicher, dass Sie fortfahren möchten?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategorie:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Art:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Vordefinierte Filter auf die untenstehende Liste anwenden
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategorie:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Art:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Vordefinierte Filter auf die untenstehende Liste anwenden
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Grundlegend (Zeigt nur die wichtigsten Einstellungen)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Erweitert (Zeigt die meisten Einstellungen)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Alle (Zeigt alle Einstellungen, auch die abwegigen)
@@ -1246,9 +1246,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Firmeneinstellu
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Keine -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Um alle Suchergebnisse anzuzeigen, setze{}{SILVER}Kategorie {BLACK}auf {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Um alle Suchergebnisse anzuzeigen, setze{}{SILVER}Typ {BLACK}auf {WHITE}Alle Arten von Einstellungen
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Zeige alle Suchergebnisse an indem{}{SILVER}Kategorie {BLACK}auf {WHITE}{STRING} {BLACK}und {SILVER}Art {BLACK}auf {WHITE}Alle Arten von Einstellungen
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Um alle Suchergebnisse anzuzeigen, setze{}{SILVER}Kategorie {BLACK}auf {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Um alle Suchergebnisse anzuzeigen, setze{}{SILVER}Typ {BLACK}auf {WHITE}Alle Arten von Einstellungen
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Zeige alle Suchergebnisse an indem{}{SILVER}Kategorie {BLACK}auf {WHITE}{STRING} {BLACK}und {SILVER}Art {BLACK}auf {WHITE}Alle Arten von Einstellungen
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Aus
@@ -3035,6 +3035,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Stadtgr
 STR_FOUND_TOWN_CITY                                             :{BLACK}Großstadt
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Großstädte wachsen schneller als normale Städte und sind (abhängig von den Einstellungen) bereits bei der Gründung größer
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Städtischer Straßenbauplan:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Straßenbauplan für diese Stadt auswählen
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
@@ -4712,7 +4713,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Fahrplan
 STR_TIMETABLE_NO_TRAVEL                                         :Nicht unterwegs
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Unterwegs (automatisch; Fahrplan abhängig vom nächsten manuellen Auftrag)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Unterwegs (ohne Fahrplan)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Fahrt (ohne Fahrplan) mit höchstens {2:VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :{STRING} unterwegs
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Fahrt zu {STRING} mit höchstens {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Fahre ({STRING}, ohne Fahrplan)

src/lang/greek.txt

@@ -3166,6 +3166,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Επιλ
 STR_FOUND_TOWN_CITY                                             :{BLACK}Πόλη
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Οι πόλεις αναπτύσσονται ταχύτερα από τις απλές κωμοπόλεις{}Ανάλογα με τις ρυθμίσεις, είναι μεγαλύτερες όταν ιδρύονται
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Επέκταση πόλης:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Κτίρια
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Αύξηση κτιρίων πόλεων
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Δρόμοι
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Αύξηση δρόμων πόλεων
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Σχέδιο δρόμων πόλης
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Επιλογή σχεδίου δρόμων που χρησιμοποιείται για αυτή την πόλη
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Αρχικό
@@ -3789,6 +3795,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Αλλα
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Επέκταση
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Αύξηση μεγέθους της πόλης
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Επέκταση κτιρίων
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Αύξηση κτιρίων της πόλης
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Επέκταση δρόμων
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Αύξηση δρόμων της πόλης
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Διαγραφή
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Διαγραφή της πόλης ολοκληρωτικά
 
@@ -4862,7 +4872,7 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Δρομ
 STR_TIMETABLE_NO_TRAVEL                                         :Μην ταξιδέψεις
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Ταξίδι (αυτόματα· με δρομολόγιο στην επόμενη μη αυτόματη εντολή)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Ταξίδεψε (όχι μεσώ δρομολογίου)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Ταξίδι (μη δρομολογημένο) με μέγιστη ταχύτητα {2:VELOCITY}
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Ταξίδι (μη δρομολογημένο) με μέγιστη ταχύτητα {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Ταξίδεψε για {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Ταξίδεψε για {STRING} με στο μέγιστο {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Ταξίδι (για {STRING}, μη δρομολογημένο)
@@ -6022,3 +6032,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Άνοιγμα ρυθμίσεων badge
+STR_BADGE_CONFIG_RESET                                          :Επαναφορά
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Εικονίδια Badge
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Φίλτρα Badge
+STR_BADGE_CONFIG_PREVIEW                                        :Προεπισκόπιση Εικόνας
+STR_BADGE_CONFIG_NAME                                           :Όνομα
+STR_BADGE_FILTER_ANY_LABEL                                      :Κάθε {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} είναι {STRING}

src/lang/hebrew.txt

@@ -908,8 +908,8 @@ STR_GAME_OPTIONS_TAB_GRAPHICS                                   :גרפיקות
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}מטבע
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}בחירת מטבע
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :מטבע
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :בחירת מטבע
 
 
 ###length 45
@@ -950,67 +950,67 @@ STR_GAME_OPTIONS_CURRENCY_IRR                                   :ריאל איר
 STR_GAME_OPTIONS_CURRENCY_RUB                                   :רובל רוסי
 STR_GAME_OPTIONS_CURRENCY_INR                                   :רופי הודי
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}שמירה אוטומטית
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}בחר פרק זמן בין שמירות אוטומטיות
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :שמירה אוטומטית
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :בחר פרק זמן בין שמירות אוטומטיות
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :כבוי
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}שפה
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}בחר את שפת הממשק
+STR_GAME_OPTIONS_LANGUAGE                                       :שפה
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :בחר את שפת הממשק
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% הסתיים)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}מסך מלא
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}סמן תיבה זו כדי לשחק OpenTTD על כל המסך
+STR_GAME_OPTIONS_FULLSCREEN                                     :מסך מלא
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :סמן תיבה זו כדי לשחק OpenTTD על כל המסך
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}רזלוציית המסך
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}בחר את רזולוציית המסך
+STR_GAME_OPTIONS_RESOLUTION                                     :רזלוציית המסך
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :בחר את רזולוציית המסך
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :אחר
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
 STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :האצת חומרה
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}סמן תיבה זו כדי לאפשר ל-OpenTTD לנסות לבצע האצת חומרה. ההגדרה תיכנס לתוקף לאחר הפעלת המשחק מחדש
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :סמן תיבה זו כדי לאפשר ל-OpenTTD לנסות לבצע האצת חומרה. ההגדרה תיכנס לתוקף לאחר הפעלת המשחק מחדש
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}ההגדרה תיכנס לתוקף לאחר הפעלת המשחק מחדש
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}סמן תיבה זו כדי לבצע סנכרון אנכי (v-sync). ההגדרה תיכנס לתוקף לאחר הפעלת המשחק מחדש. עובד רק כאשר האצת החומרה מופעלת
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :סמן תיבה זו כדי לבצע סנכרון אנכי (v-sync). ההגדרה תיכנס לתוקף לאחר הפעלת המשחק מחדש. עובד רק כאשר האצת החומרה מופעלת
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}מנהל ההתקן הנוכחי: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :מנהל ההתקן הנוכחי: {STRING}
 
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}גודל הממשק
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}זהה גודל אוטומטית
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}סמן תיבה זו כדי לזהות את גודל הממשק אוטומטית
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :גודל הממשק
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :זהה גודל אוטומטית
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :סמן תיבה זו כדי לזהות את גודל הממשק אוטומטית
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}התאם שוליים
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}סמן תיבה זו כדי להתאים את השוליים לפי גודל הממשק
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :התאם שוליים
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :סמן תיבה זו כדי להתאים את השוליים לפי גודל הממשק
 
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}סקר אוטומטי
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}השתתף בסקר אוטומטי
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}כאשר מופעל, OpenTTD יפתח סקר כשתעזוב משחק
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}אודות סקרים ופרטיות
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}פותח דפדפן עם מידע נוסף לגבי הסקר האוטומטי
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}צפייה מקדימה בתוצאות הסקר
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}הצג את תוצאות הסקר של המשחק הנוכחי
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :סקר אוטומטי
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :השתתף בסקר אוטומטי
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :כאשר מופעל, OpenTTD יפתח סקר כשתעזוב משחק
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :אודות סקרים ופרטיות
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :פותח דפדפן עם מידע נוסף לגבי הסקר האוטומטי
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :צפייה מקדימה בתוצאות הסקר
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :הצג את תוצאות הסקר של המשחק הנוכחי
 
 
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}עדכוני סמך מעל 60Hz עלולים להשפיע על ביצועים.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}ערכת גרפיקה בסיסית
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}בחר בערכת גרפיקה בסיסית לשימוש
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}מידע נוסף אודות ערכת הגרפיקה הבסיסית
+STR_GAME_OPTIONS_BASE_GRF                                       :ערכת גרפיקה בסיסית
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :בחר בערכת גרפיקה בסיסית לשימוש
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :מידע נוסף אודות ערכת הגרפיקה הבסיסית
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}ערכת צלילים בסיסיים
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}בחר את ערכת הצלילים הבסיסיים לשימוש
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}מידע נוסף אודות ערכת הצלילים הבסיסיים
+STR_GAME_OPTIONS_BASE_SFX                                       :ערכת צלילים בסיסיים
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :בחר את ערכת הצלילים הבסיסיים לשימוש
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :מידע נוסף אודות ערכת הצלילים הבסיסיים
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}ערכת מוזיקת בסיס
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}בחר בערכת מוזיקת הבסיס לשימוש
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}מידע נוסף אודות ערכת המוזיקה הבסיסית
+STR_GAME_OPTIONS_BASE_MUSIC                                     :ערכת מוזיקת בסיס
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :בחר בערכת מוזיקת הבסיס לשימוש
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :מידע נוסף אודות ערכת המוזיקה הבסיסית
 
 
 
@@ -1117,10 +1117,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :מתירני
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}אין בינות מלאכותיות מתאימות...{}באפשרותך להוריד בינות מלאכותיות בעזרת מערכת ה'תוכן המקוון'
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}מחרוזת סינון:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}הרחב הכל
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}צמצם הכל
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}אפס את כל הערכים
+STR_CONFIG_SETTING_FILTER_TITLE                                 :מחרוזת סינון:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :הרחב הכל
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :צמצם הכל
+STR_CONFIG_SETTING_RESET_ALL                                    :אפס את כל הערכים
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(אין הסבר זמין)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}ערך ברירת מחדל: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}סוג הגדרה: {ORANGE}{STRING}
@@ -1131,9 +1131,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :הגדרת חב
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :הגדרת חברה (מאוחסנת במשחק שמור; משפיעה על החברה הנוכחית בלבד)
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}זהירות!
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}קטגוריה:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}סוג:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}מגביל את הרשימה להלן תוך שימוש בסינון שהוגדר מראש.
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :קטגוריה:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :סוג:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :מגביל את הרשימה להלן תוך שימוש בסינון שהוגדר מראש.
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :הגדרות בסיסיות (הצג רק הגדרות חשובות)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :הגדרות מתקדמות (הצג את רוב ההגדרות)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :הגדרות מומחה (הצג את כל ההגדרות, כולל הגדרות משונות)
@@ -1150,9 +1150,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :הגדרות ח
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- ללא -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}הצג את תוצאות החיפוש בהגדרת {SILVER}הקטגוריה{} {BLACK} ל{WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}הצג את תוצאות החיפוש בהגדרת {SILVER}הסוג{} {BLACK}ל{WHITE}כל סוגי ההגדרות
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}הצג את תוצאות החיפוש בהגדרת{SILVER}הקטגוריה{} {BLACK}ל{WHITE}{STRING} {BLACK}וגם את {SILVER}הסוג {BLACK}ל{WHITE}כל סוגי ההגדרות
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :הצג את תוצאות החיפוש בהגדרת {SILVER}הקטגוריה{} {BLACK} ל{WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :הצג את תוצאות החיפוש בהגדרת {SILVER}הסוג{} {BLACK}ל{WHITE}כל סוגי ההגדרות
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :הצג את תוצאות החיפוש בהגדרת{SILVER}הקטגוריה{} {BLACK}ל{WHITE}{STRING} {BLACK}וגם את {SILVER}הסוג {BLACK}ל{WHITE}כל סוגי ההגדרות
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :כבוי
@@ -2756,6 +2756,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}בחר
 STR_FOUND_TOWN_CITY                                             :{BLACK}עיר
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}ערים גדלות מהר יותר מאשר עיירות{}כתלות בהגדרות, הן גדולות יותר כאשר הן נוסדות
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}מתווה כביש של עיר:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}בחר מתווה כביש לשימוש עבור עיר זו
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}מקורי
@@ -4284,7 +4285,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}לוח
 STR_TIMETABLE_NO_TRAVEL                                         :ללא מסע
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :סע (אוטומטי; לוח זמנים נקבע לפי הפקודה הידנית הבאה)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :(מסע (ללא לוח זמנים
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :סע במהירות שהיא לכל היותר {2:VELOCITY} (ללא לוח זמנים)
 STR_TIMETABLE_TRAVEL_FOR                                        :{STRING} ערוך מסע ל
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :סע למשך {STRING} במהירות שהיא לכל היותר {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :מסע (עבור {STRING}, לא מתוזמן)

src/lang/hindi.txt

@@ -342,12 +342,12 @@ STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}
 
 
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}हार्डवेयर एक्सिलरेशन
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :हार्डवेयर एक्सिलरेशन
 
 
 
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}इंटरफ़ेस का आकार
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :इंटरफ़ेस का आकार
 
 
 
@@ -931,6 +931,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}लघ
 STR_FOUND_TOWN_CITY                                             :{BLACK}शहर
 
 
+
 # Fund new industry window
 
 # Industry cargoes window

src/lang/hungarian.txt

@@ -1041,7 +1041,7 @@ STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORAN
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
 STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Pénznem
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Pénznem kiválasztása
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Pénznem kiválasztása
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1326,7 +1326,7 @@ STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Nincs
 ###length 3
 STR_CONFIG_SETTING_CATEGORY_HIDES                               :Az összes találat megjelenítése:{}A {SILVER}kategória {BLACK}legyen {WHITE}{STRING}
 STR_CONFIG_SETTING_TYPE_HIDES                                   :Az összes találat megjelenítése:{}A {PUSH_COLOUR}{SILVER}típus {POP_COLOUR}legyen {WHITE}Összes beállítástípus
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Az összes találat megjelenítése:{}A {SILVER}kategória {BLACK}legyen {WHITE}{STRING} {BLACK}, a {SILVER}típus {BLACK}pedig {WHITE}Összes beállítástípus
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Az összes találat megjelenítése:{}A {SILVER}kategória {BLACK}legyen {WHITE}{STRING} {BLACK}, a {SILVER}típus {BLACK}pedig {WHITE}Összes beállítástípus
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Ki
@@ -2614,7 +2614,7 @@ STR_NETWORK_SPECTATORS                                          :Megfigyelők
 
 # Network company info join/password
 STR_COMPANY_VIEW_JOIN                                           :{BLACK}Csatlakozás
-STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Csatlakozz és vezesd a vállalatot
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Csatlakozás és a vállalat vezetése
 
 # Network chat
 STR_NETWORK_CHAT_SEND                                           :{BLACK}Elküld
@@ -2984,7 +2984,7 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION                  :{BLACK}Villamos
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD                         :{BLACK}Közút építése egyszerűsített módon. Ctrl+kattintás az út lerombolásához. Shift+kattintással csak a becsült költséget jeleníti meg
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM                         :{BLACK}Villamospálya építése egyszerűsített módon. Ctrl+kattintás a pálya lerombolásához. Shift+kattintással csak a becsült költséget jeleníti meg
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT               :{BLACK}Garázs építése (járművek vételére és karbantartására). Shift+kattintással csak a becsült költséget jeleníti meg
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT               :{BLACK}Villamos remíz építése (járművek megépítésére és javítására). Shift+kattintással csak a becsült költséget jeleníti meg
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT               :{BLACK}Villamosremíz építése (járművek megépítésére és javítására). Shift+kattintással csak a becsült költséget jeleníti meg
 STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD_TO_WAYPOINT               :{BLACK}Útpont építése az úton. Ctrl+kattintás másik csatlakozási pont kiválasztásához. Nyomd meg a Shift billentyűt is, ha csak a költségbecslést szeretnéd megjeleníteni
 STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM_TO_WAYPOINT               :{BLACK}Útpont építése a villamosvonalon. Ctrl+kattintás másik csatlakozási pont kiválasztásához. Nyomd meg a Shift billentyűt is, ha csak a költségbecslést szeretnéd megjeleníteni
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION                      :{BLACK}Buszmegálló építése. Ctrl+kattintással egyesíthető más állomásokkal. Shift+kattintással csak a becsült költséget jeleníti meg
@@ -3137,6 +3137,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}A telep
 STR_FOUND_TOWN_CITY                                             :{BLACK}Város
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Átlagosnál gyorsabban növekedő városok{}Beállítástól függően nagyobbak alapításkor
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Város bővítés:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Épületek
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :A városi épületek növelése
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Utak
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :A városi utak növelése
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Település úthálózat építési mintája:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Válassz úthálózati elrendezést ehhez a városhoz
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Eredeti
@@ -3760,6 +3766,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}A város
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Növelés
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}A település méretének növelése
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Épületek bővítése
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}A városi épületek növelése
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Utak növelése
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}A városi utak növelése
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Töröl
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}A település teljes eltüntetése
 
@@ -3947,7 +3957,7 @@ STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP                          :{BLACK}Repülő
 
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CAPTION                                       :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}A fő nézetet az ellenőrző pontra állítja. Ctrl+kattintással új nézet nyílik az ellenőrzőpontnál
+STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}A fő nézetet az ellenőrzőpontra állítja. Ctrl+kattintással új nézet nyílik az ellenőrzőpontnál
 STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Ellenőrzőpont nevének megváltoztatása
 STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}A fő nézetet a bójára állítja. Ctrl+kattintással új nézet nyílik a bója helyzeténél
 STR_BUOY_VIEW_RENAME_TOOLTIP                                    :{BLACK}Bója nevének megváltoztatása
@@ -4029,10 +4039,10 @@ STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}SZH áth
 STR_COMPANY_VIEW_RELOCATE_HQ_TOOLTIP                            :{BLACK}A vállalat székházának újraépítése máshol a vállalat értékének 1%-áért. Shift+kattintással csak a becsült költséget jeleníti meg
 STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON                          :{BLACK}Részletek
 STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP                         :{BLACK}Részletes információk megtekintése az infrastruktúráról
-STR_COMPANY_VIEW_GIVE_MONEY_BUTTON                              :{BLACK}Adományozz pénzt
-STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP                             :{BLACK}Utalj pénzt ennek a vállalatnak
+STR_COMPANY_VIEW_GIVE_MONEY_BUTTON                              :{BLACK}Pénz adományozása
+STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP                             :{BLACK}Pénz adományozása ennek a vállalatnak
 STR_COMPANY_VIEW_HOSTILE_TAKEOVER_BUTTON                        :{BLACK}Erőszakos átvétel
-STR_COMPANY_VIEW_HOSTILE_TAKEOVER_TOOLTIP                       :{BLACK}Vedd át erőszakkal a vállalat vezetését
+STR_COMPANY_VIEW_HOSTILE_TAKEOVER_TOOLTIP                       :{BLACK}A vállalat vezetésének erőszakos átvétele
 
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Új arc
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Új arc választása az elnöknek
@@ -4321,9 +4331,9 @@ STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Húzz id
 
 ###length VEHICLE_TYPES
 STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}A járműtelepen tartózkodó összes vonat eladása
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Összes garázsban tartózkodó jármű eladása
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Összes dokkban tartózkodó hajó eladása
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Összes hangárban tartózkodó repülő eladása
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}A garázsban tartózkodó összes jármű eladása
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}A dokkban tartózkodó összes hajó eladása
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}A hangárban tartózkodó összes repülő eladása
 
 ###length VEHICLE_TYPES
 STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}A járműtelepen tartózkodó összes vonat automatikus cseréje
@@ -4469,7 +4479,7 @@ STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP                            :{BLACK}Közelí
 STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP                        :{BLACK}Közelítés a repülőgép jelenlegi helyzetére. Dupla kattintással a fő nézetben követni fogja a repülőgépet. Ctrl+kattintással új nézet nyílik a repülőgép helyzeténél
 
 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}A járműtelepre küldi a vonatot. Ctrl+kattintással csak javításra
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Járműtelepre küldi a vonatot. Ctrl+kattintással csak javításra
 STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Garázsba küldi a járművet. Ctrl+kattintással csak javításra
 STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Dokkba küldi a hajót. Ctrl+kattintással csak javításra
 STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Hangárba küldi a repülőgépet. Ctrl+kattintással csak javításra
@@ -4526,12 +4536,12 @@ STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}{VELOCI
 STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}{1:VELOCITY} - Útban {0:WAYPOINT} felé
 STR_VEHICLE_STATUS_HEADING_FOR_DEPOT_VEL                        :{ORANGE}{1:VELOCITY} - Útban {0:DEPOT} felé
 STR_VEHICLE_STATUS_HEADING_FOR_DEPOT_SERVICE_VEL                :{LTBLUE}{1:VELOCITY} - Javítás {0:DEPOT}ban
-STR_VEHICLE_STATUS_HEADING_FOR_DEPOT_UNBUNCH_VEL                :{LTBLUE}{1:VELOCITY} - Csoport bontás és szervizelés itt: {0:DEPOT}
+STR_VEHICLE_STATUS_HEADING_FOR_DEPOT_UNBUNCH_VEL                :{LTBLUE}{1:VELOCITY} - Csoportbontás és szervizelés itt: {0:DEPOT}
 
-STR_VEHICLE_STATUS_CANNOT_REACH_STATION_VEL                     :{LTBLUE}{1:VELOCITY} - {0:STATION} nem elérhető
-STR_VEHICLE_STATUS_CANNOT_REACH_WAYPOINT_VEL                    :{LTBLUE}{1:VELOCITY} - {0:WAYPOINT} nem elérhető,
-STR_VEHICLE_STATUS_CANNOT_REACH_DEPOT_VEL                       :{ORANGE}{1:VELOCITY} - {0:DEPOT} nem elérhető
-STR_VEHICLE_STATUS_CANNOT_REACH_DEPOT_SERVICE_VEL               :{LTBLUE}{1:VELOCITY} - {0:DEPOT} nem elérhető
+STR_VEHICLE_STATUS_CANNOT_REACH_STATION_VEL                     :{LTBLUE}{1:VELOCITY} - {0:STATION} nem érhető el
+STR_VEHICLE_STATUS_CANNOT_REACH_WAYPOINT_VEL                    :{LTBLUE}{1:VELOCITY} - {0:WAYPOINT} nem érhető el
+STR_VEHICLE_STATUS_CANNOT_REACH_DEPOT_VEL                       :{ORANGE}{1:VELOCITY} - {0:DEPOT} nem érhető el
+STR_VEHICLE_STATUS_CANNOT_REACH_DEPOT_SERVICE_VEL               :{LTBLUE}{1:VELOCITY} - {0:DEPOT} nem érhető el
 
 # Vehicle stopped/started animations
 STR_VEHICLE_COMMAND_STOPPED                                     :{RED}Megállítva
@@ -4692,9 +4702,9 @@ STR_ORDER_DROP_UNBUNCH                                          :Csoportbontás
 
 # Depot action tooltips, one per vehicle type
 ###length VEHICLE_TYPES
-STR_ORDER_TRAIN_DEPOT_ACTION_TOOLTIP                            :{BLACK}Válaszd ki a vasúti járműtelepre alkalmazni kívánt műveletet
-STR_ORDER_ROAD_DEPOT_ACTION_TOOLTIP                             :{BLACK}Válaszd ki a garázsra alkalmazni kívánt műveletet
-STR_ORDER_SHIP_DEPOT_ACTION_TOOLTIP                             :{BLACK}Válaszd ki a dokkra alkalmazni kívánt műveletet
+STR_ORDER_TRAIN_DEPOT_ACTION_TOOLTIP                            :{BLACK}Válaszd ki a vasúti járműtelepre alkalmazandó műveletet
+STR_ORDER_ROAD_DEPOT_ACTION_TOOLTIP                             :{BLACK}Válaszd ki a garázsra alkalmazandó műveletet
+STR_ORDER_SHIP_DEPOT_ACTION_TOOLTIP                             :{BLACK}Válaszd ki a dokkra alkalmazandó műveletet
 STR_ORDER_HANGAR_ACTION_TOOLTIP                                 :{BLACK}Válaszd ki a hangárra alkalmazni kívánt műveletet
 ###next-name-looks-similar
 
@@ -4825,7 +4835,7 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Menetren
 STR_TIMETABLE_NO_TRAVEL                                         :Nincs menet
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Menet (automata; menetrend a következő kézi utasítás alapján)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Következő célpontig a menetidő időzítetlen
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Menet {2:VELOCITY} max. sebességgel (nincs menetrend)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Menet {VELOCITY} max. sebességgel (nincs menetrend)
 STR_TIMETABLE_TRAVEL_FOR                                        :Menetidő: {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Menetidő: {STRING} {VELOCITY} max. sebességgel
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Menet ({STRING}ig, időzítetlen)
@@ -5114,7 +5124,7 @@ STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... túl
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... túl sok a település
 STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... nincs több hely a térképen
 STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Útkarbantartás folyamatban
-STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}Nem törölhető ezt a várost...{}{}Egy állomás vagy járműtelep hivatkozik a városra, vagy egy városi tulajdonú mező nem eltávolítható
+STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}A város nem törölhető...{}{}Egy állomás vagy járműtelep hivatkozik a városra, vagy egy városi tulajdonú mező nem távolítható el
 STR_ERROR_STATUE_NO_SUITABLE_PLACE                              :{WHITE}... nincs megfelelő hely egy szobornak a város központjában
 STR_ERROR_CAN_T_BUILD_HOUSE                                     :{WHITE}A házépítés nem lehetséges
 
@@ -5210,7 +5220,7 @@ STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Nem ép
 
 STR_ERROR_CAN_T_RENAME_DEPOT                                    :{WHITE}Nem nevezheted át a járműtelepet...
 
-STR_ERROR_TRAIN_MUST_BE_STOPPED_INSIDE_DEPOT                    :{WHITE}... fűtőhűzban kellene állnia ehhez
+STR_ERROR_TRAIN_MUST_BE_STOPPED_INSIDE_DEPOT                    :{WHITE}... járműtelepen kellene állnia ehhez
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}... garázsban kellene állnia ehhez
 STR_ERROR_SHIP_MUST_BE_STOPPED_INSIDE_DEPOT                     :{WHITE}... dokkban kellene állnia ehhez
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED_INSIDE_HANGAR                :{WHITE}... hangárban kellene állnia ehhez
@@ -5932,21 +5942,21 @@ STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} {COMMA}.
 STR_FORMAT_BUOY_NAME_SERIAL.ba                                  :{TOWN} {COMMA}. sz. Bóján
 
 ###length 2
-STR_FORMAT_WAYPOINT_NAME                                        :{TOWN} Ellenőrző pont
-STR_FORMAT_WAYPOINT_NAME.ba                                     :{TOWN} Ellenőrző ponton
-STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} {COMMA}. sz. Ellenőrző pont
-STR_FORMAT_WAYPOINT_NAME_SERIAL.ba                              :{TOWN} {COMMA}. sz. Ellenőrző ponton
+STR_FORMAT_WAYPOINT_NAME                                        :{TOWN} ellenőrzőpont
+STR_FORMAT_WAYPOINT_NAME.ba                                     :{TOWN} ellenőrzőponton
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} {COMMA}. sz. ellenőrzőpont
+STR_FORMAT_WAYPOINT_NAME_SERIAL.ba                              :{TOWN} {COMMA}. sz. ellenőrzőponton
 
 ###length 6
-STR_FORMAT_DEPOT_NAME_TRAIN                                     :{TOWN} Járműtelep
-STR_FORMAT_DEPOT_NAME_TRAIN_SERIAL                              :{TOWN} {COMMA}. sz. Vasúti járműtelep
-STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE                              :{TOWN} Garázs
-STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE_SERIAL                       :{TOWN} {COMMA}. sz. Garázs
+STR_FORMAT_DEPOT_NAME_TRAIN                                     :{TOWN} járműtelep
+STR_FORMAT_DEPOT_NAME_TRAIN_SERIAL                              :{TOWN} {COMMA}. sz. vasúti járműtelep
+STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE                              :{TOWN} garázs
+STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE_SERIAL                       :{TOWN} {COMMA}. sz. garázs
 STR_FORMAT_DEPOT_NAME_SHIP                                      :{TOWN} Dokk
-STR_FORMAT_DEPOT_NAME_SHIP_SERIAL                               :{TOWN} {COMMA}. sz. Dokk
+STR_FORMAT_DEPOT_NAME_SHIP_SERIAL                               :{TOWN} {COMMA}. sz. dokk
 ###next-name-looks-similar
 
-STR_FORMAT_DEPOT_NAME_AIRCRAFT                                  :{STATION} Hangár
+STR_FORMAT_DEPOT_NAME_AIRCRAFT                                  :{STATION} hangár
 # _SERIAL version of AIRACRAFT doesn't exist
 
 STR_UNKNOWN_STATION                                             :ismeretlen állomás
@@ -6022,3 +6032,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Jelvény beállítások megnyitása
+STR_BADGE_CONFIG_RESET                                          :Visszaállítás
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Jelvény ikonok
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Jelvény szűrők
+STR_BADGE_CONFIG_PREVIEW                                        :Előnézet kép
+STR_BADGE_CONFIG_NAME                                           :Név
+STR_BADGE_FILTER_ANY_LABEL                                      :Bármelyik {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} {STRING}

src/lang/icelandic.txt

@@ -822,8 +822,8 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Stilling
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Gjaldmiðill
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Val á gjaldmiðli
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Gjaldmiðill
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Val á gjaldmiðli
 
 
 ###length 45
@@ -862,21 +862,21 @@ STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Sérsniðinn...
 STR_GAME_OPTIONS_CURRENCY_GEL                                   :Lari
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :Íranskt ríal
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Sjálfvirk vistun
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Tíðni sjálfvirkra vistana
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Sjálfvirk vistun
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Tíðni sjálfvirkra vistana
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Aldrei
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Tungumál
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Tungumál viðmóts
+STR_GAME_OPTIONS_LANGUAGE                                       :Tungumál
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Tungumál viðmóts
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Fylla út í skjá
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Smelltu hér til að OpenTTD fylli út í skjáinn
+STR_GAME_OPTIONS_FULLSCREEN                                     :Fylla út í skjá
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Smelltu hér til að OpenTTD fylli út í skjáinn
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Skjáupplausn
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Stilla skjáupplausn
+STR_GAME_OPTIONS_RESOLUTION                                     :Skjáupplausn
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Stilla skjáupplausn
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :annað
 
 
@@ -890,17 +890,17 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :annað
 
 
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Grunngrafík
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Nota grunngrafíkina
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Frekari upplýsingar um grunngrafíkpakkann
+STR_GAME_OPTIONS_BASE_GRF                                       :Grunngrafík
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Nota grunngrafíkina
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Frekari upplýsingar um grunngrafíkpakkann
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Grunn hljóðasafn
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Veldu grunn hljóðasafn
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Aukaupplýsingar um grunn hljóðasafnið
+STR_GAME_OPTIONS_BASE_SFX                                       :Grunn hljóðasafn
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Veldu grunn hljóðasafn
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Aukaupplýsingar um grunn hljóðasafnið
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Grunntónlistarsafn
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Veld grunntónlistarsafn til að nota
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Auka upplýsingar um grunntónlistarsafnið
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Grunntónlistarsafn
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Veld grunntónlistarsafn til að nota
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Auka upplýsingar um grunntónlistarsafnið
 
 
 
@@ -1002,9 +1002,9 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Eftirgefin
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Engin nothæf gervigreind í boði...{}Þú getur hlaðið niður mörgum gervigreindum í gegnum 'Ná í viðbætur af netinu' viðmótið
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Sía:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Þenja út
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Draga saman
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Sía:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Þenja út
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Draga saman
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(engin skýring til)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Sjálfgefið gildi: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Gerð stillingar: {ORANGE}{STRING}
@@ -1014,7 +1014,7 @@ STR_CONFIG_SETTING_TYPE_GAME_INGAME                             :Leikjastillinga
 STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :Fyrirtækjastillingar (geymdar í vistunarskrám; hefur bara áhrif á nýja leiki)
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Fyrirtækjastillingar (geymdar í vistunarskrám; hefur bara áhrif á núverandi fyrirtæki)
 
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Takmarkar listan hér fyrir neðan við breyttar stillingar
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Takmarkar listan hér fyrir neðan við breyttar stillingar
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Grunnstillingar
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Ítarlegar stillingar
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Mjög ítarlegar stillingar / allar stillingar
@@ -2411,6 +2411,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Velja st
 STR_FOUND_TOWN_CITY                                             :{BLACK}Borg
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Borgir vaxa hraðar en venjulegir bæir{}Möguleiki á aukinni upphafsstærð í stillingum
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Vegaskipulag bæja
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Veldu það skipulag sem þessi bær notar fyrir sína vegi
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Upphaflegt
@@ -3719,7 +3720,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Áætlun
 STR_TIMETABLE_NO_TRAVEL                                         :Engin ferðalög
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Ferðalag (sjálfvirkt; áætlað eftir næstu handvirku skipun)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Ferðalag (ekki sett í áætlun)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Ferðast með hámarkshraða {2:VELOCITY} (ekki áætlað)
 STR_TIMETABLE_TRAVEL_FOR                                        :Ferðast í {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Ferðast í {STRING} með hámarkshraða {VELOCITY}
 STR_TIMETABLE_STAY_FOR                                          :og bíða í {STRING}

src/lang/ido.txt

@@ -1005,6 +1005,7 @@ STR_OBJECT_BUILD_SIZE                                           :{BLACK}Grandeso
 
 
 
+
 # Fund new industry window
 
 # Industry cargoes window

src/lang/indonesian.txt

@@ -924,11 +924,11 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Perlihat
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Opsi permainan
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Umum
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Pilih setingan umum
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Pilih setingan umum
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafik
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Setingan pilih grafis
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Setingan pilih grafis
 STR_GAME_OPTIONS_TAB_SOUND                                      :Suara
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}\Pilih suara dan setingan musik
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :\Pilih suara dan setingan musik
 
 STR_GAME_OPTIONS_VOLUME                                         :Volume
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Efek suara
@@ -936,8 +936,8 @@ STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Musik
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Mata uang
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Pilih mata uang
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Mata uang
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Pilih mata uang
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -985,8 +985,8 @@ STR_GAME_OPTIONS_CURRENCY_INR                                   :India Rupee
 STR_GAME_OPTIONS_CURRENCY_IDR                                   :Rupiah Indonesia
 STR_GAME_OPTIONS_CURRENCY_MYR                                   :Ringgit Malaysia
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Simpan Otomatis
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Pilih selang waktu permainan otomatis disimpan
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Simpan Otomatis
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Pilih selang waktu permainan otomatis disimpan
 
 # Autosave dropdown
 ###length 5
@@ -996,71 +996,71 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Setiap 30 menit
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Setiap 60 menit
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Setiap 120 menit
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Bahasa
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Pilih antar muka bahasa yang akan dipergunakan
+STR_GAME_OPTIONS_LANGUAGE                                       :Bahasa
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Pilih antar muka bahasa yang akan dipergunakan
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% selesai)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Layar Penuh
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Klik cek box ini untuk memainkan OpenTTD dalam layar penuh
+STR_GAME_OPTIONS_FULLSCREEN                                     :Layar Penuh
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Klik cek box ini untuk memainkan OpenTTD dalam layar penuh
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Resolusi Layar
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Pilih resolusi layar yang diinginkan
+STR_GAME_OPTIONS_RESOLUTION                                     :Resolusi Layar
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Pilih resolusi layar yang diinginkan
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :lainnya
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Akselerasi perangkat keras
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK} Centang kotak ini untuk mengizinkan OpenTTD mencoba menggunakan akselerasi perangkat keras. Pengaturan yang diubah hanya akan diterapkan saat permainan dimulai ulang.
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Akselerasi perangkat keras
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     : Centang kotak ini untuk mengizinkan OpenTTD mencoba menggunakan akselerasi perangkat keras. Pengaturan yang diubah hanya akan diterapkan saat permainan dimulai ulang.
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Pengaturan hanya akan berlaku setelah game dimulai ulang
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Centang kotak ini untuk melakukan sinkronisasi layar (v-sync). Pengaturan yang diubah hanya akan diterapkan saat game dimulai ulang. Hanya berfungsi dengan akselerasi perangkat keras diaktifkan.
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Centang kotak ini untuk melakukan sinkronisasi layar (v-sync). Pengaturan yang diubah hanya akan diterapkan saat game dimulai ulang. Hanya berfungsi dengan akselerasi perangkat keras diaktifkan.
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Pengendali piranti: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Pengendali piranti: {STRING}
 
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Ukuran antarmuka
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Geser slider untuk mengatur ukuran antarmuka. Tekan tombol Ctrl untuk pengaturan terus menerus
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Otomatis deteksi ukuran
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Pilih kotak ini untuk mendeteksi ukuran antarmuka secara otomatis
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Ukuran antarmuka
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Geser slider untuk mengatur ukuran antarmuka. Tekan tombol Ctrl untuk pengaturan terus menerus
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Otomatis deteksi ukuran
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Pilih kotak ini untuk mendeteksi ukuran antarmuka secara otomatis
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Skala bevel
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Pilih kotak ini untuk pengaturan perbandingan ukuran bevel dengan ukuran antarmuka
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Skala bevel
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Pilih kotak ini untuk pengaturan perbandingan ukuran bevel dengan ukuran antarmuka
 
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Font anti-alias
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Centang kotak ini untuk font anti-alias yang dapat diubah ukurannya.
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Font anti-alias
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Centang kotak ini untuk font anti-alias yang dapat diubah ukurannya.
 
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Survei Otomatis
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Berpartisipasi pada survey otomatis
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Jika diaktifkan, OpenTTD akan mengirimkan survei saat meninggalkan game
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Tentang survei dan privasi
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Ini akan membuka browser dengan informasi lebih lanjut tentang survei otomatis
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Tampilkan hasil survey
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Tampilkan hasil survey pada game yang berjalan saat ini
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Survei Otomatis
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Berpartisipasi pada survey otomatis
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Jika diaktifkan, OpenTTD akan mengirimkan survei saat meninggalkan game
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Tentang survei dan privasi
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Ini akan membuka browser dengan informasi lebih lanjut tentang survei otomatis
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Tampilkan hasil survey
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Tampilkan hasil survey pada game yang berjalan saat ini
 
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Menampilkan kecepatan refresh
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Pilih laju penyegaran layar yang akan digunakan
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Menampilkan kecepatan refresh
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Pilih laju penyegaran layar yang akan digunakan
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Kecepatan refresh yang lebih tinggi dari 60Hz dapat memengaruhi kinerja.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Set Grafik Dasar
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Pilih grafik dasar yang digunakan (tidak dapat diubah didalam permainan, hanya dari menu utama)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Informasi tambahan tentang set grafik dasar
+STR_GAME_OPTIONS_BASE_GRF                                       :Set Grafik Dasar
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Pilih grafik dasar yang digunakan (tidak dapat diubah didalam permainan, hanya dari menu utama)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Informasi tambahan tentang set grafik dasar
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Set suara dasar
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Pilih set suara dasar yang digunakan (tidak dapat diubah didalam permainan, hanya dari menu utama)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Informasi tambahan tentang set suara dasar
+STR_GAME_OPTIONS_BASE_SFX                                       :Set suara dasar
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Pilih set suara dasar yang digunakan (tidak dapat diubah didalam permainan, hanya dari menu utama)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Informasi tambahan tentang set suara dasar
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Set Musik Dasar
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Pilih musik dasar yang akan digunakan
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Informasi tambahan tentang musik dasar
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Set Musik Dasar
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Pilih musik dasar yang akan digunakan
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Informasi tambahan tentang musik dasar
 
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(tidak ada plugin untuk diintegrasikan dengan platform sosial yang terpasang)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Platform:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Status plugin:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Platform:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Status plugin:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Inisiasi gagal
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_PLATFORM_NOT_RUNNING       :{ORANGE}{STRING} tidak dijalankan
@@ -1169,10 +1169,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Permisif (tidak
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Tidak terdapat pemain AI ...{}anda dapat mengunduh beberapa macam AI lewat "Cari Konten"
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Saring:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Perluas semua
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Persempit semua
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Atur ulang semua pengaturan
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Saring:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Perluas semua
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Persempit semua
+STR_CONFIG_SETTING_RESET_ALL                                    :Atur ulang semua pengaturan
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(penjelasan belum tersedia)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Nilai standar: {ORANGE}{STRING}
@@ -1185,9 +1185,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Setting perusah
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Peringatan!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Tindakan ini akan mengembalikan semua pengaturan gim ke nilai awalnya.{} Anda yakin ingin melanjutkan?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategori:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Jenis:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Batasi daftar dibawah ini menggunakan filter yang telah ditetapkan
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategori:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Jenis:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Batasi daftar dibawah ini menggunakan filter yang telah ditetapkan
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Pengaturan dasar (hanya pengaturan yang penting)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Pengaturan lanjut (lebih banyak pengaturan)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Pengaturan mahir (tampilkan semua, termasuk yang tak biasa)
@@ -1204,9 +1204,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Pengaturan peru
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Tidak ada -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Tampilkan semua pencarian berdasarkan pengaturan{}{SILVER}Kategori {BLACK}sampai {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Tampilkan semua hasil pencarian dengan pengaturan{}{SILVER}Jenis {BLACK}ke {WHITE} Semua jenis pengaturan
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Tampilkan semua hasil pencarian berdasarkan pengaturan{}{SILVER}Kategori {BLACK}sampai {WHITE}{STRING} {BLACK}dan {SILVER}Jenis {BLACK}sampai {WHITE}Semua jenis pengaturan
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Tampilkan semua pencarian berdasarkan pengaturan{}{SILVER}Kategori {BLACK}sampai {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Tampilkan semua hasil pencarian dengan pengaturan{}{SILVER}Jenis {BLACK}ke {WHITE} Semua jenis pengaturan
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Tampilkan semua hasil pencarian berdasarkan pengaturan{}{SILVER}Kategori {BLACK}sampai {WHITE}{STRING} {BLACK}dan {SILVER}Jenis {BLACK}sampai {WHITE}Semua jenis pengaturan
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Tidak
@@ -2933,6 +2933,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Pilih uk
 STR_FOUND_TOWN_CITY                                             :{BLACK}Kota
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Kota tumbuh lebih cepat daripada biasanya{}Tergantung pengaturan, kota dapat lebih besar ketika di danai.
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Tampilan jalan kota:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Pilihlah tampilan jalan yang digunakan utk kota ini
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Asli
@@ -4546,7 +4547,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Daftar J
 STR_TIMETABLE_NO_TRAVEL                                         :Tidak berjalan
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Perjalanan (otomatis; akan dijadwalkan pada perintah manual berikutnya)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Perjalanan belum terjadwal
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Bergerak dengan kecepatan maks. {2:VELOCITY} (not timetabled)
 STR_TIMETABLE_TRAVEL_FOR                                        :Berjalan selama {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Bergerak {STRING} dengan maks. kecepatan {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Berjalan (untuk {STRING}, tidak berjadwal)

src/lang/irish.txt

@@ -876,8 +876,8 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Roghanna
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Aonaid airgeadra
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Aonaid airgeadra a roghnú
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Aonaid airgeadra
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Aonaid airgeadra a roghnú
 
 
 ###length 45
@@ -924,31 +924,31 @@ STR_GAME_OPTIONS_CURRENCY_INR                                   :Rúipí na hInd
 STR_GAME_OPTIONS_CURRENCY_IDR                                   :Rupiah na hIndinéise
 STR_GAME_OPTIONS_CURRENCY_MYR                                   :Ringgit na Malaeisia
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Uathshábháil
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Roghnaigh eatramh idir uathshábhálacha an chluiche
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Uathshábháil
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Roghnaigh eatramh idir uathshábhálacha an chluiche
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :As
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Teanga
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Roghnaigh an teanga comhéadain le húsáid
+STR_GAME_OPTIONS_LANGUAGE                                       :Teanga
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Roghnaigh an teanga comhéadain le húsáid
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% críochnaithe)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Lánscáileán
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Cuir tic sa bhosca seo chun OpenTTD a imirt sa mhód lánscáileáin
+STR_GAME_OPTIONS_FULLSCREEN                                     :Lánscáileán
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Cuir tic sa bhosca seo chun OpenTTD a imirt sa mhód lánscáileáin
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Taifeach scáileáin
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Roghnaigh an taifeach scáileáin le húsáid
+STR_GAME_OPTIONS_RESOLUTION                                     :Taifeach scáileáin
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Roghnaigh an taifeach scáileáin le húsáid
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :eile
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Luasghéarú crua-earraí
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Cuir tic sa bhosca seo chun cead a thabhairt do OpenTTD iarracht a dhéanamh luasghéarú crua-earraí a úsáid. Má athraítear an socrú seo, ní chuirfear i bhfeidhm é ach tar éis an cluiche a atosú.
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Luasghéarú crua-earraí
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Cuir tic sa bhosca seo chun cead a thabhairt do OpenTTD iarracht a dhéanamh luasghéarú crua-earraí a úsáid. Má athraítear an socrú seo, ní chuirfear i bhfeidhm é ach tar éis an cluiche a atosú.
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Ní chuirfear an socrú i bhfeidhm go dtí go ndéanfar an cluiche a atosú
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Cuir tic sa bhosca seo chun v-shioncronú (v-sync) a úsáid ar an scáileán. Má athraítear an socrú seo, ní chuirfear i bhfeidhm é ach tar éis an cluiche a atosú. Ní oibríonn seo ach amháin má tá luasghéarú crua-earraí cumasaithe
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Cuir tic sa bhosca seo chun v-shioncronú (v-sync) a úsáid ar an scáileán. Má athraítear an socrú seo, ní chuirfear i bhfeidhm é ach tar éis an cluiche a atosú. Ní oibríonn seo ach amháin má tá luasghéarú crua-earraí cumasaithe
 
 
 
@@ -958,22 +958,22 @@ STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Cuir tic
 
 
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Ráta athnuachana na taispeána
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Roghnaigh ráta athnuachana an scáileán atá le húsáid
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Ráta athnuachana na taispeána
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Roghnaigh ráta athnuachana an scáileán atá le húsáid
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}D'fhéadfadh rátaí athnuacha os cionn 60Hz tionchar a bheith acu ar an bhfeidhmíocht.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Sraith graifice bunaidh
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Roghnaigh an sraith grafaice bunaidh le húsáid
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Faisnéis breise faoin sraith grafaice bunaidh
+STR_GAME_OPTIONS_BASE_GRF                                       :Sraith graifice bunaidh
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Roghnaigh an sraith grafaice bunaidh le húsáid
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Faisnéis breise faoin sraith grafaice bunaidh
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Sraith fuaimeanna bunaidh
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Roghnaigh an tsraithe fuaimeanna bunaidh le húsáid
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Faisnéis breise faoin tsraith fuaimeanna bunaidh
+STR_GAME_OPTIONS_BASE_SFX                                       :Sraith fuaimeanna bunaidh
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Roghnaigh an tsraithe fuaimeanna bunaidh le húsáid
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Faisnéis breise faoin tsraith fuaimeanna bunaidh
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Sraith ceoil bunaidh
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Roghnaigh an tsraith ceoil bunaidh le húsáid
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Faisnéis breise faoin tsraith ceoil bunaidh
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Sraith ceoil bunaidh
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Roghnaigh an tsraith ceoil bunaidh le húsáid
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Faisnéis breise faoin tsraith ceoil bunaidh
 
 
 
@@ -1079,10 +1079,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Tugtar cead
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Níl aon AI oiriúnach ar fáil...{}Is féidir leat roinnt AI a íoslódáil tríd an gcóras 'Inneachar Ar Líne'
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Teaghrán scagtha:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Fairsingigh gach ceann
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Leacaigh gach ceann
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Athshocraigh gach luach
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Teaghrán scagtha:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Fairsingigh gach ceann
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Leacaigh gach ceann
+STR_CONFIG_SETTING_RESET_ALL                                    :Athshocraigh gach luach
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(níl aon mhíniú ar fáil)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Luach réamhshocraithe: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Cineál socrú: {ORANGE}{STRING}
@@ -1094,9 +1094,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Socrú cuideach
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Rabhadh!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Leis an mbeart seo athshocrófar gach socrú cluiche chuig a réamhshocrú.{}An bhfuil tú cinnte gur mhaith leat leanúint ar aghaidh?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Catagóir:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Cineál:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Cuirtear srian ar an liosta thíos ag úsáid scagairí réamhshocraithe
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Catagóir:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Cineál:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Cuirtear srian ar an liosta thíos ag úsáid scagairí réamhshocraithe
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Bunúsach (ná taispeáin ach socruithe tábhachtacha)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Ardleibhéil (taispeáin formhór na socruithe)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Saineolaí (taispeáin gach socrú, cinn aisteacha ina measc)
@@ -1113,9 +1113,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Socruithe Cuide
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Ceann ar bith -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Taispeáin gach toradh cuardaigh de réir socrú{}{SILVER}Catagóir {BLACK}go {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Taispeáin gach toradh cuardaigh de réir socrú{}{SILVER}Cineál {BLACK}go {WHITE}Gach cineál socrú
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Taispeáin gach toradh cuardaigh de réir socrú{}{SILVER}Catagóir {BLACK}go {WHITE}{STRING} {BLACK}agus {SILVER}Cineál {BLACK}go {WHITE}Gach cineál socrú
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Taispeáin gach toradh cuardaigh de réir socrú{}{SILVER}Catagóir {BLACK}go {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Taispeáin gach toradh cuardaigh de réir socrú{}{SILVER}Cineál {BLACK}go {WHITE}Gach cineál socrú
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Taispeáin gach toradh cuardaigh de réir socrú{}{SILVER}Catagóir {BLACK}go {WHITE}{STRING} {BLACK}agus {SILVER}Cineál {BLACK}go {WHITE}Gach cineál socrú
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :As
@@ -2745,6 +2745,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Roghnaig
 STR_FOUND_TOWN_CITY                                             :{BLACK}Cathair
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Fásann cathracha níos mó ná gnáthbhailte{}Ag brath ar na socruithe, bíonn siad níos mó nuair a bhunaítear iad
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Leagan amach bóithre an bhaile:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Roghnaigh leagan amach na mbóithre don bhaile seo
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Bunaidh
@@ -4286,7 +4287,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Amchlár
 STR_TIMETABLE_NO_TRAVEL                                         :Ná taisteal
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Taisteal (uathoibríoch; curtha ar an gclár ama ag an chéad ordú de láimh eile)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Taisteal (gan amchlár)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Taisteal (gan amchlár) ag {2:VELOCITY} ar a mhéad
 STR_TIMETABLE_TRAVEL_FOR                                        :Taisteal ar feadh {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Taisteal ar feadh {STRING} le {VELOCITY} ar a mhéad
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Taisteal (ar feadh {STRING}, gan amchlár)

src/lang/italian.txt

@@ -949,13 +949,13 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Copia la
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Opzioni di gioco
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Generale
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Scegliere le impostazioni generali
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Scegliere le impostazioni generali
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafica
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Scegliere le impostazioni grafiche
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Scegliere le impostazioni grafiche
 STR_GAME_OPTIONS_TAB_SOUND                                      :Suono
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Scegliere le impostazioni audio e musicali
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Scegliere le impostazioni audio e musicali
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Social
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Scegli le impostazioni di integrazione social
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Scegli le impostazioni di integrazione social
 
 STR_GAME_OPTIONS_VOLUME                                         :Volume
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Effetti sonori
@@ -963,8 +963,8 @@ STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Musica
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valuta
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Selezione della valuta
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Valuta
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Selezione della valuta
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1014,8 +1014,8 @@ STR_GAME_OPTIONS_CURRENCY_MYR                                   :Ringgit malaysi
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lats lettoni
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Escudo portoghese
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Salvataggi automatici
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Seleziona l'intervallo fra i salvataggi automatici della partita
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Salvataggi automatici
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Seleziona l'intervallo fra i salvataggi automatici della partita
 
 # Autosave dropdown
 ###length 5
@@ -1025,77 +1025,77 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Ogni 30 minuti
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Ogni 60 minuti
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Ogni 120 minuti
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Lingua
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Seleziona la lingua da utilizzare per l'interfaccia
+STR_GAME_OPTIONS_LANGUAGE                                       :Lingua
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Seleziona la lingua da utilizzare per l'interfaccia
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% completato)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Schermo intero
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Attiva questa casella per giocate a OpenTTD in modalità schermo intero
+STR_GAME_OPTIONS_FULLSCREEN                                     :Schermo intero
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Attiva questa casella per giocate a OpenTTD in modalità schermo intero
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Risoluzione schermo
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Seleziona la risoluzione dello schermo da utilizzare
+STR_GAME_OPTIONS_RESOLUTION                                     :Risoluzione schermo
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Seleziona la risoluzione dello schermo da utilizzare
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Altra
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Accelerazione hardware
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Seleziona questa opzione per consentire a OpenTTD di utilizzare l'accelerazione hardware. Eventuali cambiamenti avranno effetto solo dopo un riavvio del gioco
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Accelerazione hardware
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Seleziona questa opzione per consentire a OpenTTD di utilizzare l'accelerazione hardware. Eventuali cambiamenti avranno effetto solo dopo un riavvio del gioco
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Le nuove impostazioni avranno effetto solo dopo un riavvio del gioco
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Seleziona questa casella per abilitare la sincronizzazione verticale dello schermo. Un'impostazione modificata verrà applicata solo al riavvio del gioco. Funziona solo con l'accelerazione hardware abilitata
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Seleziona questa casella per abilitare la sincronizzazione verticale dello schermo. Un'impostazione modificata verrà applicata solo al riavvio del gioco. Funziona solo con l'accelerazione hardware abilitata
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Driver attuale: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Driver attuale: {STRING}
 
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Dimensione dell'interfaccia
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Trascinare il cursore per impostare le dimensioni dell'interfaccia. Ctrl+trascina per una regolazione continua
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Rileva automaticamente le dimensioni
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Seleziona questa casella per rilevare automaticamente le dimensioni dell'interfaccia
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Dimensione dell'interfaccia
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Trascinare il cursore per impostare le dimensioni dell'interfaccia. Ctrl+trascina per una regolazione continua
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Rileva automaticamente le dimensioni
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Seleziona questa casella per rilevare automaticamente le dimensioni dell'interfaccia
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Scala smussature
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Seleziona questa casella per ridimensionare le smussature in base alle dimensioni dell'interfaccia
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Scala smussature
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Seleziona questa casella per ridimensionare le smussature in base alle dimensioni dell'interfaccia
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Usa il carattere sprite tradizionale
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Seleziona questa casella se preferisci utilizzare il tradizionale carattere sprite di dimensioni fisse
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Font anti-aliasing
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Seleziona questa casella per applicare l'anti-aliasing ai caratteri ridimensionabili
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Usa il carattere sprite tradizionale
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Seleziona questa casella se preferisci utilizzare il tradizionale carattere sprite di dimensioni fisse
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Font anti-aliasing
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Seleziona questa casella per applicare l'anti-aliasing ai caratteri ridimensionabili
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Sondaggio automatizzato
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Partecipare al sondaggio automatico
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Se abilitato, OpenTTD trasmette un sondaggio quando si lascia una partita.
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Informazioni sul sondaggio e sulla privacy
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Apre un browser con ulteriori informazioni sul sondaggio automatico.
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Anteprima del risultato del sondaggio
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Mostra il risultato del sondaggio della partita in corso
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Sondaggio automatizzato
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Partecipare al sondaggio automatico
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Se abilitato, OpenTTD trasmette un sondaggio quando si lascia una partita.
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Informazioni sul sondaggio e sulla privacy
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Apre un browser con ulteriori informazioni sul sondaggio automatico.
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Anteprima del risultato del sondaggio
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Mostra il risultato del sondaggio della partita in corso
 
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Frequenza di aggiornameno dello schermo
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Seleziona la frequenza di aggiornamento dello schermo da utilizzare
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Frequenza di aggiornameno dello schermo
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Seleziona la frequenza di aggiornamento dello schermo da utilizzare
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Frequenze di aggiornamento maggiori di 60Hz potrebbero impattare le prestazioni.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Pacchetto grafico di base
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selezionare il pacchetto grafico di base da utilizzare (non può essere modificato in gioco, solo dal menu principale).
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Informazioni aggiuntive sul pacchetto grafico di base
+STR_GAME_OPTIONS_BASE_GRF                                       :Pacchetto grafico di base
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Selezionare il pacchetto grafico di base da utilizzare (non può essere modificato in gioco, solo dal menu principale).
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Informazioni aggiuntive sul pacchetto grafico di base
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Pacchetto sonoro di base
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Selezionare il pacchetto di suoni di base da utilizzare (non può essere modificato in gioco, solo dal menu principale).
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Informazioni aggiuntive sul pacchetto sonoro di base
+STR_GAME_OPTIONS_BASE_SFX                                       :Pacchetto sonoro di base
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Selezionare il pacchetto di suoni di base da utilizzare (non può essere modificato in gioco, solo dal menu principale).
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Informazioni aggiuntive sul pacchetto sonoro di base
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Pacchetto musicale di base
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Seleziona il pacchetto musicale di base da utilizzare
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Informazioni aggiuntive sul pacchetto musicale di base
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Pacchetto musicale di base
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Seleziona il pacchetto musicale di base da utilizzare
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Informazioni aggiuntive sul pacchetto musicale di base
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Ottieni contenuto
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Cerca contenuti nuovi e aggiornati da scaricare
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(nessun plugin installato per integrarsi con le piattaforme social)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Piattaforma:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Stato del plugin:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Piattaforma:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Stato del plugin:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}In esecuzione
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Inizializzazione fallita
@@ -1221,10 +1221,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Permissivo (nes
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Nessuna IA adatta disponibile...{}È possibile scaricare numerose IA tramite il sistema 'Contenuti online'
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtro:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Espandi tutti
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Comprimi tutti
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Resetta tutti i valori
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtro:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Espandi tutti
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Comprimi tutti
+STR_CONFIG_SETTING_RESET_ALL                                    :Resetta tutti i valori
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(descrizione non disponibile)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Valore predefinito: {ORANGE}{STRING}
@@ -1237,9 +1237,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Impostazione de
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Attenzione!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Questa azione resetterà tutti i settaggi ai loro valori predefiniti.{}Sei sicuro di voler procedere?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Categoria:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Tipo:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Limita la lista sottostante usando i filtri predefiniti
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Categoria:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Tipo:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Limita la lista sottostante usando i filtri predefiniti
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Di base (solo le impostazioni principali)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Avanzate (la maggior parte delle impostazioni)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Per esperti (tutte le impostazioni, incluse quelle speciali)
@@ -1256,9 +1256,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Impostazioni de
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Nessuna -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Per mostrare tutti i risultati impostare la{}{SILVER}Categoria {BLACK}su {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Per mostrare tutti i risultati impostare il{}{SILVER}Tipo {BLACK}su {WHITE}Tutti i tipi di impostazioni
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Per mostrare tutti i risultati impostare la{}{SILVER}Categoria {BLACK}su {WHITE}{STRING} {BLACK}e il {SILVER}Tipo {BLACK}su {WHITE}Tutti i tipi di impostazioni
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Per mostrare tutti i risultati impostare la{}{SILVER}Categoria {BLACK}su {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Per mostrare tutti i risultati impostare il{}{SILVER}Tipo {BLACK}su {WHITE}Tutti i tipi di impostazioni
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Per mostrare tutti i risultati impostare la{}{SILVER}Categoria {BLACK}su {WHITE}{STRING} {BLACK}e il {SILVER}Tipo {BLACK}su {WHITE}Tutti i tipi di impostazioni
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :No
@@ -3064,6 +3064,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Selezion
 STR_FOUND_TOWN_CITY                                             :{BLACK}Metropoli
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Le metropoli crescono più rapidamente delle normali città.{}A seconda delle impostazioni, sono più grandi quando vengono fondate.
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Disposizione strade:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Seleziona la disposizione delle strade per questa città
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Originale
@@ -4728,7 +4729,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Tabella
 STR_TIMETABLE_NO_TRAVEL                                         :Nessun viaggio
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Viaggia (automatico; orario basato sul successivo ordine manuale)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Viaggia (senza orario)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Viaggia (senza orario) a non più di {2:VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Viaggia per {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Viaggia per {STRING} a non più di {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Viaggia (per {STRING}, senza orario)

src/lang/japanese.txt

@@ -915,11 +915,11 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}この
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}ゲーム設定
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :一般
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}一般設定を開きます
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :一般設定を開きます
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :グラフィック
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}グラフィック設定を開きます
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :グラフィック設定を開きます
 STR_GAME_OPTIONS_TAB_SOUND                                      :サウンド
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}サウンドと音楽の設定を開きます
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :サウンドと音楽の設定を開きます
 
 STR_GAME_OPTIONS_VOLUME                                         :音量
 STR_GAME_OPTIONS_SFX_VOLUME                                     :効果音
@@ -927,8 +927,8 @@ STR_GAME_OPTIONS_MUSIC_VOLUME                                   :音楽
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}通貨単位
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}通貨単位の選択
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :通貨単位
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :通貨単位の選択
 
 
 ###length 45
@@ -975,8 +975,8 @@ STR_GAME_OPTIONS_CURRENCY_INR                                   :インド・ル
 STR_GAME_OPTIONS_CURRENCY_IDR                                   :インドネシア・ルピア
 STR_GAME_OPTIONS_CURRENCY_MYR                                   :マレーシア・リンギット
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}オートセーブ
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}自動保存の間隔を選択します
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :オートセーブ
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :自動保存の間隔を選択します
 
 # Autosave dropdown
 ###length 5
@@ -986,56 +986,56 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :30分毎
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :60分毎
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :120分毎
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}言語
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}ゲームの言語を選択します
+STR_GAME_OPTIONS_LANGUAGE                                       :言語
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :ゲームの言語を選択します
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% 完了)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}フルスクリーン
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}OpenTTD をフルスクリーンでプレイするにはチェックします
+STR_GAME_OPTIONS_FULLSCREEN                                     :フルスクリーン
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :OpenTTD をフルスクリーンでプレイするにはチェックします
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}画面解像度
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}ゲーム画面の解像度を選択します
+STR_GAME_OPTIONS_RESOLUTION                                     :画面解像度
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :ゲーム画面の解像度を選択します
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :その他
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}ハードウェアアクセラレーション
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}ここをチェックしてOpenTTDがハードウェアアクセラレーションを利用するようにします。設定はゲームを再起動した後に適用されます。
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :ハードウェアアクセラレーション
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :ここをチェックしてOpenTTDがハードウェアアクセラレーションを利用するようにします。設定はゲームを再起動した後に適用されます。
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE} この設定は再起動後に適用されます。
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK} 垂直同期
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}ここをチェックして垂直同期を有効にします。設定はゲームを再起動した後に適用されます。ハードウェアアクセラレーションが有効な環境でしか機能しません。
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    : 垂直同期
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :ここをチェックして垂直同期を有効にします。設定はゲームを再起動した後に適用されます。ハードウェアアクセラレーションが有効な環境でしか機能しません。
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}現在のドライバー：{STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :現在のドライバー：{STRING}
 
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}インターフェイスのサイズ
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}スライダーをドラッグでインターフェースの大きさを調整できます。Ctrl押しながらで微調整できます。
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}サイズを自動調整
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}ここをチェックしてインタフェースのサイズを自動調整します。
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :インターフェイスのサイズ
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :スライダーをドラッグでインターフェースの大きさを調整できます。Ctrl押しながらで微調整できます。
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :サイズを自動調整
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :ここをチェックしてインタフェースのサイズを自動調整します。
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}ベベルのスケール
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}ここをチェックするとベベルはインタフェースのサイズに比例します
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :ベベルのスケール
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :ここをチェックするとベベルはインタフェースのサイズに比例します
 
 
 
 
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}画面リフレッシュレート
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}使用する画面のリフレッシュレートを選択します
+STR_GAME_OPTIONS_REFRESH_RATE                                   :画面リフレッシュレート
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :使用する画面のリフレッシュレートを選択します
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}60Hzを超えるリフレッシュレートはパフォーマンスに影響を与える可能性があります。
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}基本グラフィックセット
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}使用するグラフィックセットを選択します
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}基本グラフィックセットについての追加情報
+STR_GAME_OPTIONS_BASE_GRF                                       :基本グラフィックセット
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :使用するグラフィックセットを選択します
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :基本グラフィックセットについての追加情報
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}基本効果音セット
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}使用する効果音セットを選択します
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}基本効果音セットについての追加情報
+STR_GAME_OPTIONS_BASE_SFX                                       :基本効果音セット
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :使用する効果音セットを選択します
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :基本効果音セットについての追加情報
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}基本音楽セット
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}使用する音楽セットを選択します
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}基本音楽セットについての追加情報
+STR_GAME_OPTIONS_BASE_MUSIC                                     :基本音楽セット
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :使用する音楽セットを選択します
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :基本音楽セットについての追加情報
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :コンテンツを取得
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :新しいコンテンツや更新をチェックする
@@ -1144,10 +1144,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :自由放任（
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}適切なAIがありません...{}AIは「オンライン項目を確認」からダウンロード可能です
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}フィルター:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}すべて開く
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}すべて折りたたむ
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}すべての値をリセット
+STR_CONFIG_SETTING_FILTER_TITLE                                 :フィルター:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :すべて開く
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :すべて折りたたむ
+STR_CONFIG_SETTING_RESET_ALL                                    :すべての値をリセット
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :（説明がありません）
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}デフォルト設定: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}設定の種類: {ORANGE}{STRING}
@@ -1159,9 +1159,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :会社設定(
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}注意!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}この操作によりゲームのすべての設定が初期値にリセットされます。{}続行してもよろしいでしょうか?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}カテゴリ:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}種類:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}定義されたフィルタでリストをフィルタリングします。
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :カテゴリ:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :種類:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :定義されたフィルタでリストをフィルタリングします。
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :基本設定（重要な設定のみ表示）
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :詳細設定（より多くの設定を表示）
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :拡張設定(変なものも含めて全設定を表示)
@@ -1178,9 +1178,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :会社設定(
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- なし -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}設定による検索結果をすべて表示{}{SILVER}カテゴリ{BLACK}別{WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}設定による検索結果をすべて表示{}{SILVER}種類{BLACK}別{WHITE}すべての設定タイプ
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}設定による検索結果をすべて表示{}{SILVER}カテゴリ{BLACK}別{WHITE}{STRING} {BLACK}and {SILVER}Type {BLACK}to {WHITE}All setting types
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :設定による検索結果をすべて表示{}{SILVER}カテゴリ{BLACK}別{WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :設定による検索結果をすべて表示{}{SILVER}種類{BLACK}別{WHITE}すべての設定タイプ
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :設定による検索結果をすべて表示{}{SILVER}カテゴリ{BLACK}別{WHITE}{STRING} {BLACK}and {SILVER}Type {BLACK}to {WHITE}All setting types
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :無効
@@ -2861,6 +2861,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}街の
 STR_FOUND_TOWN_CITY                                             :{BLACK}都市
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}都市は街に比べてより早く成長します。{}初期設定によりますが、人口は設立の時点で街よりも多くなります
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}街の道路配置
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}この街の道路配置(区画)を決定します
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}オリジナル
@@ -4452,7 +4453,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}ダイ
 STR_TIMETABLE_NO_TRAVEL                                         :運行計画無
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :該当区間を運行 (次の手動指令により自動設定)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :該当区間を運行 (ダイヤ設定無)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :最高速度{2:VELOCITY}で該当区間を運行 (ダイヤ設定無)
 STR_TIMETABLE_TRAVEL_FOR                                        :{STRING}で該当区間を運行
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :{STRING}で該当区間を運行(最高速度{VELOCITY})
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :運行({0:STRING}・ダイヤ設定無)

src/lang/korean.txt

@@ -441,7 +441,7 @@ STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :게임 종료
 
 STR_SCENEDIT_TOWN_MENU_BUILD_TOWN                               :도시 생성
-STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :건물 건설
+STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :건물 생성
 
 # Settings menu
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :게임 기본 설정
@@ -2196,6 +2196,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... 호
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... GPU 드라이버가 게임을 종료시켰습니다. 하드웨어 가속이 비활성화됩니다
 
 # Intro window
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}
 
 STR_INTRO_NEW_GAME                                              :{BLACK}새 게임
 STR_INTRO_LOAD_GAME                                             :{BLACK}불러오기
@@ -2862,7 +2864,7 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :바깥쪽 시
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :안쪽 시내
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :도시 중심
 
-STR_HOUSE_PICKER_PROTECT_TITLE                                  :도시 발전 방지
+STR_HOUSE_PICKER_PROTECT_TITLE                                  :업그레이드 방지
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :이 건물이 도시가 성장함에 따라 교체되는 것을 막을지 여부를 선택합니다
 STR_HOUSE_PICKER_PROTECT_OFF                                    :끄기
 STR_HOUSE_PICKER_PROTECT_ON                                     :켜기
@@ -3072,6 +3074,12 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}도시
 STR_FOUND_TOWN_CITY                                             :{BLACK}대도시로 만듦
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}대도시는 도시보다 빠르게 성장합니다.{}도시를 만들었을 때, 위 설정에 따라 더욱 커집니다
 
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}도시 확장:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :건물
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :도시의 건물을 확장합니다
+STR_FOUND_TOWN_EXPAND_ROADS                                     :도로
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :도시의 도로를 확장합니다
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}도시 도로 설계:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}이 도시에 사용할 도로 설계를 선택합니다
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}오리지널
@@ -3695,6 +3703,10 @@ STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}이 도
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}확장
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}도시의 크기를 키웁니다.
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}건물 확장
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}도시의 건물을 확장합니다
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}도로 확장
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}도시의 도로를 확장합니다
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}삭제
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}이 도시를 완전히 삭제
 
@@ -4760,7 +4772,7 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}시간
 STR_TIMETABLE_NO_TRAVEL                                         :운행정보 없음
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :이동 (자동; 다음 경로에 의해 시간표 작성)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :운행 (시간표가 작성되지 않음)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :최대 {2:VELOCITY}의 속력으로 운행 (시간표 작성 안 됨)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :최대 {VELOCITY}의 속력으로 운행 (시간표 작성 안 됨)
 STR_TIMETABLE_TRAVEL_FOR                                        :{STRING}에 걸쳐 운행
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :{0:STRING} 동안 최대 {1:VELOCITY}의 속력으로 운행
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :운행 ({STRING} 동안, 시간표 작성 안 됨)
@@ -5916,3 +5928,11 @@ STR_SHIP                                                        :{G=f}{BLACK}{SH
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :배지 설정을 엽니다
+STR_BADGE_CONFIG_RESET                                          :초기화
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}배지 아이콘
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}배지 필터
+STR_BADGE_CONFIG_PREVIEW                                        :미리보기 이미지
+STR_BADGE_CONFIG_NAME                                           :이름
+STR_BADGE_FILTER_ANY_LABEL                                      :모든 {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} = {STRING}

src/lang/latin.txt

@@ -1046,8 +1046,8 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Ludi opt
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Unitates nummi
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Electio unitatum nummi
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Unitates nummi
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Electio unitatum nummi
 
 
 ###length 45
@@ -1087,21 +1087,21 @@ STR_GAME_OPTIONS_CURRENCY_GEL                                   :Lari Georgiana
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :Regalis Iranica
 STR_GAME_OPTIONS_CURRENCY_RUB                                   :Novus Rubelus Russicus
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Servare automatice
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Eligere crebritatem automatice ludum servandi
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Servare automatice
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Eligere crebritatem automatice ludum servandi
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Numquam
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Lingua
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Eligere linguam interfaciei
+STR_GAME_OPTIONS_LANGUAGE                                       :Lingua
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Eligere linguam interfaciei
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Cunctum scrinium
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Optione electa, OpenTTD cuncto scrinio ostenditur
+STR_GAME_OPTIONS_FULLSCREEN                                     :Cunctum scrinium
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Optione electa, OpenTTD cuncto scrinio ostenditur
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Resolutio scrinii
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Eligere resolutio scrinii adhibenda
+STR_GAME_OPTIONS_RESOLUTION                                     :Resolutio scrinii
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Eligere resolutio scrinii adhibenda
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :alia
 
 
@@ -1115,17 +1115,17 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :alia
 
 
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Fundamentum graphicum
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Eligere fundamentum graphicum adhibendum
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Indicia additicia de hoc fundamento graphico
+STR_GAME_OPTIONS_BASE_GRF                                       :Fundamentum graphicum
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Eligere fundamentum graphicum adhibendum
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Indicia additicia de hoc fundamento graphico
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Fundamentum sonicum
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Eligere fundamentum sonicum adhibendum
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Indicia additicia de hoc fundamento sonico
+STR_GAME_OPTIONS_BASE_SFX                                       :Fundamentum sonicum
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Eligere fundamentum sonicum adhibendum
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Indicia additicia de hoc fundamento sonico
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Fundamentum musicum
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Eligere fundamentum musicum adhibendum
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Indicia additicia de hoc fundamento musico
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Fundamentum musicum
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Eligere fundamentum musicum adhibendum
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Indicia additicia de hoc fundamento musico
 
 
 
@@ -1229,9 +1229,9 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Longe
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Nullae IA parabiles sunt...{}Potes arcessere nunullas IA in 'Inventario Interretiale'
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Series colans:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Omnia expandere
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Omnia collocare
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Series colans:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Omnia expandere
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Omnia collocare
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(nulla explicatio parabilis)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Valor solitus: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Electionis typus: {ORANGE}{STRING}
@@ -1241,9 +1241,9 @@ STR_CONFIG_SETTING_TYPE_GAME_INGAME                             :Electio ludi (i
 STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :Electio societatis (inclusa in ludis servatis; modo ludos novos afficit)
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Electio societatis (inclusa in ludo servato; modo societatem currentem afficit)
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Categoria:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Typus:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Definit indicem optionum ut solum electiones simplices aut mutatae monstrentur
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Categoria:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Typus:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Definit indicem optionum ut solum electiones simplices aut mutatae monstrentur
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Electiones simplices (modo monstrare electiones magni momenti)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Electiones doctae (monstrare pleras electiones)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Electiones peritae (monstrare omnes electiones, etiam insolitas)
@@ -1260,9 +1260,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Electiones soci
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Nullae -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Monstrare eventum investigationis optione separatum{}{SILVER}Categoria {BLACK}ad {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Monstrare eventum investigationis optione separatum{}{SILVER}Typus {BLACK}ad {WHITE}Omnes electionis typi
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Monstrare eventum investigationis optione separatum{}{SILVER}Categoria {BLACK}ad {WHITE}{STRING} {BLACK}et {SILVER}Typus {BLACK}ad {WHITE}Omnes electionis typi
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Monstrare eventum investigationis optione separatum{}{SILVER}Categoria {BLACK}ad {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Monstrare eventum investigationis optione separatum{}{SILVER}Typus {BLACK}ad {WHITE}Omnes electionis typi
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Monstrare eventum investigationis optione separatum{}{SILVER}Categoria {BLACK}ad {WHITE}{STRING} {BLACK}et {SILVER}Typus {BLACK}ad {WHITE}Omnes electionis typi
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Non
@@ -2767,6 +2767,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Eligere
 STR_FOUND_TOWN_CITY                                             :{BLACK}Urbs
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Urbes crescunt oppidis celerius{}Etiam maiores sunt cum conduntur
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Dispositio viarum oppidi:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Eligere dispositionem viarum huic oppido adhibendam
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Originalis
@@ -4195,7 +4196,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horarius
 STR_TIMETABLE_NO_TRAVEL                                         :(Non est navigandum)
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Iter (horarius curatur a secundo fixo iusso)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Iter (sine horario)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Iter cum {2:VELOCITY} velocitas maxima (sine horario)
 STR_TIMETABLE_TRAVEL_FOR                                        :Iter {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Iter {STRING} cum {VELOCITY} velocitas maxima
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Iter ({STRING}, sine horario)

src/lang/latvian.txt

@@ -2431,7 +2431,7 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Pievieno
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Atsvaidzināt serveri
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Atsvaidzināt servera informāciju
 
-STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET                  :Meklēt internetā
+STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET                  :Meklēt tiešsaistē
 STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET_TOOLTIP          :{BLACK}Meklēt publiskos serverus internetā
 STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN                       :{BLACK}Meklēt LAN
 STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN_TOOLTIP               :{BLACK}Meklēt serverus lokālajā tīklā
@@ -3077,6 +3077,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Izvēlē
 STR_FOUND_TOWN_CITY                                             :{BLACK}Pilsēta
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Pilsētas aug straujāk kā parastas apdzīvotās vietas{}Atkarībā no iestatījumiem, dibināšanas brīdī pilsētas ir lielākas
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Pilsētas ceļu izskats:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Atlasīt šajā pilsētā lietojamo ceļu izkārtojumu
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Sākotnēji
@@ -3917,14 +3918,14 @@ STR_FINANCES_SECTION_CONSTRUCTION                               :{GOLD}Būvniec
 STR_FINANCES_SECTION_NEW_VEHICLES                               :{GOLD}Jauni transportlīdzekļi
 STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS                        :{GOLD}Vilcieni
 STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS                 :{GOLD}Autotransportlīdzekļi
-STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS                     :{GOLD}Lidaparāts
+STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS                     :{GOLD}LidaparātI
 STR_FINANCES_SECTION_SHIP_RUNNING_COSTS                         :{GOLD}Kuģi
 STR_FINANCES_SECTION_INFRASTRUCTURE                             :{GOLD}Infrastruktūra
 STR_FINANCES_SECTION_TRAIN_REVENUE                              :{GOLD}Vilcieni
 STR_FINANCES_SECTION_ROAD_VEHICLE_REVENUE                       :{GOLD}Autotransportlīdzekļi
-STR_FINANCES_SECTION_AIRCRAFT_REVENUE                           :{GOLD}Lidaparāts
+STR_FINANCES_SECTION_AIRCRAFT_REVENUE                           :{GOLD}Lidaparāti
 STR_FINANCES_SECTION_SHIP_REVENUE                               :{GOLD}Kuģi
-STR_FINANCES_SECTION_LOAN_INTEREST                              :{GOLD}Aizdevuma procents
+STR_FINANCES_SECTION_LOAN_INTEREST                              :{GOLD}Aizdevuma procenti
 STR_FINANCES_SECTION_OTHER                                      :{GOLD}Citi
 
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Kopā
@@ -4772,7 +4773,7 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Saraksts
 STR_TIMETABLE_NO_TRAVEL                                         :Bez braukšanas
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Ceļot (automātiski; pēc nākamā manuālā rīkojuma saraksta)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Braukšana (nav sarakstā)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Braukt ar ne vairāk kā {2:VELOCITY} (nav sarakstā)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Braukt ar ne vairāk kā {VELOCITY} (nav sarakstā)
 STR_TIMETABLE_TRAVEL_FOR                                        :Braukt līdz {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Braukt uz {STRING} ar ne vairāk kā {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Ceļot (priekš {STRING}, nav sarakstā)
@@ -5928,3 +5929,7 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
 
 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Atvērt nozīmītes konfigurāciju
+STR_BADGE_CONFIG_RESET                                          :Atiestatīt
+STR_BADGE_CONFIG_PREVIEW                                        :Priekšskatīt attēlu
+STR_BADGE_CONFIG_NAME                                           :Nosaukums

src/lang/lithuanian.txt

@@ -1130,13 +1130,13 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Įkelti
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Pagrindinės nuostatos
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Bendras
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Pasirinkti bendrus nustatymus
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Pasirinkti bendrus nustatymus
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Vaizdas
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Pasirinkti vaizdo nustatymus
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Pasirinkti vaizdo nustatymus
 STR_GAME_OPTIONS_TAB_SOUND                                      :Garsas
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Pasirinkti garso ir muzikos nustatymus
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Pasirinkti garso ir muzikos nustatymus
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Socialumas
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Pasirinkti socialumo integracijos nustatymus
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Pasirinkti socialumo integracijos nustatymus
 
 STR_GAME_OPTIONS_VOLUME                                         :Tūris
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Garso efektai
@@ -1145,8 +1145,8 @@ STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Muzika
 
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valiuta
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Valiutos pasirinkimas
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Valiuta
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Valiutos pasirinkimas
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1196,8 +1196,8 @@ STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malaizijos ring
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :Latvių latas
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portugalijos eskudai
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Automatinis išsaugojimas
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Pasirink, kaip dažnai išsaugoti žaidimą
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Automatinis išsaugojimas
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Pasirink, kaip dažnai išsaugoti žaidimą
 
 # Autosave dropdown
 ###length 5
@@ -1207,77 +1207,77 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :Kas 30 minuči
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :Kas 60 minučių
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :Kas 120 minučių
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Kalba
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Pasirinkite aplinkos kalbą
+STR_GAME_OPTIONS_LANGUAGE                                       :Kalba
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Pasirinkite aplinkos kalbą
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% baigtumas)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Per visą ekraną
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Pažymėkite šį langelį, jeigu norite OpenTTD žaisti visame ekrane
+STR_GAME_OPTIONS_FULLSCREEN                                     :Per visą ekraną
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Pažymėkite šį langelį, jeigu norite OpenTTD žaisti visame ekrane
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Ekrano raiška
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Pasirinkite ekrano raišką
+STR_GAME_OPTIONS_RESOLUTION                                     :Ekrano raiška
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Pasirinkite ekrano raišką
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Kita
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Aparatinis spartinimas
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Pažymėkite šį langelį, jei norite, kad OpenTTD taikytų aparatinį spartinimą. Kad nuostata įsigaliotų, reiks perkrauti OpenTTD
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Aparatinis spartinimas
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Pažymėkite šį langelį, jei norite, kad OpenTTD taikytų aparatinį spartinimą. Kad nuostata įsigaliotų, reiks perkrauti OpenTTD
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Kad pakeitimai įsigaliotų, reikia paleisti OpenTTD iš naujo
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}Vertikalioji sinchronizacija (VSync)
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Pažymėkite šį langelį, norėdami v-sync ekraną. Pakeistas nustatymas bus pritaikytas tik paleidus žaidimą iš naujo. Veikia tik įjungus aparatūros pagreitį
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :Vertikalioji sinchronizacija (VSync)
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Pažymėkite šį langelį, norėdami v-sync ekraną. Pakeistas nustatymas bus pritaikytas tik paleidus žaidimą iš naujo. Veikia tik įjungus aparatūros pagreitį
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Dabartinė tvarkyklė: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Dabartinė tvarkyklė: {STRING}
 
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Sąsajos dydis
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}Vilkite slankiklį, kad nustatyti sąsajos dydį. Vilkite laikant nuspaustą Ctrl klavišą nuolatiniam reguliavimui
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Automatinis dydžio nustatymas
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Pažymėkite šį langelį, kad automatiškai aptiktumėte sąsajos dydį
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Sąsajos dydis
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Vilkite slankiklį, kad nustatyti sąsajos dydį. Vilkite laikant nuspaustą Ctrl klavišą nuolatiniam reguliavimui
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Automatinis dydžio nustatymas
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Pažymėkite šį langelį, kad automatiškai aptiktumėte sąsajos dydį
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Skalės nuožulniai
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Pažymėkite šį langelį, jei norite keisti kampus pagal sąsajos dydį
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Skalės nuožulniai
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Pažymėkite šį langelį, jei norite keisti kampus pagal sąsajos dydį
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Naudoti tradicišką spruklių šriftą
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Pažymėkite šį langelį, jeigu teikiate pirmenybę tradiciškui fiksuoto dydžio spruklio raštui
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Išlyginti šriftus
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Pasirinkite šį langelį, kad išlyginti šriftus
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Naudoti tradicišką spruklių šriftą
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Pažymėkite šį langelį, jeigu teikiate pirmenybę tradiciškui fiksuoto dydžio spruklio raštui
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Išlyginti šriftus
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Pasirinkite šį langelį, kad išlyginti šriftus
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Automatinė apklausa
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}Dalyvauti automatinėje apklausoje
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Automatinė apklausa
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :Dalyvauti automatinėje apklausoje
 STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Kai įjungta, OpenTTD išeinant iš žaidimo išsiųs apklausą
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Apie apklausą ir privatumą
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Atidaryti naršyklę su daugiau informacijos apie automatizuotą apklausą
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Peržiūrėti apklausos rezultatus
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Rodyti dabartinio žaidimo apklausos rezultatą
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Apie apklausą ir privatumą
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Atidaryti naršyklę su daugiau informacijos apie automatizuotą apklausą
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Peržiūrėti apklausos rezultatus
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Rodyti dabartinio žaidimo apklausos rezultatą
 
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Ekrano kadrų dažnis
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Pasirinkite pageidaujamą ekrano kadrų dažnį
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Ekrano kadrų dažnis
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Pasirinkite pageidaujamą ekrano kadrų dažnį
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Didesnis nei 60Hz kadrų dažnis gali sulėtinti žaidimą.
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Bazinis grafikos rinkinys
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Pasirinkti naudojimui bazinį grafikos rinkinį (negali būti pakeista žaidime, tik pagrindiniame ekrane)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Papildoma informacija apie bazinės grafikos rinkinį
+STR_GAME_OPTIONS_BASE_GRF                                       :Bazinis grafikos rinkinys
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Pasirinkti naudojimui bazinį grafikos rinkinį (negali būti pakeista žaidime, tik pagrindiniame ekrane)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Papildoma informacija apie bazinės grafikos rinkinį
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Bazinis garsų rinkinys
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Pasirinkite, kurį bazinių garsų rinkinį naudoti (negali būti pakeista žaidime, tik pagrindiniame ekrane)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Papildoma informacija apie bazinių garsų rinkinį
+STR_GAME_OPTIONS_BASE_SFX                                       :Bazinis garsų rinkinys
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Pasirinkite, kurį bazinių garsų rinkinį naudoti (negali būti pakeista žaidime, tik pagrindiniame ekrane)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Papildoma informacija apie bazinių garsų rinkinį
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Bazinis muzikos rinkinys
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Pasirinkti naudojimui bazinę muziką
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Papildoma informacija apie bazinę muziką
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Bazinis muzikos rinkinys
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Pasirinkti naudojimui bazinę muziką
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Papildoma informacija apie bazinę muziką
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Parsisiųsti turinį
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Tikrinti, ar nėra naujo ir atnaujinto turinio atsisiuntimui
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(plėtinių socialinių platformų integravimui nėra įdiegta)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Platforma:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Papildinio būsena:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Platforma:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Papildinio būsena:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Veikia
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Nepavyko inicijuoti
@@ -1387,10 +1387,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Atlaidus (jokio
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Nerasta tinkamų DI...{}Galite parsisiųsti keletą DI naudonat 'Turinio internete' sistemą
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filtras:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Išskleisti viską
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Suskleisti viską
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}Iš naujo nustatyti visas vertes
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filtras:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Išskleisti viską
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Suskleisti viską
+STR_CONFIG_SETTING_RESET_ALL                                    :Iš naujo nustatyti visas vertes
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(paaiškinimo nėra)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Numatytoji reikšmė: {ORANGE}{STRING}
@@ -1403,9 +1403,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :kompanijos (įr
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Atsargiai!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Šis veiksmas iš naujo nustatys visus žaidimo nustatymus į numatytąsias vertes.{}Ar tikrai norite tęsti?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategorija:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Tipas:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Rodyti tik tam tikros rūšies nuostatas
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategorija:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Tipas:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Rodyti tik tam tikros rūšies nuostatas
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Pagrindinės nuostatos
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Sudėtingesnės nuostatos
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Visos nuostatos
@@ -1422,9 +1422,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Kompanijos (įr
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Nėra -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Rodyti visus paeiškos rezultatus nustatant{}{SILVER}kategoriją{BLACK}į {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Rodyti visus paeiškos rezultatus nustatant{}{SILVER}tipą {BLACK}į {WHITE}„Visos nuostatos“
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Rodyti visus paieškos rezultatus nustatant{}{SILVER}kategoriją {BLACK}į {WHITE}{STRING} {BLACK}bei {SILVER}tipą {BLACK}į {WHITE}„Visos nuostatos“
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Rodyti visus paeiškos rezultatus nustatant{}{SILVER}kategoriją{BLACK}į {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Rodyti visus paeiškos rezultatus nustatant{}{SILVER}tipą {BLACK}į {WHITE}„Visos nuostatos“
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Rodyti visus paieškos rezultatus nustatant{}{SILVER}kategoriją {BLACK}į {WHITE}{STRING} {BLACK}bei {SILVER}tipą {BLACK}į {WHITE}„Visos nuostatos“
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Ne
@@ -3152,6 +3152,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Išsirin
 STR_FOUND_TOWN_CITY                                             :{BLACK}Miestas
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Didemiesčiai auga greičiau nei įprasti miestai{}Pagal tam tikras nuostatas, jie didesni, nuo atsiradimo
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Miesto kelių išdėstymas:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Pasirinkti kelio išdėstymą šiam miestui
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Originalus
@@ -4835,7 +4836,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Tvarkara
 STR_TIMETABLE_NO_TRAVEL                                         :Nėra kelionių
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Kelionė (automatinė; į tvarkaraštį bus įtraukta kitos užduoties)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Kelionė (nėra tvarkaraštyje)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Vykti ne didesniu, nei {2:VELOCITY} greičiu (kelionės trukmė nenustatyta)
 STR_TIMETABLE_TRAVEL_FOR                                        :Keliauti {STRING.ka}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Vykti {STRING} ne didesniu, nei {VELOCITY} greičiu
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Vykti ({STRING.ka}, neįtraukiant į tvarkaraštį)

src/lang/luxembourgish.txt

@@ -958,13 +958,13 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}Setzt d'
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spill Optiounen
 
 STR_GAME_OPTIONS_TAB_GENERAL                                    :Generell
-STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :{BLACK}Wiel generell Astellungen aus
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :Wiel generell Astellungen aus
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :Grafik
-STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :{BLACK}Wiel Grafik-Astellungen aus
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :Wiel Grafik-Astellungen aus
 STR_GAME_OPTIONS_TAB_SOUND                                      :Sound
-STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :{BLACK}Wiel Sound- a Musikastellungen aus
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Wiel Sound- a Musikastellungen aus
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Social
-STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :{BLACK}Wiel Astellungen déi mat Social Media ze dinn hunn
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Wiel Astellungen déi mat Social Media ze dinn hunn
 
 STR_GAME_OPTIONS_VOLUME                                         :Volume
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Soundeffekter
@@ -973,8 +973,8 @@ STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Musik
 
 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Währungseenheet
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Währungseenheet wielen
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Währungseenheet
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Währungseenheet wielen
 
 STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
 
@@ -1025,8 +1025,8 @@ STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lettesch Lat
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portugieseschen Escudo
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Ukrainesch Hryvnia
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Autospäicheren
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Wiel den Intervall aus fir d'Autospäicherung
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Autospäicheren
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Wiel den Intervall aus fir d'Autospäicherung
 
 # Autosave dropdown
 ###length 5
@@ -1036,77 +1036,77 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES             :All 30 Minuten
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES             :All 60 Minuten
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES            :All 120 Minuten
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Sprooch
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Wielt d'Interfacesprooch aus
+STR_GAME_OPTIONS_LANGUAGE                                       :Sprooch
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Wielt d'Interfacesprooch aus
 STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE                            :{STRING} ({NUM}% fäerdeg)
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Vollbild
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Klick dës Optioun un fir OpenTTD am Vollbild ze spillen
+STR_GAME_OPTIONS_FULLSCREEN                                     :Vollbild
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Klick dës Optioun un fir OpenTTD am Vollbild ze spillen
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Bildopléisung
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Wielt d'Bildopléisung
+STR_GAME_OPTIONS_RESOLUTION                                     :Bildopléisung
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Wielt d'Bildopléisung
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :Aaner
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}
 
-STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Hardwarebeschleunegung
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Dës Optioun wielen, dass OpenTTD Hardwarebeschleunigung dierf notzen. Wäert just geännert ginn wann d'Spill nei gestart gëtt
+STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Hardwarebeschleunegung
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Dës Optioun wielen, dass OpenTTD Hardwarebeschleunigung dierf notzen. Wäert just geännert ginn wann d'Spill nei gestart gëtt
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}D'Astellung huet réicht en Afloss no engem Neistart vum Spill
 
-STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}VSync
-STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :{BLACK}Wiel des Optioun fir de V-Sync unzeman. Des gëtt eréit no engem Neistart benotzt. Funktionéiert nëmmen wann Hardwarebeschleunigung un ass
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
+STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Wiel des Optioun fir de V-Sync unzeman. Des gëtt eréit no engem Neistart benotzt. Funktionéiert nëmmen wann Hardwarebeschleunigung un ass
 
-STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Aktuellen Driver: {STRING}
+STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Aktuellen Driver: {STRING}
 
 
-STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :{BLACK}Interfacegréisst
-STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :{BLACK}De Slider zéien fir d'Gréisst vum Interface ze änneren. Ctrl+Zéien fir eng kontinuéierlech Ännerung
-STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :{BLACK}Gréisst autom. erkennen
-STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :{BLACK}Klick dës Optioun fir d'Interfacegréisst automatesch anzestellen
+STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Interfacegréisst
+STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :De Slider zéien fir d'Gréisst vum Interface ze änneren. Ctrl+Zéien fir eng kontinuéierlech Ännerung
+STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Gréisst autom. erkennen
+STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Klick dës Optioun fir d'Interfacegréisst automatesch anzestellen
 
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :{BLACK}Bevels skaléiren
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :{BLACK}Klick dës Optioun fir d'Bevels mat der Gréisst vum Interface ze skaléiren
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Bevels skaléiren
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Klick dës Optioun fir d'Bevels mat der Gréisst vum Interface ze skaléiren
 
-STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :{BLACK}Traditionell Spriteschrëft benotzen
-STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :{BLACK}Klick dës Optioun wanns du déi traditionell fix-Gréisst Spriteschrëft wëlls
-STR_GAME_OPTIONS_GUI_FONT_AA                                    :{BLACK}Anti-alias Schrëften
-STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :{BLACK}Klick dës Optioun fir verännerbar Schrëften ze anti-aliasen
+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Traditionell Spriteschrëft benotzen
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Klick dës Optioun wanns du déi traditionell fix-Gréisst Spriteschrëft wëlls
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :Anti-alias Schrëften
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Klick dës Optioun fir verännerbar Schrëften ze anti-aliasen
 
 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x
 
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :{BLACK}Automatesch Emfro
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :{BLACK}An enger automatescher Emfro matmaachen
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :{BLACK}Falls ugeschalt schéckt OpenTTD eng Emfro wann d'Spill ausgemet gëtt
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :{BLACK}Iwwert Emfroen an Dateschutz
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :{BLACK}Dëst start e Browser mat méi Informatiounen iwwert d'automatesch Emfro
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :{BLACK}Preview op d'Emfroresultat
-STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Weis d'Resultat vun der Emfro vum aktuelle Spill un
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME                       :Automatesch Emfro
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY                             :An enger automatescher Emfro matmaachen
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP                     :Falls ugeschalt schéckt OpenTTD eng Emfro wann d'Spill ausgemet gëtt
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK                        :Iwwert Emfroen an Dateschutz
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Dëst start e Browser mat méi Informatiounen iwwert d'automatesch Emfro
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Preview op d'Emfroresultat
+STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Weis d'Resultat vun der Emfro vum aktuelle Spill un
 
 
-STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Bildfrequenz
-STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Wiel d'Frequenz vum Bildschirm aus
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Bildfrequenz
+STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Wiel d'Frequenz vum Bildschirm aus
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Bildfrequenzen iwwert 60Hz kënnen d'Leeschtung beaflossen
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Basis Grafikset
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Wielt de Basis Grafikset dee soll benotzt ginn (kann net am Spill geännert ginn, nëmmen am Haaptmenu)
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Méi Infos iwwert de Basis Grafikset
+STR_GAME_OPTIONS_BASE_GRF                                       :Basis Grafikset
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Wielt de Basis Grafikset dee soll benotzt ginn (kann net am Spill geännert ginn, nëmmen am Haaptmenu)
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Méi Infos iwwert de Basis Grafikset
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Basis Soundset
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Wiel de Basis Soundset dee soll benotzt ginn (kann net am Spill geännert ginn, nëmmen am Haaptmenu)
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Méi Informatiounen iwwer d'Basis Soundset
+STR_GAME_OPTIONS_BASE_SFX                                       :Basis Soundset
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Wiel de Basis Soundset dee soll benotzt ginn (kann net am Spill geännert ginn, nëmmen am Haaptmenu)
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Méi Informatiounen iwwer d'Basis Soundset
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Basis Musikset
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Wiel de Basis Musikset dee soll benotzt ginn
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Méi Informatiounen iwwer de Basis Musikset
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Basis Musikset
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Wiel de Basis Musikset dee soll benotzt ginn
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Méi Informatiounen iwwer de Basis Musikset
 
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Inhalt eroflueden
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Sich no neiem an geupdateten Inhalt fir erofzelueden
 
 STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(keng Plugins déi mat Social Platforms kommunizéiren installéiert)
 
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{BLACK}{STRING} ({STRING})
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :{BLACK}Plattform:
-STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :{BLACK}Pluginstatus:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Plattform:
+STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE                            :Pluginstatus:
 
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_RUNNING                    :{GREEN}Leeft
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_STATE_FAILED                     :{RED}Konnt net initialiséiren
@@ -1220,10 +1220,10 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Fräizügeg (ke
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Keng KI fonnt...{}{}KI kënnen iwwert den 'Online Content' system downgeload ginn
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Filter:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Alles erweideren
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Alles reduzéiren
-STR_CONFIG_SETTING_RESET_ALL                                    :{BLACK}All Wäerter zerécksetzen
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Filter:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Alles erweideren
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Alles reduzéiren
+STR_CONFIG_SETTING_RESET_ALL                                    :All Wäerter zerécksetzen
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(keng Erklärung verfügbar)
 STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Standardwäert: {ORANGE}{STRING}
@@ -1236,9 +1236,9 @@ STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Firmenastellung
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_CAPTION        :{WHITE}Opgepasst!
 STR_CONFIG_SETTING_RESET_ALL_CONFIRMATION_DIALOG_TEXT           :{WHITE}Des Aktioun setzt all Wäerter op hier Standardastellungen zeréck.{}Bass du sécher, fir weiderzefueren?
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategorie:
-STR_CONFIG_SETTING_RESTRICT_TYPE                                :{BLACK}Typ:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Limitéiert d'Lëscht mat virdefinéierten Filter
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategorie:
+STR_CONFIG_SETTING_RESTRICT_TYPE                                :Typ:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Limitéiert d'Lëscht mat virdefinéierten Filter
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Basis (nëmmen wichteg Astellungen)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Erweidert (weist déi meescht Astellungen)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Expertenastellungen (all Astellungen, och komescher)
@@ -1255,9 +1255,9 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Firmenastellung
 
 STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Keng -
 ###length 3
-STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Weis all Sich-Resultater no der Astellung{}{SILVER}Kategorie {BLACK}bis {WHITE}{STRING}
-STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Weis all Sich-Resultater no der Astellung{}{SILVER}Typ {BLACK}bis {WHITE}All Astellungstypen
-STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Weis all Sich-Resultater no der Astellung{}{SILVER}Kategorie {BLACK}bis {WHITE}{STRING} {BLACK}an {SILVER}Typ {BLACK}bis {WHITE}All Astellungstypen
+STR_CONFIG_SETTING_CATEGORY_HIDES                               :Weis all Sich-Resultater no der Astellung{}{SILVER}Kategorie {BLACK}bis {WHITE}{STRING}
+STR_CONFIG_SETTING_TYPE_HIDES                                   :Weis all Sich-Resultater no der Astellung{}{SILVER}Typ {BLACK}bis {WHITE}All Astellungstypen
+STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :Weis all Sich-Resultater no der Astellung{}{SILVER}Kategorie {BLACK}bis {WHITE}{STRING} {BLACK}an {SILVER}Typ {BLACK}bis {WHITE}All Astellungstypen
 
 ###length 3
 STR_CONFIG_SETTING_OFF                                          :Aus
@@ -3066,6 +3066,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Wiel d'S
 STR_FOUND_TOWN_CITY                                             :{BLACK}Stad
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Stied wuessen méi schnell wéi Dierfer{}Ofhängeg vun den Astellungen, sinn se méi grouss am Ufank
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Stroosselayout vun der Stad:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Stroosselayout fir des Stad wielen
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
@@ -4754,7 +4755,6 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Zäitpla
 STR_TIMETABLE_NO_TRAVEL                                         :Net ënnerwee
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Rees (automatesch; Zäitplang durch manuell Opträg)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Ënnerwee (ouni Zäitplang)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Fuer maximal {2:VELOCITY} (ouni Zäitplang)
 STR_TIMETABLE_TRAVEL_FOR                                        :Ënnerwee während {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Fiert während {STRING} mat maximal {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Fuer (während {STRING}, ouni Zäitplang)

src/lang/macedonian.txt

@@ -1372,6 +1372,7 @@ STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Игра
 
 
 
+
 # Fund new industry window
 STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Изгради
 

src/lang/malay.txt

@@ -826,8 +826,8 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Pilihan
 
 
 
-STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Unit kewangan
-STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Pilihan unit kewangan
+STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :Unit kewangan
+STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :Pilihan unit kewangan
 
 
 ###length 45
@@ -865,21 +865,21 @@ STR_GAME_OPTIONS_CURRENCY_ZAR                                   :South African R
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Sesuaikan...
 STR_GAME_OPTIONS_CURRENCY_GEL                                   :Georgian Lari
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Simpanan automatik
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Pilih tempoh untuk simpanan permainan automatik
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Simpanan automatik
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Pilih tempoh untuk simpanan permainan automatik
 
 # Autosave dropdown
 ###length 5
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Matikan
 
-STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Bahasa
-STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Pilih bahasa antaramuka yang ingin digunakan
+STR_GAME_OPTIONS_LANGUAGE                                       :Bahasa
+STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :Pilih bahasa antaramuka yang ingin digunakan
 
-STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Skrin Penuh
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Tanda kotak ini untuk bermain OpenTTD dalam mod skrin penuh
+STR_GAME_OPTIONS_FULLSCREEN                                     :Skrin Penuh
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :Tanda kotak ini untuk bermain OpenTTD dalam mod skrin penuh
 
-STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Resolusi Skrin
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Pilih resolusi skrin untuk digunakan
+STR_GAME_OPTIONS_RESOLUTION                                     :Resolusi Skrin
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :Pilih resolusi skrin untuk digunakan
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :lain
 
 
@@ -893,17 +893,17 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :lain
 
 
 
-STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Set grafik asas
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Pilih set grafik asas untuk digunakan
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Maklumat tambahan tentang set grafik asas ini
+STR_GAME_OPTIONS_BASE_GRF                                       :Set grafik asas
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :Pilih set grafik asas untuk digunakan
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :Maklumat tambahan tentang set grafik asas ini
 
-STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Set bunyi asas
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Pilih set bunyi asas untuk digunakan
-STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Maklumat tambahan tentang set bunyi asas ini
+STR_GAME_OPTIONS_BASE_SFX                                       :Set bunyi asas
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :Pilih set bunyi asas untuk digunakan
+STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :Maklumat tambahan tentang set bunyi asas ini
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Set muzik asas
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Pilih set muzik asas yang akan digunakan
-STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Maklumat lebih tentang set muzik asas
+STR_GAME_OPTIONS_BASE_MUSIC                                     :Set muzik asas
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :Pilih set muzik asas yang akan digunakan
+STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Maklumat lebih tentang set muzik asas
 
 
 
@@ -1007,9 +1007,9 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Mengizinkan
 STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Tiada AI yang bersesuaian...{}Anda boleh memuat turun beberapa AI dari sistem 'Kandungan Atas Talian'
 
 # Settings tree in the Game Options window
-STR_CONFIG_SETTING_FILTER_TITLE                                 :{BLACK}Tapis baris:
-STR_CONFIG_SETTING_EXPAND_ALL                                   :{BLACK}Kembangkan semua
-STR_CONFIG_SETTING_COLLAPSE_ALL                                 :{BLACK}Musnahkan semua
+STR_CONFIG_SETTING_FILTER_TITLE                                 :Tapis baris:
+STR_CONFIG_SETTING_EXPAND_ALL                                   :Kembangkan semua
+STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Musnahkan semua
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(Tiada penjelasan)
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Nilai lalai: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Jenis tetapan: {ORANGE}{STRING}
@@ -1019,8 +1019,8 @@ STR_CONFIG_SETTING_TYPE_GAME_INGAME                             :Tetapan permain
 STR_CONFIG_SETTING_TYPE_COMPANY_MENU                            :Tetapan syarikat (disimpan di simpanan; berkesan hanya permainan baru)
 STR_CONFIG_SETTING_TYPE_COMPANY_INGAME                          :Tetapan syarikat (disimpan di penyimpanan; hanya berkesan kepada syarikat semasa)
 
-STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :{BLACK}Kategori:
-STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Hadkan senarai di bawah menggunakan penapis yang telah ditetapkan
+STR_CONFIG_SETTING_RESTRICT_CATEGORY                            :Kategori:
+STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :Hadkan senarai di bawah menggunakan penapis yang telah ditetapkan
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Asas (menunjukkan tetapan yang penting sahaja)
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Terperinci (tunjukkan kebanyakan tetapan)
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Expert (memaparkan semua tetapan, termasuk yang pelik)
@@ -2305,6 +2305,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Pilih sa
 STR_FOUND_TOWN_CITY                                             :{BLACK}Bandar
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Bandaraya membesar dengan lebih cepat daripada bandar{}Bergantung kepada tetapan, bandaraya akan lebih besar sewaktu dibina
 
+
 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Susunan jalanraya bandar:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Pilih susunan jalanraya untuk bandar ini
 STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Asal