Merge branch 'master' into jgrpp

# Conflicts:
#	src/fileio.cpp
#	src/group_gui.cpp
#	src/industry.h
#	src/lang/korean.txt
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/linkgraphjob.h
#	src/linkgraph/linkgraphschedule.cpp
#	src/linkgraph/linkgraphschedule.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/town_cmd.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,47 @@
+## Motivation / Problem
+
+<!--
+Describe here shortly
+* For bug fixes:
+    * What problem does this solve?
+    * If there is already an issue, link the issue, otherwise describe the problem here.
+* For features or gameplay changes:
+    * What was the motivation to develop this feature?
+    * Does this address any problem with the gameplay or interface?
+    * Which group of players do you think would enjoy this feature?
+-->
+
+
+## Description
+
+<!--
+Describe here shortly
+* For bug fixes:
+    * How is the problem solved?
+* For features or gameplay changes:
+    * What does this feature do?
+    * How does it improve/solve the situation described under 'motivation'.
+-->
+
+
+## Limitations
+
+<!--
+Describe here
+* Is the problem solved in all scenarios?
+* Is this feature complete? Are there things that could be added in the future?
+* Are there things that are intentionally left out?
+* Do you know of a bug or corner case that does not work?
+-->
+
+
+## Checklist for review
+
+Some things are not automated, and forgotten often. This list is a reminder for the reviewers.
+* The bug fix is important enough to be backported? (label: 'backport requested')
+* This PR affects the save game format? (label 'savegame upgrade')
+* This PR affects the GS/AI API? (label 'needs review: Script API')
+    * ai_changelog.hpp, gs_changelog.hpp need updating.
+    * The compatibility wrappers (compat_*.nut) need updating.
+* This PR affects the NewGRF API? (label 'needs review: NewGRF')
+    * [PR must be added to API tracker](https://wiki.openttd.org/en/Development/NewGRF/Specification%20Status)

cmake/InstallAndPackage.cmake

@@ -115,13 +115,9 @@ elseif(UNIX)
     # With FHS, we can create deb/rpm/... Without it, they would be horribly broken
     # and not work. The other way around is also true; with FHS they are not
     # usable, and only flat formats work.
-    if(OPTION_INSTALL_FHS)
-        set(CPACK_GENERATOR "DEB")
-        include(PackageDeb)
-    else()
+    if(NOT OPTION_INSTALL_FHS)
         set(CPACK_GENERATOR "TXZ")
-    endif()
-
+    else()
         find_program(LSB_RELEASE_EXEC lsb_release)
         execute_process(COMMAND ${LSB_RELEASE_EXEC} -is
             OUTPUT_VARIABLE LSB_RELEASE_ID
@@ -129,17 +125,28 @@ elseif(UNIX)
         )
         if(NOT LSB_RELEASE_ID)
             set(PLATFORM "generic")
+            set(CPACK_GENERATOR "TXZ")
+
+            message(WARNING "Unknown Linux distribution found for packaging; can only pack to a txz. Please consider creating a Pull Request to add support for this distribution.")
         elseif(LSB_RELEASE_ID STREQUAL "Ubuntu" OR LSB_RELEASE_ID STREQUAL "Debian")
             execute_process(COMMAND ${LSB_RELEASE_EXEC} -cs
                 OUTPUT_VARIABLE LSB_RELEASE_CODENAME
                 OUTPUT_STRIP_TRAILING_WHITESPACE
             )
             string(TOLOWER "${LSB_RELEASE_ID}-${LSB_RELEASE_CODENAME}" PLATFORM)
+
+            set(CPACK_GENERATOR "DEB")
+            include(PackageDeb)
         else()
-        message(FATAL_ERROR "Unknown Linux distribution found for packaging; please consider creating a Pull Request to add support for this distribution.")
+            set(PLATFORM "unknown")
+            set(CPACK_GENERATOR "TXZ")
+
+            message(WARNING "Unknown LSB-based Linux distribution '${LSB_RELEASE_ID}' found for packaging; can only pack to a txz. Please consider creating a Pull Request to add support for this distribution.")
         endif()
 
         set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-linux-${PLATFORM}-${CPACK_SYSTEM_NAME}")
+    endif()
+
 else()
     message(FATAL_ERROR "Unknown OS found for packaging; please consider creating a Pull Request to add support for this OS.")
 endif()

src/ai/ai_gui.cpp

@@ -92,8 +92,8 @@ struct AIListWindow : public Window {
 		if (GetConfig(slot)->HasScript()) {
 			ScriptInfo *info = GetConfig(slot)->GetInfo();
 			int i = 0;
-			for (ScriptInfoList::const_iterator it = this->info_list->begin(); it != this->info_list->end(); it++, i++) {
-				if ((*it).second == info) {
+			for (const auto &item : *this->info_list) {
+				if (item.second == info) {
 					this->selected = i;
 					break;
 				}
@@ -132,10 +132,11 @@ struct AIListWindow : public Window {
 					DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_LEFT, y + WD_MATRIX_TOP, this->slot == OWNER_DEITY ? STR_AI_CONFIG_NONE : STR_AI_CONFIG_RANDOM_AI, this->selected == -1 ? TC_WHITE : TC_ORANGE);
 					y += this->line_height;
 				}
-				ScriptInfoList::const_iterator it = this->info_list->begin();
-				for (int i = 1; it != this->info_list->end(); i++, it++) {
+				int i = 0;
+				for (const auto &item : *this->info_list) {
+					i++;
 					if (this->vscroll->IsVisible(i)) {
-						DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_RIGHT, y + WD_MATRIX_TOP, (*it).second->GetName(), (this->selected == i - 1) ? TC_WHITE : TC_ORANGE);
+						DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_RIGHT, y + WD_MATRIX_TOP, item.second->GetName(), (this->selected == i - 1) ? TC_WHITE : TC_ORANGE);
 						y += this->line_height;
 					}
 				}
@@ -143,9 +144,10 @@ struct AIListWindow : public Window {
 			}
 			case WID_AIL_INFO_BG: {
 				AIInfo *selected_info = nullptr;
-				ScriptInfoList::const_iterator it = this->info_list->begin();
-				for (int i = 1; selected_info == nullptr && it != this->info_list->end(); i++, it++) {
-					if (this->selected == i - 1) selected_info = static_cast<AIInfo *>((*it).second);
+				int i = 0;
+				for (const auto &item : *this->info_list) {
+					i++;
+					if (this->selected == i - 1) selected_info = static_cast<AIInfo *>(item.second);
 				}
 				/* Some info about the currently selected AI. */
 				if (selected_info != nullptr) {
@@ -345,11 +347,10 @@ struct AISettingsWindow : public Window {
 	{
 		visible_settings.clear();
 
-		ScriptConfigItemList::const_iterator it = this->ai_config->GetConfigList()->begin();
-		for (; it != this->ai_config->GetConfigList()->end(); it++) {
-			bool no_hide = (it->flags & SCRIPTCONFIG_DEVELOPER) == 0;
+		for (const auto &item : *this->ai_config->GetConfigList()) {
+			bool no_hide = (item.flags & SCRIPTCONFIG_DEVELOPER) == 0;
 			if (no_hide || _settings_client.gui.ai_developer_tools) {
-				visible_settings.push_back(&(*it));
+				visible_settings.push_back(&item);
 			}
 		}
 

src/ai/ai_scanner.cpp

@@ -61,8 +61,8 @@ void AIScannerInfo::RegisterAPI(class Squirrel *engine)
 AIInfo *AIScannerInfo::SelectRandomAI() const
 {
 	uint num_random_ais = 0;
-	for (ScriptInfoList::const_iterator it = this->info_single_list.begin(); it != this->info_single_list.end(); it++) {
-		AIInfo *i = static_cast<AIInfo *>((*it).second);
+	for (const auto &item : info_single_list) {
+		AIInfo *i = static_cast<AIInfo *>(item.second);
 		if (i->UseAsRandomAI()) num_random_ais++;
 	}
 
@@ -101,20 +101,10 @@ AIInfo *AIScannerInfo::FindInfo(const char *nameParam, int versionParam, bool fo
 	strecpy(ai_name, nameParam, lastof(ai_name));
 	strtolower(ai_name);
 
-	AIInfo *info = nullptr;
-	int version = -1;
-
 	if (versionParam == -1) {
 		/* We want to load the latest version of this AI; so find it */
 		if (this->info_single_list.find(ai_name) != this->info_single_list.end()) return static_cast<AIInfo *>(this->info_single_list[ai_name]);
-
-		/* If we didn't find a match AI, maybe the user included a version */
-		char *e = strrchr(ai_name, '.');
-		if (e == nullptr) return nullptr;
-		*e = '\0';
-		e++;
-		versionParam = atoi(e);
-		/* Continue, like we were calling this function with a version. */
+		return nullptr;
 	}
 
 	if (force_exact_match) {
@@ -123,15 +113,18 @@ AIInfo *AIScannerInfo::FindInfo(const char *nameParam, int versionParam, bool fo
 		seprintf(ai_name_tmp, lastof(ai_name_tmp), "%s.%d", ai_name, versionParam);
 		strtolower(ai_name_tmp);
 		if (this->info_list.find(ai_name_tmp) != this->info_list.end()) return static_cast<AIInfo *>(this->info_list[ai_name_tmp]);
+		return nullptr;
 	}
 
+	AIInfo *info = nullptr;
+	int version = -1;
+
 	/* See if there is a compatible AI which goes by that name, with the highest
 	 *  version which allows loading the requested version */
-	ScriptInfoList::iterator it = this->info_list.begin();
-	for (; it != this->info_list.end(); it++) {
-		AIInfo *i = static_cast<AIInfo *>((*it).second);
+	for (const auto &item : this->info_list) {
+		AIInfo *i = static_cast<AIInfo *>(item.second);
 		if (strcasecmp(ai_name, i->GetName()) == 0 && i->CanLoadFromVersion(versionParam) && (version == -1 || i->GetVersion() > version)) {
-			version = (*it).second->GetVersion();
+			version = item.second->GetVersion();
 			info = i;
 		}
 	}
@@ -164,8 +157,8 @@ AILibrary *AIScannerLibrary::FindLibrary(const char *library, int version)
 	strtolower(library_name);
 
 	/* Check if the library + version exists */
-	ScriptInfoList::iterator iter = this->info_list.find(library_name);
-	if (iter == this->info_list.end()) return nullptr;
+	ScriptInfoList::iterator it = this->info_list.find(library_name);
+	if (it == this->info_list.end()) return nullptr;
 
-	return static_cast<AILibrary *>((*iter).second);
+	return static_cast<AILibrary *>((*it).second);
 }

src/console_cmds.cpp

@@ -1241,7 +1241,24 @@ DEF_CONSOLE_CMD(ConStartAI)
 
 	AIConfig *config = AIConfig::GetConfig((CompanyID)n);
 	if (argc >= 2) {
-		config->Change(argv[1], -1, true);
+		config->Change(argv[1], -1, false);
+
+		/* If the name is not found, and there is a dot in the name,
+		 * try again with the assumption everything right of the dot is
+		 * the version the user wants to load. */
+		if (!config->HasScript()) {
+			char *name = stredup(argv[1]);
+			char *e = strrchr(name, '.');
+			if (e != nullptr) {
+				*e = '\0';
+				e++;
+
+				int version = atoi(e);
+				config->Change(name, version, true);
+			}
+			free(name);
+		}
+
 		if (!config->HasScript()) {
 			IConsoleWarning("Failed to load the specified AI");
 			return true;

src/economy.cpp

@@ -768,7 +768,7 @@ bool AddInflation(bool check_year)
 	 * inflation doesn't add anything after that either; it even makes playing
 	 * it impossible due to the diverging cost and income rates.
 	 */
-	if (check_year && (_cur_year - _settings_game.game_creation.starting_year) >= (ORIGINAL_MAX_YEAR - ORIGINAL_BASE_YEAR)) return true;
+	if (check_year && (_cur_year < ORIGINAL_BASE_YEAR || _cur_year >= ORIGINAL_MAX_YEAR)) return true;
 
 	if (_economy.inflation_prices == MAX_INFLATION || _economy.inflation_payment == MAX_INFLATION) return true;
 
@@ -960,6 +960,14 @@ void StartupEconomy()
 	_economy.infl_amount_pr = max(0, _settings_game.difficulty.initial_interest - 1);
 	_economy.fluct = GB(Random(), 0, 8) + 168;
 
+	if (_settings_game.economy.inflation) {
+		/* Apply inflation that happened before our game start year. */
+		int months = (min(_cur_year, ORIGINAL_MAX_YEAR) - ORIGINAL_BASE_YEAR) * 12;
+		for (int i = 0; i < months; i++) {
+			AddInflation(false);
+		}
+	}
+
 	/* Set up prices */
 	RecomputePrices();
 

src/fileio.cpp

@@ -46,10 +46,6 @@ struct Fio {
 	FILE *handles[MAX_FILE_SLOTS];         ///< array of file handles we can have open
 	const char *filenames[MAX_FILE_SLOTS]; ///< array of filenames we (should) have open
 	char *shortnames[MAX_FILE_SLOTS];      ///< array of short names for spriteloader's use
-#if defined(LIMITED_FDS)
-	uint open_handles;                     ///< current amount of open handles
-	uint usage_count[MAX_FILE_SLOTS];      ///< count how many times this file has been opened
-#endif /* LIMITED_FDS */
 };
 
 static Fio _fio; ///< #Fio instance.
@@ -94,18 +90,6 @@ void FioSeekTo(size_t pos, int mode)
 	}
 }
 
-#if defined(LIMITED_FDS)
-static void FioRestoreFile(int slot)
-{
-	/* Do we still have the file open, or should we reopen it? */
-	if (_fio.handles[slot] == nullptr) {
-		DEBUG(misc, 6, "Restoring file '%s' in slot '%d' from disk", _fio.filenames[slot], slot);
-		FioOpenFile(slot, _fio.filenames[slot]);
-	}
-	_fio.usage_count[slot]++;
-}
-#endif /* LIMITED_FDS */
-
 /**
  * Switch to a different file and seek to a position.
  * @param slot Slot number of the new file.
@@ -113,12 +97,7 @@ static void FioRestoreFile(int slot)
  */
 void FioSeekToFile(uint slot, size_t pos)
 {
-	FILE *f;
-#if defined(LIMITED_FDS)
-	/* Make sure we have this file open */
-	FioRestoreFile(slot);
-#endif /* LIMITED_FDS */
-	f = _fio.handles[slot];
+	FILE *f = _fio.handles[slot];
 	assert(f != nullptr);
 	_fio.cur_fh = f;
 	_fio.filename = _fio.filenames[slot];
@@ -202,9 +181,6 @@ static inline void FioCloseFile(int slot)
 		_fio.shortnames[slot] = nullptr;
 
 		_fio.handles[slot] = nullptr;
-#if defined(LIMITED_FDS)
-		_fio.open_handles--;
-#endif /* LIMITED_FDS */
 	}
 }
 
@@ -216,30 +192,6 @@ void FioCloseAll()
 	}
 }
 
-#if defined(LIMITED_FDS)
-static void FioFreeHandle()
-{
-	/* If we are about to open a file that will exceed the limit, close a file */
-	if (_fio.open_handles + 1 == LIMITED_FDS) {
-		uint i, count;
-		int slot;
-
-		count = UINT_MAX;
-		slot = -1;
-		/* Find the file that is used the least */
-		for (i = 0; i < lengthof(_fio.handles); i++) {
-			if (_fio.handles[i] != nullptr && _fio.usage_count[i] < count) {
-				count = _fio.usage_count[i];
-				slot  = i;
-			}
-		}
-		assert(slot != -1);
-		DEBUG(misc, 6, "Closing filehandler '%s' in slot '%d' because of fd-limit", _fio.filenames[slot], slot);
-		FioCloseFile(slot);
-	}
-}
-#endif /* LIMITED_FDS */
-
 /**
  * Open a slotted file.
  * @param slot Index to assign.
@@ -250,9 +202,6 @@ void FioOpenFile(uint slot, const char *filename, Subdirectory subdir, char **ou
 {
 	FILE *f;
 
-#if defined(LIMITED_FDS)
-	FioFreeHandle();
-#endif /* LIMITED_FDS */
 	f = FioFOpenFile(filename, "rb", subdir, nullptr, output_filename);
 	if (f == nullptr) usererror("Cannot open file '%s'", filename);
 	long pos = ftell(f);
@@ -269,10 +218,6 @@ void FioOpenFile(uint slot, const char *filename, Subdirectory subdir, char **ou
 	if (t2 != nullptr) *t2 = '\0';
 	strtolower(_fio.shortnames[slot]);
 
-#if defined(LIMITED_FDS)
-	_fio.usage_count[slot] = 0;
-	_fio.open_handles++;
-#endif /* LIMITED_FDS */
 	FioSeekToFile(slot, (uint32)pos);
 }
 

src/game/game_scanner.cpp

@@ -40,20 +40,10 @@ GameInfo *GameScannerInfo::FindInfo(const char *nameParam, int versionParam, boo
 	strecpy(game_name, nameParam, lastof(game_name));
 	strtolower(game_name);
 
-	GameInfo *info = nullptr;
-	int version = -1;
-
 	if (versionParam == -1) {
 		/* We want to load the latest version of this Game script; so find it */
 		if (this->info_single_list.find(game_name) != this->info_single_list.end()) return static_cast<GameInfo *>(this->info_single_list[game_name]);
-
-		/* If we didn't find a match Game script, maybe the user included a version */
-		char *e = strrchr(game_name, '.');
-		if (e == nullptr) return nullptr;
-		*e = '\0';
-		e++;
-		versionParam = atoi(e);
-		/* Continue like we were calling this function with a version. */
+		return nullptr;
 	}
 
 	if (force_exact_match) {
@@ -62,15 +52,18 @@ GameInfo *GameScannerInfo::FindInfo(const char *nameParam, int versionParam, boo
 		seprintf(game_name_tmp, lastof(game_name_tmp), "%s.%d", game_name, versionParam);
 		strtolower(game_name_tmp);
 		if (this->info_list.find(game_name_tmp) != this->info_list.end()) return static_cast<GameInfo *>(this->info_list[game_name_tmp]);
+		return nullptr;
 	}
 
+	GameInfo *info = nullptr;
+	int version = -1;
+
 	/* See if there is a compatible Game script which goes by that name, with the highest
 	 *  version which allows loading the requested version */
-	ScriptInfoList::iterator it = this->info_list.begin();
-	for (; it != this->info_list.end(); it++) {
-		GameInfo *i = static_cast<GameInfo *>((*it).second);
+	for (const auto &item : this->info_list) {
+		GameInfo *i = static_cast<GameInfo *>(item.second);
 		if (strcasecmp(game_name, i->GetName()) == 0 && i->CanLoadFromVersion(versionParam) && (version == -1 || i->GetVersion() > version)) {
-			version = (*it).second->GetVersion();
+			version = item.second->GetVersion();
 			info = i;
 		}
 	}
@@ -103,8 +96,8 @@ GameLibrary *GameScannerLibrary::FindLibrary(const char *library, int version)
 	strtolower(library_name);
 
 	/* Check if the library + version exists */
-	ScriptInfoList::iterator iter = this->info_list.find(library_name);
-	if (iter == this->info_list.end()) return nullptr;
+	ScriptInfoList::iterator it = this->info_list.find(library_name);
+	if (it == this->info_list.end()) return nullptr;
 
-	return static_cast<GameLibrary *>((*iter).second);
+	return static_cast<GameLibrary *>((*it).second);
 }

src/group_gui.cpp

@@ -77,6 +77,11 @@ static const NWidgetPart _nested_group_widgets[] = {
 		EndContainer(),
 		/* right part */
 		NWidget(NWID_VERTICAL),
+			NWidget(NWID_HORIZONTAL),
+				NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_GL_GROUP_BY_ORDER), SetMinimalSize(81, 12), SetDataTip(STR_STATION_VIEW_GROUP, STR_TOOLTIP_GROUP_ORDER),
+				NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_GL_GROUP_BY_DROPDOWN), SetMinimalSize(167, 12), SetDataTip(0x0, STR_TOOLTIP_GROUP_ORDER),
+				NWidget(WWT_PANEL, COLOUR_GREY), SetMinimalSize(12, 12), SetResize(1, 0), EndContainer(),
+			EndContainer(),
 			NWidget(NWID_HORIZONTAL),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_GL_SORT_BY_ORDER), SetMinimalSize(81, 12), SetDataTip(STR_BUTTON_SORT_BY, STR_TOOLTIP_SORT_ORDER),
 				NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_GL_SORT_BY_DROPDOWN), SetMinimalSize(167, 12), SetDataTip(0x0, STR_TOOLTIP_SORT_CRITERIA),
@@ -416,23 +421,11 @@ public:
 		this->vscroll = this->GetScrollbar(WID_GL_LIST_VEHICLE_SCROLLBAR);
 		this->group_sb = this->GetScrollbar(WID_GL_LIST_GROUP_SCROLLBAR);
 
-		switch (this->vli.vtype) {
-			default: NOT_REACHED();
-			case VEH_TRAIN:    this->sorting = &_sorting.train;    break;
-			case VEH_ROAD:     this->sorting = &_sorting.roadveh;  break;
-			case VEH_SHIP:     this->sorting = &_sorting.ship;     break;
-			case VEH_AIRCRAFT: this->sorting = &_sorting.aircraft; break;
-		}
-
 		this->vli.index = ALL_GROUP;
 		this->group_sel = INVALID_GROUP;
 		this->group_rename = INVALID_GROUP;
 		this->group_over = INVALID_GROUP;
 
-		this->vehicles.SetListing(*this->sorting);
-		this->vehicles.ForceRebuild();
-		this->vehicles.NeedResort();
-
 		this->BuildVehicleList();
 		this->SortVehicleList();
 
@@ -458,7 +451,7 @@ public:
 
 	~VehicleGroupWindow()
 	{
-		*this->sorting = this->vehicles.GetListing();
+		*this->sorting = this->vehgroups.GetListing();
 	}
 
 	void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override
@@ -529,10 +522,10 @@ public:
 	{
 		if (data == 0) {
 			/* This needs to be done in command-scope to enforce rebuilding before resorting invalid data */
-			this->vehicles.ForceRebuild();
+			this->vehgroups.ForceRebuild();
 			this->groups.ForceRebuild();
 		} else {
-			this->vehicles.ForceResort();
+			this->vehgroups.ForceResort();
 			this->groups.ForceResort();
 		}
 
@@ -587,15 +580,15 @@ public:
 	{
 		/* If we select the all vehicles, this->list will contain all vehicles of the owner
 		 * else this->list will contain all vehicles which belong to the selected group */
-		bool recalculate_totals = this->vehicles.NeedRebuild();
+		bool recalculate_totals = this->vehgroups.NeedRebuild();
 		this->BuildVehicleList();
 		this->SortVehicleList();
 		if (recalculate_totals) this->RecalculateInfoTotals();
 
 		this->BuildGroupList(this->owner);
 
-		this->group_sb->SetCount((uint)this->groups.size());
-		this->vscroll->SetCount((uint)this->vehicles.size());
+		this->group_sb->SetCount(static_cast<int>(this->groups.size()));
+		this->vscroll->SetCount(static_cast<int>(this->vehgroups.size()));
 
 		/* The drop down menu is out, *but* it may not be used, retract it. */
 		if (!this->ShouldShowActionDropdownList() && this->IsWidgetLowered(WID_GL_MANAGE_VEHICLES_DROPDOWN)) {
@@ -634,8 +627,11 @@ public:
 		if (!IsDefaultGroupID(this->vli.index) && !IsAllGroupID(this->vli.index) && Group::Get(this->vli.index)->replace_protection) protect_sprite = SPR_GROUP_REPLACE_ON_TRAIN;
 		this->GetWidget<NWidgetCore>(WID_GL_REPLACE_PROTECTION)->widget_data = protect_sprite + this->vli.vtype;
 
-		/* Set text of sort by dropdown */
-		this->GetWidget<NWidgetCore>(WID_GL_SORT_BY_DROPDOWN)->widget_data = this->vehicle_sorter_names[this->vehicles.SortType()];
+		/* Set text of "group by" dropdown widget. */
+		this->GetWidget<NWidgetCore>(WID_GL_GROUP_BY_DROPDOWN)->widget_data = this->vehicle_group_by_names[this->grouping];
+
+		/* Set text of "sort by" dropdown widget. */
+		this->GetWidget<NWidgetCore>(WID_GL_SORT_BY_DROPDOWN)->widget_data = this->GetVehicleSorterNames()[this->vehgroups.SortType()];
 
 		this->GetWidget<NWidgetCore>(WID_GL_FILTER_BY_CARGO)->widget_data = this->cargo_filter_texts[this->cargo_filter_criteria];
 
@@ -696,16 +692,16 @@ public:
 			}
 
 			case WID_GL_SORT_BY_ORDER:
-				this->DrawSortButtonState(WID_GL_SORT_BY_ORDER, this->vehicles.IsDescSortOrder() ? SBS_DOWN : SBS_UP);
+				this->DrawSortButtonState(WID_GL_SORT_BY_ORDER, this->vehgroups.IsDescSortOrder() ? SBS_DOWN : SBS_UP);
 				break;
 
 			case WID_GL_LIST_VEHICLE:
-				if (this->vli.index != ALL_GROUP) {
-					/* Mark vehicles which are in sub-groups */
+				if (this->vli.index != ALL_GROUP && this->grouping == GB_NONE) {
+					/* Mark vehicles which are in sub-groups (only if we are not using shared order coalescing) */
 					int y = r.top;
-					uint max = min(this->vscroll->GetPosition() + this->vscroll->GetCapacity(), (uint)this->vehicles.size());
+					uint max = min(this->vscroll->GetPosition() + this->vscroll->GetCapacity(), static_cast<uint>(this->vehgroups.size()));
 					for (uint i = this->vscroll->GetPosition(); i < max; ++i) {
-						const Vehicle *v = this->vehicles[i];
+						const Vehicle *v = this->vehgroups[i].GetSingleVehicle();
 						if (v->group_id != this->vli.index) {
 							GfxFillRect(r.left + 1, y + 1, r.right - 1, y + this->resize.step_height - 2, _colour_gradient[COLOUR_GREY][3], FILLRECT_CHECKER);
 						}
@@ -731,12 +727,16 @@ public:
 	{
 		switch (widget) {
 			case WID_GL_SORT_BY_ORDER: // Flip sorting method ascending/descending
-				this->vehicles.ToggleSortOrder();
+				this->vehgroups.ToggleSortOrder();
 				this->SetDirty();
 				break;
 
+			case WID_GL_GROUP_BY_DROPDOWN: // Select grouping option dropdown menu
+				ShowDropDownMenu(this, this->vehicle_group_by_names, this->grouping, WID_GL_GROUP_BY_DROPDOWN, 0, 0);
+				return;
+
 			case WID_GL_SORT_BY_DROPDOWN: // Select sorting criteria dropdown menu
-				ShowDropDownMenu(this, this->vehicle_sorter_names, this->vehicles.SortType(),  WID_GL_SORT_BY_DROPDOWN, 0,
+				ShowDropDownMenu(this, this->GetVehicleSorterNames(), this->vehgroups.SortType(),  WID_GL_SORT_BY_DROPDOWN, 0,
 						(this->vli.vtype == VEH_TRAIN || this->vli.vtype == VEH_ROAD) ? 0 : this->vehicle_sorter_non_ground_veh_disable_mask);
 				return;
 
@@ -747,7 +747,7 @@ public:
 			case WID_GL_ALL_VEHICLES: // All vehicles button
 				if (!IsAllGroupID(this->vli.index)) {
 					this->vli.index = ALL_GROUP;
-					this->vehicles.ForceRebuild();
+					this->vehgroups.ForceRebuild();
 					this->SetDirty();
 				}
 				break;
@@ -755,7 +755,7 @@ public:
 			case WID_GL_DEFAULT_VEHICLES: // Ungrouped vehicles button
 				if (!IsDefaultGroupID(this->vli.index)) {
 					this->vli.index = DEFAULT_GROUP;
-					this->vehicles.ForceRebuild();
+					this->vehgroups.ForceRebuild();
 					this->SetDirty();
 				}
 				break;
@@ -795,18 +795,41 @@ public:
 
 				SetObjectToPlaceWnd(SPR_CURSOR_MOUSE, PAL_NONE, HT_DRAG, this);
 
-				this->vehicles.ForceRebuild();
+				this->vehgroups.ForceRebuild();
 				this->SetDirty();
 				break;
 			}
 
 			case WID_GL_LIST_VEHICLE: { // Matrix Vehicle
 				uint id_v = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_GL_LIST_VEHICLE);
-				if (id_v >= this->vehicles.size()) return; // click out of list bound
+				if (id_v >= this->vehgroups.size()) return; // click out of list bound
 
-				const Vehicle *v = this->vehicles[id_v];
-				if (VehicleClicked(v)) break;
+				const GUIVehicleGroup &vehgroup = this->vehgroups[id_v];
 
+				const Vehicle *v = nullptr;
+
+				switch (this->grouping) {
+					case GB_NONE: {
+						const Vehicle *v2 = vehgroup.GetSingleVehicle();
+						if (VehicleClicked(v2)) break;
+						v = v2;
+						break;
+					}
+
+					case GB_SHARED_ORDERS: {
+						assert(vehgroup.NumVehicles() > 0);
+						v = vehgroup.vehicles_begin[0];
+						/*
+						No VehicleClicked(v) support for now, because don't want
+						to enable any contextual actions except perhaps clicking/ctrl-clicking to clone orders.
+						*/
+						break;
+					}
+
+					default:
+						NOT_REACHED();
+				}
+				if (v) {
 					this->vehicle_sel = v->index;
 
 					if (_ctrl_pressed) {
@@ -818,6 +841,8 @@ public:
 					_cursor.vehchain = true;
 
 					this->SetDirty();
+				}
+
 				break;
 			}
 
@@ -921,7 +946,7 @@ public:
 	{
 		switch (widget) {
 			case WID_GL_DEFAULT_VEHICLES: // Ungrouped vehicles
-				DoCommandP(0, DEFAULT_GROUP, this->vehicle_sel | (_ctrl_pressed ? 1 << 31 : 0), CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_ADD_VEHICLE));
+				DoCommandP(0, DEFAULT_GROUP, this->vehicle_sel | (_ctrl_pressed || this->grouping == GB_SHARED_ORDERS ? 1 << 31 : 0), CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_ADD_VEHICLE));
 
 				this->vehicle_sel = INVALID_VEHICLE;
 				this->group_over = INVALID_GROUP;
@@ -938,7 +963,7 @@ public:
 				uint id_g = this->group_sb->GetScrolledRowFromWidget(pt.y, this, WID_GL_LIST_GROUP, 0, this->tiny_step_height);
 				GroupID new_g = id_g >= this->groups.size() ? NEW_GROUP : this->groups[id_g]->index;
 
-				DoCommandP(0, new_g, vindex | (_ctrl_pressed ? 1 << 31 : 0), CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_ADD_VEHICLE), new_g == NEW_GROUP ? CcAddVehicleNewGroup : nullptr);
+				DoCommandP(0, new_g, vindex | (_ctrl_pressed || this->grouping == GB_SHARED_ORDERS ? 1 << 31 : 0), CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_ADD_VEHICLE), new_g == NEW_GROUP ? CcAddVehicleNewGroup : nullptr);
 				break;
 			}
 
@@ -949,14 +974,33 @@ public:
 				this->SetDirty();
 
 				uint id_v = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_GL_LIST_VEHICLE);
-				if (id_v >= this->vehicles.size()) return; // click out of list bound
+				if (id_v >= this->vehgroups.size()) return; // click out of list bound
 
-				const Vehicle *v = this->vehicles[id_v];
+				const GUIVehicleGroup &vehgroup = this->vehgroups[id_v];
+				switch (this->grouping) {
+					case GB_NONE: {
+						const Vehicle *v = vehgroup.GetSingleVehicle();
 						if (!VehicleClicked(v) && vindex == v->index) {
 							ShowVehicleViewWindow(v);
 						}
 						break;
 					}
+
+					case GB_SHARED_ORDERS: {
+						const Vehicle *v = vehgroup.vehicles_begin[0];
+						/* We do not support VehicleClicked() here since the contextual action may only make sense for individual vehicles */
+
+						if (vindex == v->index) {
+							ShowVehicleListWindow(v);
+						}
+						break;
+					}
+
+					default:
+						NOT_REACHED();
+				}
+				break;
+			}
 		}
 	}
 
@@ -983,8 +1027,12 @@ public:
 	void OnDropdownSelect(int widget, int index) override
 	{
 		switch (widget) {
+			case WID_GL_GROUP_BY_DROPDOWN:
+				this->UpdateVehicleGroupBy(static_cast<GroupBy>(index));
+				break;
+
 			case WID_GL_SORT_BY_DROPDOWN:
-				this->vehicles.SetSortType(index);
+				this->vehgroups.SetSortType(index);
 				break;
 			case WID_GL_FILTER_BY_CARGO: // Select a cargo filter criteria
 				this->SetCargoFilterIndex(index);
@@ -1048,10 +1096,10 @@ public:
 
 	void OnGameTick() override
 	{
-		if (this->groups.NeedResort() || this->vehicles.NeedResort()) {
+		if (this->groups.NeedResort() || this->vehgroups.NeedResort()) {
 			this->SetWidgetDirty(WID_GL_LIST_VEHICLE);
 		}
-		if (!this->vehicles.NeedRebuild() && this->RecalculateInfoTotals()) {
+		if (!this->vehgroups.NeedRebuild() && this->RecalculateInfoTotals()) {
 			this->SetWidgetDirty(WID_GL_INFO);
 		}
 	}
@@ -1147,7 +1195,7 @@ public:
 			}
 			this->group_sb->ScrollTowards(id_g);
 		}
-		this->vehicles.ForceRebuild();
+		this->vehgroups.ForceRebuild();
 		this->SetDirty();
 	}
 

src/lang/afrikaans.txt

@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Koring
 STR_CARGO_PLURAL_RUBBER                                         :Rubber
 STR_CARGO_PLURAL_SUGAR                                          :Suiker
 STR_CARGO_PLURAL_TOYS                                           :Speelgoed
-STR_CARGO_PLURAL_CANDY                                          :Lekkers
+STR_CARGO_PLURAL_SWEETS                                         :Lekkers
 STR_CARGO_PLURAL_COLA                                           :Kola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Spookasem
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Spookasem
 STR_CARGO_PLURAL_BUBBLES                                        :Borrels
 STR_CARGO_PLURAL_TOFFEE                                         :Toffie
 STR_CARGO_PLURAL_BATTERIES                                      :Batterye
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Koring
 STR_CARGO_SINGULAR_RUBBER                                       :Rubber
 STR_CARGO_SINGULAR_SUGAR                                        :Suiker
 STR_CARGO_SINGULAR_TOY                                          :Speelding
-STR_CARGO_SINGULAR_CANDY                                        :Lekker
+STR_CARGO_SINGULAR_SWEETS                                       :Lekker
 STR_CARGO_SINGULAR_COLA                                         :Kola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Spookasem
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Spookasem
 STR_CARGO_SINGULAR_BUBBLE                                       :Borrel
 STR_CARGO_SINGULAR_TOFFEE                                       :Toffie
 STR_CARGO_SINGULAR_BATTERY                                      :Battery
@@ -316,6 +316,8 @@ STR_SORT_BY_RANGE                                               :Afstand
 STR_SORT_BY_POPULATION                                          :Bevolking
 STR_SORT_BY_RATING                                              :Waardering
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Onderbreek spel
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Vinnig vooruit die spel
@@ -1596,9 +1598,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Lineêre
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Binne speletjie plasing van bome: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Beheer die ewekansige voorkoms van bome tydens die spel. Dit kan 'n invloed op nywerhede hê wat staatmaak op die groei van bome, byvoorbeeld hout meulens
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Geen {RED}(breek timmerhout meul)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Slegs in reënwoude
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Orals
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Posisie van hoof werktuigbaan: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Horisontale posisie van die hoof nutsbalk aan die bokant van die skerm
@@ -1919,10 +1918,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Verander
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multispeler
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Openbaar
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Kies tussen 'n openbare (internet) of 'n plaaslike (LAN) spel
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Nee
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Ja
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Speler naam:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Die is die naam waarmee ander spelers sal jou aanwys
 
@@ -1963,8 +1958,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Verbind
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Vervris verskaffer
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Vervris die verskaffer inligting
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Soek bediener
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Versoek netwerk vir 'n verskaffer
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Voeg bediender by
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Voeg 'n verskaffer by die lys wat altyd ondersoek sal word vir speletjies wat reeds aan die gang is
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Begin bediener
@@ -1981,6 +1974,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Die spel
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Stel wagwoord
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Beskerm jou spel met 'n wagwoord as jy wil dit nie publieke toepassing laat wees nie
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Openbaar
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Kies tussen 'n openbare (internet) of 'n plaaslike (LAN) spel
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Nee
 STR_NETWORK_START_SERVER_ADVERTISED                             :Ja
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} Klient{P "" e}

src/lang/arabic_egypt.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :قمح
 STR_CARGO_PLURAL_RUBBER                                         :مطاط
 STR_CARGO_PLURAL_SUGAR                                          :سكر
 STR_CARGO_PLURAL_TOYS                                           :دُمَي
-STR_CARGO_PLURAL_CANDY                                          :حلويات
+STR_CARGO_PLURAL_SWEETS                                         :حلويات
 STR_CARGO_PLURAL_COLA                                           :كولا
-STR_CARGO_PLURAL_COTTON_CANDY                                   :سكر نبات
+STR_CARGO_PLURAL_CANDYFLOSS                                     :سكر نبات
 STR_CARGO_PLURAL_BUBBLES                                        :فقاعات
 STR_CARGO_PLURAL_TOFFEE                                         :توفي
 STR_CARGO_PLURAL_BATTERIES                                      :بطاريات
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :قمح
 STR_CARGO_SINGULAR_RUBBER                                       :مطاط
 STR_CARGO_SINGULAR_SUGAR                                        :سكر
 STR_CARGO_SINGULAR_TOY                                          :دُمِيه
-STR_CARGO_SINGULAR_CANDY                                        :حلويات
+STR_CARGO_SINGULAR_SWEETS                                       :حلويات
 STR_CARGO_SINGULAR_COLA                                         :كولا
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :سكر نبات
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :سكر نبات
 STR_CARGO_SINGULAR_BUBBLE                                       :فقاعات
 STR_CARGO_SINGULAR_TOFFEE                                       :توفي
 STR_CARGO_SINGULAR_BATTERY                                      :بطاريات
@@ -291,6 +291,8 @@ STR_SORT_BY_CARGO_CAPACITY                                      :سعة الشح
 STR_SORT_BY_RANGE                                               :مدى
 STR_SORT_BY_POPULATION                                          :عدد السكان
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}ايقاف اللعبة
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}سرع اللعبه
@@ -446,9 +448,11 @@ STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :توقل كونسول
 STR_ABOUT_MENU_AI_DEBUG                                         :مكتشف اخطاء الذكاء الصناعي
 STR_ABOUT_MENU_SCREENSHOT                                       :صورة من الشاشة - Ctrl-S -
+STR_ABOUT_MENU_SHOW_FRAMERATE                                   :سرعة عرض الإطارات
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :حول 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :موائم العفريتات
 STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :اضهار /اخفاء مربح الحوارات/الخيارات
+STR_ABOUT_MENU_TOGGLE_DIRTY_BLOCKS                              :تبديل ألوان الكتل المتسخة
 ############ range ends here
 
 ############ range for ordinal numbers used for the place in the highscore window
@@ -1077,6 +1081,8 @@ STR_CONFIG_SETTING_HORIZONTAL_POS_LEFT                          :يسار
 STR_CONFIG_SETTING_HORIZONTAL_POS_CENTER                        :متوسط
 STR_CONFIG_SETTING_HORIZONTAL_POS_RIGHT                         :يمين
 
+STR_CONFIG_SETTING_CONSTRUCTION_SPEED                           ::سرعة البناء {STRING}
+STR_CONFIG_SETTING_VEHICLE_BREAKDOWNS                           ::تعطلات العربة {STRING}
 
 STR_CONFIG_SETTING_AUTOSLOPE                                    :السماح بتحريك الأرض تحت المباني, الطرق, الخ : {STRING}
 STR_CONFIG_SETTING_CATCHMENT                                    :السماح بحدود اكثر واقعية للمحطات بحسب الحجم: {STRING}
@@ -1125,6 +1131,7 @@ STR_CONFIG_SETTING_ORDER_REVIEW_ON                              :لكل العر
 STR_CONFIG_SETTING_WARN_INCOME_LESS                             :حذر عندما يكون الدخل سالبا :{STRING}
 STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES                        :المركبات لا تنتهي صلاحيتها ابدا : {STRING}
 STR_CONFIG_SETTING_AUTORENEW_VEHICLE                            :جدد العربات عندما تصبح قديمة : {STRING}
+STR_CONFIG_SETTING_AUTORENEW_VEHICLE_HELPTEXT                   :عند التمكين ، يتم استبدال العربة التي اقتربت من نهاية عمرها عند اكتمال شروط التجديد
 STR_CONFIG_SETTING_AUTORENEW_MONEY                              :التجديد التلقائي عند توفر السيولة الدنيا للتجديد: {STRING}
 STR_CONFIG_SETTING_POPULATION_IN_LABEL                          :أعرض عدد السكان مع الاسم على العلامة: {STRING}
 STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS                         :سمك الخطوط في العرض: {STRING}
@@ -1249,6 +1256,7 @@ STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :السماح ب
 STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES                           :#opcodes قبل تعليق الاسكربت: {STRING}
 
 STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :فترات الصيانة بالنسبة المئوية : {STRING}
+STR_CONFIG_SETTING_SERVINT_AIRCRAFT                             ::مدة فحص الطائرة الإفتراضي{STRING}
 STR_CONFIG_SETTING_NOSERVICE                                    :الغاء الصيانة عندما يكون التعطيل للمركبات غير مفعل: {STRING}
 STR_CONFIG_SETTING_WAGONSPEEDLIMITS                             :السماح بتحديد سرعة العربات: {STRING}
 STR_CONFIG_SETTING_DISABLE_ELRAILS                              :تعطيل سكة القطار الكهربائي: {STRING}
@@ -1308,9 +1316,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED                        :مسموح
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :مسموح - نمط مدينة قابل للتعديل
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :اضافة الاشجار اثناء اللعب: {STRING}
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :بدون {RED}-المشغولات الخشبية معطل-
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :الغابات الماطرة فقط
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :كل مكان
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :موقع شريط الأدوات الرئيسي: {STRING}
 STR_CONFIG_SETTING_STATUSBAR_POS                                :موقع شريط المعلومات: {STRING}
@@ -1337,6 +1342,7 @@ STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER                         :مضاعف ال
 
 
 
+STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :م) متري)
 
 STR_CONFIG_SETTING_GRAPHICS                                     :رسوميات {ORANGE}
 STR_CONFIG_SETTING_SOUND                                        :{ORANGE}الصوت
@@ -1585,8 +1591,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}أنضم
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}حدث الخادم
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}حدث معلومات الخادم
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}إبحث عن خوادم
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}أبحث في الشبكة عن خادم
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}اضف خادم - سيرفر
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}اضف خادم (سيرفر) و الذي سوف يفحص اذا كان هناك لعبة قيد التشغيل حاليا
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}أبدأ الخادم
@@ -2173,6 +2177,8 @@ STR_INDUSTRY_DISPLAY_CHAIN                                      :{BLACK}اعرض
 STR_INDUSTRY_DISPLAY_CHAIN_TOOLTIP                              :{BLACK}اعرض المصانع التي تمد و تقبل البضائع
 STR_INDUSTRY_CARGOES_NOTIFY_SMALLMAP                            :{BLACK}اربط بالخريطة المصغرة
 STR_INDUSTRY_CARGOES_NOTIFY_SMALLMAP_TOOLTIP                    :{BLACK}اعرض المصانع المختارة في الخرائط المصغرة ايضا.
+STR_INDUSTRY_CARGOES_SELECT_CARGO                               :{BLACK}اختر البضائع
+STR_INDUSTRY_CARGOES_SELECT_INDUSTRY                            :{BLACK}اختر الصناعة
 
 # Land area window
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}معلومات ارض
@@ -2196,6 +2202,7 @@ STR_LAND_AREA_INFORMATION_AIRPORTTILE_NAME                      :{BLACK}اسم
 STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}الشحنة المقبولة: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA} /8 {STRING})
+STR_LANG_AREA_INFORMATION_ROAD_TYPE                             :{BLACK}:نوع الطريق {LTBLUE}{STRING}
 STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}حدود سرعة سكة الحديد: {LTBLUE}{VELOCITY}
 STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT                      :{BLACK}حدود سرعه الطريق: {LTBLUE}{VELOCITY}
 
@@ -2793,6 +2800,7 @@ STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}وسط
 STR_INDUSTRY_VIEW_PRODUCTION_LEVEL                              :{BLACK}نسبة الانتاج: {YELLOW}{COMMA}%
 
 
+STR_INDUSTRY_VIEW_REQUIRES                                      :{BLACK}:يتطلب
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}تغيير الانتاج مضاعف من 8 الى 2040
 STR_CONFIG_GAME_PRODUCTION_LEVEL                                :{WHITE}غير مستوى الانتاج{}نسبة مئوية حتى 800%.
@@ -2902,6 +2910,7 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON                 :{BLACK}شراء
 STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON                         :{BLACK}شراء سفينة
 STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON                     :{BLACK}شراء طائرة
 
+STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_BUTTON           :{BLACK}شراء العربة وتجديد بضائعها
 
 STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP                       :{BLACK}شراء العربة الموضحة
 STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP                :{BLACK}شراء العربة
@@ -2921,6 +2930,7 @@ STR_BUY_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                         :{BLACK}اعاد
 
 
 
+STR_BUY_VEHICLE_AIRCRAFT_HIDE_SHOW_TOGGLE_TOOLTIP               :{BLACK}   تبيدل بين إخفاء / عرض نوع الطائرة
 
 STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}اعادة تسمية عربات القطار
 STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}اعادة تسمية العربة
@@ -3048,6 +3058,7 @@ STR_REPLACE_ELRAIL_VEHICLES                                     :سكة حديد
 STR_REPLACE_MONORAIL_VEHICLES                                   :عربات احادية السكة
 STR_REPLACE_MAGLEV_VEHICLES                                     :مركبات ممغنطة
 
+STR_REPLACE_TRAM_VEHICLES                                       :مركبات الترام
 
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK} إزالة العربات: {ORANGE}{STRING}
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK} المحافظة على طول القطار بازالة عربات ابتداء من المقدمة عند التبديل - عندما يكون التبدل ينتج قطارا اطول.
@@ -3626,6 +3637,7 @@ STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}... يم
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}... يمكن بنائة في الغابات المطيرة فقط
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}... يمكن بنائة في المناطق الصحراوية فقط
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... يبنى فقط في المدن
+STR_ERROR_CAN_ONLY_BE_BUILT_NEAR_TOWN_CENTER                    :{WHITE}... لا يمكن بناؤها إلا بقرب وسط المدن
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_LOW_AREAS                        :{WHITE}... يمكن بنائه في المناطق المنخفضة فقط
 STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{WHITE}... يمكن بنائة على اطراف الخريطة فقط
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... يمكن زراعة الغابة فوق خط الثلج فقط

src/lang/basque.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Garia
 STR_CARGO_PLURAL_RUBBER                                         :Goma
 STR_CARGO_PLURAL_SUGAR                                          :Azukrea
 STR_CARGO_PLURAL_TOYS                                           :Jostailuak
-STR_CARGO_PLURAL_CANDY                                          :Gozokiak
+STR_CARGO_PLURAL_SWEETS                                         :Gozokiak
 STR_CARGO_PLURAL_COLA                                           :Kola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Kotoiezko Azukrea
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Kotoiezko Azukrea
 STR_CARGO_PLURAL_BUBBLES                                        :Burbuilak
 STR_CARGO_PLURAL_TOFFEE                                         :Gozoki lehengaia
 STR_CARGO_PLURAL_BATTERIES                                      :Pilak
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Garia
 STR_CARGO_SINGULAR_RUBBER                                       :Goma
 STR_CARGO_SINGULAR_SUGAR                                        :Azukrea
 STR_CARGO_SINGULAR_TOY                                          :Jostailua
-STR_CARGO_SINGULAR_CANDY                                        :Gozoki
+STR_CARGO_SINGULAR_SWEETS                                       :Gozoki
 STR_CARGO_SINGULAR_COLA                                         :Kola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Kotoiezko Azukrea
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Kotoiezko Azukrea
 STR_CARGO_SINGULAR_BUBBLE                                       :Burbuila
 STR_CARGO_SINGULAR_TOFFEE                                       :Gozoki lehengaia
 STR_CARGO_SINGULAR_BATTERY                                      :Pila
@@ -308,6 +308,8 @@ STR_SORT_BY_RANGE                                               :Irismena
 STR_SORT_BY_POPULATION                                          :Biztanleria
 STR_SORT_BY_RATING                                              :Balorazioa
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Jokoa pausatu
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Jokoa bizkortu
@@ -1497,9 +1499,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :Gaitua herrien
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Zuhaitzen landaketa jokoan: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Jokoa bitartean zuhaitzen ausazko landatzea kontrolatu. Zuhaitzen landatzean oinarritzen diren industriei eragin dezake, zerrategiei adibidez
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Ezer ez {RED}(Paisai tropikalean zerrategiak hautsiko ditu)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Bakarrik basoetan
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Leku guztietan
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Tresna barra nagusiaren kokapena: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Tresna barra nagusia posizio horizontalean pantailaren goiko aldean
@@ -1792,8 +1791,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Aldatu k
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multijokalaria
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Ez
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Bai
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Jokalariaren izena:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Izen honen bidez ezagutua izango zara beste jokalarien artean
 
@@ -1834,8 +1831,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Jokoan s
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Zerbitzaria freskatu
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Zerbitzariaren informazioa freskatu
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Zerbitzaria bilatu
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Sarean zerbitzariak bilatu
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Zerbitzaria gehitu
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Zerrendara zerbitzari bat gehitu martxa dauden jokoak bilatuko dituena
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Zerbitzari bat sortu

src/lang/belarusian.txt

@@ -166,24 +166,24 @@ STR_CARGO_PLURAL_TOYS.dat                                       :цацкам
 STR_CARGO_PLURAL_TOYS.acc                                       :цацкі
 STR_CARGO_PLURAL_TOYS.abl                                       :цацкамі
 STR_CARGO_PLURAL_TOYS.pre                                       :цацках
-STR_CARGO_PLURAL_CANDY                                          :{G=p}Цукеркi
-STR_CARGO_PLURAL_CANDY.gen                                      :цукерак
-STR_CARGO_PLURAL_CANDY.dat                                      :цукеркам
-STR_CARGO_PLURAL_CANDY.acc                                      :цукеркі
-STR_CARGO_PLURAL_CANDY.abl                                      :цукеркамі
-STR_CARGO_PLURAL_CANDY.pre                                      :цукерках
+STR_CARGO_PLURAL_SWEETS                                         :{G=p}Цукеркi
+STR_CARGO_PLURAL_SWEETS.gen                                     :цукерак
+STR_CARGO_PLURAL_SWEETS.dat                                     :цукеркам
+STR_CARGO_PLURAL_SWEETS.acc                                     :цукеркі
+STR_CARGO_PLURAL_SWEETS.abl                                     :цукеркамі
+STR_CARGO_PLURAL_SWEETS.pre                                     :цукерках
 STR_CARGO_PLURAL_COLA                                           :{G=f}Кола
 STR_CARGO_PLURAL_COLA.gen                                       :колы
 STR_CARGO_PLURAL_COLA.dat                                       :коле
 STR_CARGO_PLURAL_COLA.acc                                       :колу
 STR_CARGO_PLURAL_COLA.abl                                       :колай
 STR_CARGO_PLURAL_COLA.pre                                       :коле
-STR_CARGO_PLURAL_COTTON_CANDY                                   :{G=f}Цукровая баўна
-STR_CARGO_PLURAL_COTTON_CANDY.gen                               :цукровай баўны
-STR_CARGO_PLURAL_COTTON_CANDY.dat                               :цукровай баўне
-STR_CARGO_PLURAL_COTTON_CANDY.acc                               :цукровую баўну
-STR_CARGO_PLURAL_COTTON_CANDY.abl                               :цукровай баўнай
-STR_CARGO_PLURAL_COTTON_CANDY.pre                               :цукровай баўне
+STR_CARGO_PLURAL_CANDYFLOSS                                     :{G=f}Цукровая баўна
+STR_CARGO_PLURAL_CANDYFLOSS.gen                                 :цукровай баўны
+STR_CARGO_PLURAL_CANDYFLOSS.dat                                 :цукровай баўне
+STR_CARGO_PLURAL_CANDYFLOSS.acc                                 :цукровую баўну
+STR_CARGO_PLURAL_CANDYFLOSS.abl                                 :цукровай баўнай
+STR_CARGO_PLURAL_CANDYFLOSS.pre                                 :цукровай баўне
 STR_CARGO_PLURAL_BUBBLES                                        :{G=p}Бурбалкi
 STR_CARGO_PLURAL_BUBBLES.gen                                    :бурбалак
 STR_CARGO_PLURAL_BUBBLES.dat                                    :бурбалкам
@@ -355,24 +355,24 @@ STR_CARGO_SINGULAR_TOY.dat                                      :цаццы
 STR_CARGO_SINGULAR_TOY.acc                                      :цацку
 STR_CARGO_SINGULAR_TOY.abl                                      :цацкай
 STR_CARGO_SINGULAR_TOY.pre                                      :цаццы
-STR_CARGO_SINGULAR_CANDY                                        :{G=f}Цукерка
-STR_CARGO_SINGULAR_CANDY.gen                                    :цукеркі
-STR_CARGO_SINGULAR_CANDY.dat                                    :цукерцы
-STR_CARGO_SINGULAR_CANDY.acc                                    :цукерку
-STR_CARGO_SINGULAR_CANDY.abl                                    :цукеркай
-STR_CARGO_SINGULAR_CANDY.pre                                    :цукерцы
+STR_CARGO_SINGULAR_SWEETS                                       :{G=f}Цукерка
+STR_CARGO_SINGULAR_SWEETS.gen                                   :цукеркі
+STR_CARGO_SINGULAR_SWEETS.dat                                   :цукерцы
+STR_CARGO_SINGULAR_SWEETS.acc                                   :цукерку
+STR_CARGO_SINGULAR_SWEETS.abl                                   :цукеркай
+STR_CARGO_SINGULAR_SWEETS.pre                                   :цукерцы
 STR_CARGO_SINGULAR_COLA                                         :{G=f}Кола
 STR_CARGO_SINGULAR_COLA.gen                                     :колы
 STR_CARGO_SINGULAR_COLA.dat                                     :коле
 STR_CARGO_SINGULAR_COLA.acc                                     :колу
 STR_CARGO_SINGULAR_COLA.abl                                     :колай
 STR_CARGO_SINGULAR_COLA.pre                                     :коле
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :{G=f}Цукровая баўна
-STR_CARGO_SINGULAR_COTTON_CANDY.gen                             :цукровай баўны
-STR_CARGO_SINGULAR_COTTON_CANDY.dat                             :цукровай баўне
-STR_CARGO_SINGULAR_COTTON_CANDY.acc                             :цукровую баўну
-STR_CARGO_SINGULAR_COTTON_CANDY.abl                             :цукровай баўнай
-STR_CARGO_SINGULAR_COTTON_CANDY.pre                             :цукровай баўне
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :{G=f}Цукровая баўна
+STR_CARGO_SINGULAR_CANDYFLOSS.gen                               :цукровай баўны
+STR_CARGO_SINGULAR_CANDYFLOSS.dat                               :цукровай баўне
+STR_CARGO_SINGULAR_CANDYFLOSS.acc                               :цукровую баўну
+STR_CARGO_SINGULAR_CANDYFLOSS.abl                               :цукровай баўнай
+STR_CARGO_SINGULAR_CANDYFLOSS.pre                               :цукровай баўне
 STR_CARGO_SINGULAR_BUBBLE                                       :{G=f}Бурбалка
 STR_CARGO_SINGULAR_BUBBLE.gen                                   :бурбалкі
 STR_CARGO_SINGULAR_BUBBLE.dat                                   :бурбалцы
@@ -626,6 +626,8 @@ STR_SORT_BY_RANGE                                               :Далёкас
 STR_SORT_BY_POPULATION                                          :Насельніцтва
 STR_SORT_BY_RATING                                              :Рэйтынґ
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Паўза
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Паскорыць гульню
@@ -1905,9 +1907,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :лінейна
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Расстаноўка дрэваў у гульні: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Кантроль адвольнага з'яўленьня дрэваў падчас гульні. Гэта можа закрануць прадпрыемствы, якія залежаць ад росту дрэваў, напрыклад, пільні.
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :адключана {RED}(пільні ня змогуць працаваць)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :толькі ў трапічных джунґлях
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :усюды
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Разьмяшчэньне галоўнай панэлі: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Гарызантальнае разьмяшчэньне галоўнай панэлі інструмэнтаў зьверху экрана.
@@ -2229,10 +2228,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Зьмя
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Сеткавая гульня
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Інтэрнэт
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Выберыце паміж гульнёй праз Інтэрнэт або ў лакальнай сетцы
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Не
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Так
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Імя гульца:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Гэта ваша імя, якое будзе бачна іншым гульцам
 
@@ -2273,8 +2268,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Далу
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Абнавіць сэрвэр
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Абнавіць iнфармацыю аб сэрвэры
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Знайсьці сэрвэр
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Знайсьці сэрвэры, якія зараз ёсьць у сетцы
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Дадаць сэрвэр
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Дадаць сэрвэр у сьпіс, які будзе аўтаматычна правярацца на ідучыя гульні
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Запуск сэрвэра
@@ -2291,6 +2284,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Назв
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Усталяваць пароль
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Абараніце вашу гульню паролем, калі ня хочаце рабіць яе публічна даступнай
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Інтэрнэт
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Выберыце паміж гульнёй праз Інтэрнэт або ў лакальнай сетцы
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Не
 STR_NETWORK_START_SERVER_ADVERTISED                             :Так
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} клiент{P "" ы аў}

src/lang/brazilian_portuguese.txt

@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT                                          :{G=m}Trigo
 STR_CARGO_PLURAL_RUBBER                                         :{G=f}Borracha
 STR_CARGO_PLURAL_SUGAR                                          :{G=m}Açúcar
 STR_CARGO_PLURAL_TOYS                                           :{G=m}Brinquedos
-STR_CARGO_PLURAL_CANDY                                          :{G=m}Doces
+STR_CARGO_PLURAL_SWEETS                                         :{G=m}Doces
 STR_CARGO_PLURAL_COLA                                           :{G=f}Cola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :{G=m}Algodão Doce
+STR_CARGO_PLURAL_CANDYFLOSS                                     :{G=m}Algodão Doce
 STR_CARGO_PLURAL_BUBBLES                                        :{G=f}Bolhas
 STR_CARGO_PLURAL_TOFFEE                                         :{G=m}Caramelo
 STR_CARGO_PLURAL_BATTERIES                                      :{G=f}Pilhas
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :{G=m}Trigo
 STR_CARGO_SINGULAR_RUBBER                                       :{G=f}Borracha
 STR_CARGO_SINGULAR_SUGAR                                        :{G=m}Açúcar
 STR_CARGO_SINGULAR_TOY                                          :{G=m}Brinquedo
-STR_CARGO_SINGULAR_CANDY                                        :{G=m}Doce
+STR_CARGO_SINGULAR_SWEETS                                       :{G=m}Doce
 STR_CARGO_SINGULAR_COLA                                         :{G=m}Cola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :{G=m}Algodão doce
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :{G=m}Algodão doce
 STR_CARGO_SINGULAR_BUBBLE                                       :{G=f}Bolha
 STR_CARGO_SINGULAR_TOFFEE                                       :{G=m}Caramelo
 STR_CARGO_SINGULAR_BATTERY                                      :{G=f}Pilha
@@ -316,6 +316,8 @@ STR_SORT_BY_RANGE                                               :Alcance
 STR_SORT_BY_POPULATION                                          :População
 STR_SORT_BY_RATING                                              :Classificação
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pausar jogo
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Acelerar o jogo
@@ -1605,9 +1607,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Linear
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Posicionamento de árvores: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Controla o nascimento aleatório de árvores durante o jogo. Isso pode afetar indústrias que dependem do crescimento de árvores, como serrarias
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Nenhum {RED}(extingue a serraria)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Apenas nas florestas tropicais
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Em todo o lugar
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Posição da barra de ferramentas principal: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Posição horizontal da barra de ferramentas principal no topo da tela
@@ -1929,10 +1928,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Alterar
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multi-jogador
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :[BLACK}Publicado
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Selecione entre um jogo publicado (internet) ou não publicado (Rede de Área Local, LAN)
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Não
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Sim
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Nome:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Este é o nome pelo qual os outros jogadores irão te identificar
 
@@ -1973,8 +1968,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Entrar n
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Atualizar dados
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Atualiza as informações sobre o servidor
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Localizar servidor
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Pesquisar por um servidor na rede
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Adicionar servidor
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Adiciona um servidor à lista que será sempre verificada se existem jogos ocorrendo
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Iniciar servidor
@@ -1991,6 +1984,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}O nome d
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Definir senha
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Proteja o jogo com uma senha se não desejar que seja publicamente acessível
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :[BLACK}Publicado
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Selecione entre um jogo publicado (internet) ou não publicado (Rede de Área Local, LAN)
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Não
 STR_NETWORK_START_SERVER_ADVERTISED                             :Sim
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} cliente{P "" s}

src/lang/bulgarian.txt

@@ -50,9 +50,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Пшеница
 STR_CARGO_PLURAL_RUBBER                                         :Каучук
 STR_CARGO_PLURAL_SUGAR                                          :Захар
 STR_CARGO_PLURAL_TOYS                                           :Играчки
-STR_CARGO_PLURAL_CANDY                                          :Сладки
+STR_CARGO_PLURAL_SWEETS                                         :Сладки
 STR_CARGO_PLURAL_COLA                                           :Кола
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Захарен памук
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Захарен памук
 STR_CARGO_PLURAL_BUBBLES                                        :Балони
 STR_CARGO_PLURAL_TOFFEE                                         :Карамел
 STR_CARGO_PLURAL_BATTERIES                                      :Батерии
@@ -84,9 +84,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Пшеница
 STR_CARGO_SINGULAR_RUBBER                                       :Каучук
 STR_CARGO_SINGULAR_SUGAR                                        :Захар
 STR_CARGO_SINGULAR_TOY                                          :Играчки
-STR_CARGO_SINGULAR_CANDY                                        :Сладки
+STR_CARGO_SINGULAR_SWEETS                                       :Сладки
 STR_CARGO_SINGULAR_COLA                                         :Кола
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Захарен памук
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Захарен памук
 STR_CARGO_SINGULAR_BUBBLE                                       :Балони
 STR_CARGO_SINGULAR_TOFFEE                                       :Карамел
 STR_CARGO_SINGULAR_BATTERY                                      :Батерии
@@ -312,6 +312,8 @@ STR_SORT_BY_RANGE                                               :Обхват
 STR_SORT_BY_POPULATION                                          :Население
 STR_SORT_BY_RATING                                              :Рейтинг
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Пауза
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Бързо превъртане на играта
@@ -1546,9 +1548,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :Разреше
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Разпределяне на дърветата в гората: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Контролирайте случайното появяване на дървета по време на игра. Това може да засегне промишленостите, които зависят от растежа на дървета, като например дърводелниците
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Без {RED}(разваля дъскорезницата)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Само в дъждовни гори
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Навсякъде
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Позиция на лентата за инструменти: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Хоризонтално позициониране на основната лента в горната част на екрана
@@ -1840,10 +1839,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Cмен
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Онлайн играчи
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Рекламирана
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Избери игра измежду рекламирана през интернет или нерекламирана през Локален интернет хост или ЛАН
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Не
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Да
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Име на играч:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Чрез това име другите играчи ще ви идентифицират
 
@@ -1884,8 +1879,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Прис
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Обновяване сървъра
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Обновява информацията за съръра
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Търсене на сървър
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Претърсване на мрежата за сървър
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Добави сървър
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Добяви сървър към списакът, който винаги ще бъде проверяван за активни игри.
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Пускане на сървър
@@ -1902,6 +1895,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Имет
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Поставяне на парола
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Защитаване на вашата игра с парола за да не е публично достъпна
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Рекламирана
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Избери игра измежду рекламирана през интернет или нерекламирана през Локален интернет хост или ЛАН
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Не
 STR_NETWORK_START_SERVER_ADVERTISED                             :Да
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} клиент{P "" s}

src/lang/catalan.txt

@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT                                          :{G=Masculin}Bla
 STR_CARGO_PLURAL_RUBBER                                         :{G=Masculin}Cautxú
 STR_CARGO_PLURAL_SUGAR                                          :{G=Masculin}Sucre
 STR_CARGO_PLURAL_TOYS                                           :{G=Femenin}Joguines
-STR_CARGO_PLURAL_CANDY                                          :{G=Masculin}Dolços
+STR_CARGO_PLURAL_SWEETS                                         :{G=Masculin}Dolços
 STR_CARGO_PLURAL_COLA                                           :{G=Masculin}Refrescos
-STR_CARGO_PLURAL_COTTON_CANDY                                   :{G=Masculin}Cotó de sucre
+STR_CARGO_PLURAL_CANDYFLOSS                                     :{G=Masculin}Cotó de sucre
 STR_CARGO_PLURAL_BUBBLES                                        :{G=Femenin}Bombolles
 STR_CARGO_PLURAL_TOFFEE                                         :{G=Masculin}Caramels
 STR_CARGO_PLURAL_BATTERIES                                      :{G=Femenin}Piles
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :{G=Masculin}Bla
 STR_CARGO_SINGULAR_RUBBER                                       :{G=Masculin}Cautxú
 STR_CARGO_SINGULAR_SUGAR                                        :{G=Masculin}Sucre
 STR_CARGO_SINGULAR_TOY                                          :{G=Femenin}Joguina
-STR_CARGO_SINGULAR_CANDY                                        :{G=Masculin}Dolç
+STR_CARGO_SINGULAR_SWEETS                                       :{G=Masculin}Dolç
 STR_CARGO_SINGULAR_COLA                                         :{G=Masculin}Refresc
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :{G=Masculin}Cotó de sucre
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :{G=Masculin}Cotó de sucre
 STR_CARGO_SINGULAR_BUBBLE                                       :{G=Femenin}Bombolla
 STR_CARGO_SINGULAR_TOFFEE                                       :{G=Masculin}Caramel
 STR_CARGO_SINGULAR_BATTERY                                      :{G=Femenin}Pila
@@ -195,6 +195,7 @@ STR_COLOUR_DEFAULT                                              :Per defecte
 STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA}{NBSP}mph
 STR_UNITS_VELOCITY_METRIC                                       :{COMMA}{NBSP}km/h
 STR_UNITS_VELOCITY_SI                                           :{COMMA}{NBSP}m/s
+STR_UNITS_VELOCITY_GAMEUNITS                                    :{DECIMAL}{NBSP}cel·les/dia
 
 STR_UNITS_POWER_IMPERIAL                                        :{COMMA}{NBSP}cv
 STR_UNITS_POWER_METRIC                                          :{COMMA}{NBSP}cv
@@ -316,6 +317,8 @@ STR_SORT_BY_RANGE                                               :Abast
 STR_SORT_BY_POPULATION                                          :Població
 STR_SORT_BY_RATING                                              :Qualificació
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Posa en pausa o reprèn la partida
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Avança la partida el més ràpid possible
@@ -1554,6 +1557,11 @@ STR_CONFIG_SETTING_ENDING_YEAR                                  :Any de puntuaci
 STR_CONFIG_SETTING_ENDING_YEAR_HELPTEXT                         :Estableix l'any en què finalitza la partida i es puntua les companyies. Al final d'aquest any, la puntuació de la companyia es guarda i es mostra a la llista de classificació, però els jugadors poden continuar jugant.{}Si l'any de finalització és anterior a l'any d'inici, no es guardaran les puntuacions ni es mostrarà la llista de classificació.
 STR_CONFIG_SETTING_ENDING_YEAR_VALUE                            :{NUM}
 STR_CONFIG_SETTING_ENDING_YEAR_ZERO                             :Mai
+STR_CONFIG_SETTING_ECONOMY_TYPE                                 :Tipus d'economia: {STRING}
+STR_CONFIG_SETTING_ECONOMY_TYPE_HELPTEXT                        :Una economia suau implica canvis freqüents però petits en productivitat. En una economia congelada no hi ha canvis de productivitat ni tancament d'indústries. Aquesta configuració pot no tenir cap efecte si els tipus d'indústria venen predeterminats per un NewGRF.
+STR_CONFIG_SETTING_ECONOMY_TYPE_ORIGINAL                        :Original
+STR_CONFIG_SETTING_ECONOMY_TYPE_SMOOTH                          :Suau
+STR_CONFIG_SETTING_ECONOMY_TYPE_FROZEN                          :{G=Femenin}Congelada
 STR_CONFIG_SETTING_ALLOW_SHARES                                 :Permet comprar participacions d'altres companyies: {STRING}
 STR_CONFIG_SETTING_ALLOW_SHARES_HELPTEXT                        :Permet comprar i vendre accions de les companyies. Les accions només estan disponibles per companyies d'una certa edat.
 STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES                         :Edat mínima de la companyia per negociar participacions: {STRING}
@@ -1605,9 +1613,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Lineal
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Disposició de nous arbres durant la partida: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Controla l'aparició aleatòria dels arbres durant una partida. Això podria afectar a les indústries que es basen en el creixement dels arbres, per exemple les serradores
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Cap {RED}(inhabilita la serradora)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Només a les selves tropicals
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :A tot arreu
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Posició de la barra d'eines principal: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Posició horitzontal de la barra principal a la part superior de la pantalla
@@ -1674,6 +1679,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT         :Quan es mostren
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL         :Imperial (mph)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_METRIC           :Mètric (km/h)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_SI               :SI (m/s)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_GAMEUNITS        :Unitats del joc (cel·les/dia)
 
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER                     :Unitats de potència dels vehicles: {STRING}
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT            :Quan es mostra la potència d'un vehicle a la interfície d'usuari, presenta-la en les unitats seleccionades
@@ -1806,6 +1812,7 @@ STR_INTRO_TRANSLATION                                           :{BLACK}A aquest
 
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Surt
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Esteu segur que voleu sortir de l'OpenTTD?
 STR_QUIT_YES                                                    :{BLACK}Sí
 STR_QUIT_NO                                                     :{BLACK}No
 
@@ -1929,10 +1936,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Canvia l
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multijugador
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Anunciat
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Escull entre una partida anunciada (internet) i una partida no anunciada (xarxa d'àrea local, LAN)
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :No
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Sí
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Nom del jugador:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Aquest és el nom amb el que els altres jugadors t'identificaran
 
@@ -1973,8 +1976,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Connecta
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Actualitza servidor
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Actualitza la informació del servidor
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Busca servidor
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Cercant un servidor a la xarxa
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Afegeix un servidor
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Afegeix un servidor a la llista que sempre es comprovarà per buscar partides en marxa
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Inicia el servidor
@@ -1991,6 +1992,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}El nom d
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Posa una contrasenya
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Protegeix la teva partida amb una contrasenya si no vols que sigui accessible a desconeguts
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Anunciat
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Escull entre una partida anunciada (internet) i una partida no anunciada (xarxa d'àrea local, LAN)
 STR_NETWORK_START_SERVER_UNADVERTISED                           :No
 STR_NETWORK_START_SERVER_ADVERTISED                             :Sí
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} client{P "" s}
@@ -4729,10 +4732,10 @@ STR_INDUSTRY_NAME_SUGAR_MINE                                    :{G=Femenin}Mina
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Sense nom
-STR_SV_TRAIN_NAME                                               :{G=Masculin}Tren {COMMA}
-STR_SV_ROAD_VEHICLE_NAME                                        :{G=Masculin}Automòbil {COMMA}
-STR_SV_SHIP_NAME                                                :{G=Masculin}Vaixell {COMMA}
-STR_SV_AIRCRAFT_NAME                                            :{G=Masculin}Avió {COMMA}
+STR_SV_TRAIN_NAME                                               :{G=Masculin}Tren #{COMMA}
+STR_SV_ROAD_VEHICLE_NAME                                        :{G=Masculin}Automòbil #{COMMA}
+STR_SV_SHIP_NAME                                                :{G=Masculin}Vaixell #{COMMA}
+STR_SV_AIRCRAFT_NAME                                            :{G=Masculin}Avió #{COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} Nord
@@ -5034,6 +5037,7 @@ STR_FORMAT_BUOY_NAME                                            :Boia de {TOWN}
 STR_FORMAT_BUOY_NAME_SERIAL                                     :Boia de {TOWN} #{COMMA}
 STR_FORMAT_COMPANY_NUM                                          :{G=Femenin}(Companyia {COMMA})
 STR_FORMAT_GROUP_NAME                                           :{G=Masculin}Grup {COMMA}
+STR_FORMAT_GROUP_VEHICLE_NAME                                   :{GROUP} #{COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{TOWN}: {STRING}
 STR_FORMAT_WAYPOINT_NAME                                        :Punt de pas de {TOWN}
 STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Punt de pas de {TOWN} #{COMMA}

src/lang/croatian.txt

@@ -73,12 +73,12 @@ STR_CARGO_PLURAL_SUGAR                                          :Šećer
 STR_CARGO_PLURAL_SUGAR.gen                                      :šećera
 STR_CARGO_PLURAL_TOYS                                           :Igračke
 STR_CARGO_PLURAL_TOYS.gen                                       :igračaka
-STR_CARGO_PLURAL_CANDY                                          :Slatkiši
-STR_CARGO_PLURAL_CANDY.gen                                      :slatkiša
+STR_CARGO_PLURAL_SWEETS                                         :Slatkiši
+STR_CARGO_PLURAL_SWEETS.gen                                     :slatkiša
 STR_CARGO_PLURAL_COLA                                           :Cola
 STR_CARGO_PLURAL_COLA.gen                                       :cole
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Šećerna vuna
-STR_CARGO_PLURAL_COTTON_CANDY.gen                               :šećerne vune
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Šećerna vuna
+STR_CARGO_PLURAL_CANDYFLOSS.gen                                 :šećerne vune
 STR_CARGO_PLURAL_BUBBLES                                        :Baloni
 STR_CARGO_PLURAL_BUBBLES.gen                                    :balona
 STR_CARGO_PLURAL_TOFFEE                                         :Mliječne karamele
@@ -161,15 +161,15 @@ STR_CARGO_SINGULAR_SUGAR.aku                                    :šećer
 STR_CARGO_SINGULAR_TOY                                          :Igračka
 STR_CARGO_SINGULAR_TOY.gen                                      :igračaka
 STR_CARGO_SINGULAR_TOY.aku                                      :igračku
-STR_CARGO_SINGULAR_CANDY                                        :Slatkiš
-STR_CARGO_SINGULAR_CANDY.gen                                    :slatkiša
-STR_CARGO_SINGULAR_CANDY.aku                                    :slatkiš
+STR_CARGO_SINGULAR_SWEETS                                       :Slatkiš
+STR_CARGO_SINGULAR_SWEETS.gen                                   :slatkiša
+STR_CARGO_SINGULAR_SWEETS.aku                                   :slatkiš
 STR_CARGO_SINGULAR_COLA                                         :Cola
 STR_CARGO_SINGULAR_COLA.gen                                     :cole
 STR_CARGO_SINGULAR_COLA.aku                                     :colu
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Šećerna vuna
-STR_CARGO_SINGULAR_COTTON_CANDY.gen                             :šećerne vune
-STR_CARGO_SINGULAR_COTTON_CANDY.aku                             :šećernu vunu
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Šećerna vuna
+STR_CARGO_SINGULAR_CANDYFLOSS.gen                               :šećerne vune
+STR_CARGO_SINGULAR_CANDYFLOSS.aku                               :šećernu vunu
 STR_CARGO_SINGULAR_BUBBLE                                       :Balon
 STR_CARGO_SINGULAR_BUBBLE.gen                                   :balona
 STR_CARGO_SINGULAR_BUBBLE.aku                                   :balon
@@ -411,6 +411,8 @@ STR_SORT_BY_RANGE                                               :Domet
 STR_SORT_BY_POPULATION                                          :Stanovništvo
 STR_SORT_BY_RATING                                              :Rejting
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Zaustavi igru
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Premotaj igru naprijed
@@ -1700,9 +1702,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Linearno
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Smještaj drveća u igri: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Kontroliraj nasumično pojavljivanje stabala tijekom igre. Ovo može utjecati na industrije koje ovise o rastu stabala, npr. pilane
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Nigdje {RED}(uništava pilanu)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Samo u kišnim šumama
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Posvuda
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Položaj glavne alatne trake: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Vodoravna pozicija glavne alatne trake na vrhu zaslona
@@ -2024,10 +2023,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Promijen
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Više igrača
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Sa oglasima
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Odaberi između igre s oglasima (internet) i bez oglasa (Local Area Network, LAN)
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Ne
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Da
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Ime igrača:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Ovo je ime po kojem će te drugi igrači raspoznavati
 
@@ -2068,8 +2063,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Pridruž
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Osvježi poslužitelj
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Osvježi podatke o poslužitelju
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Pronađi poslužitelj
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Pronađi poslužitelje u mreži
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Dodaj poslužitelj
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Dodaje poslužitelj na popis koji će uvijek biti provjeren postoje li igre u tijeku.
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Pokreni poslužitelj
@@ -2086,6 +2079,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Ime igre
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Postavi zaporku
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Zaštiti svoju igru pomoću zaporke ukoliko ne želiš da bude javno dostupna
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Sa oglasima
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Odaberi između igre s oglasima (internet) i bez oglasa (Local Area Network, LAN)
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Ne
 STR_NETWORK_START_SERVER_ADVERTISED                             :Da
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} klijen{P t ta ata}

src/lang/czech.txt

@@ -102,17 +102,17 @@ STR_CARGO_PLURAL_SUGAR.big                                      :Cukr
 STR_CARGO_PLURAL_TOYS                                           :hračky
 STR_CARGO_PLURAL_TOYS.gen                                       :hraček
 STR_CARGO_PLURAL_TOYS.big                                       :Hračky
-STR_CARGO_PLURAL_CANDY                                          :bonbony
-STR_CARGO_PLURAL_CANDY.gen                                      :bonbonů
-STR_CARGO_PLURAL_CANDY.big                                      :Bonbony
+STR_CARGO_PLURAL_SWEETS                                         :bonbony
+STR_CARGO_PLURAL_SWEETS.gen                                     :bonbonů
+STR_CARGO_PLURAL_SWEETS.big                                     :Bonbony
 STR_CARGO_PLURAL_COLA                                           :kola
 STR_CARGO_PLURAL_COLA.gen                                       :koly
 STR_CARGO_PLURAL_COLA.acc                                       :kolu
 STR_CARGO_PLURAL_COLA.big                                       :Kola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :cukrová vata
-STR_CARGO_PLURAL_COTTON_CANDY.gen                               :cukrové vaty
-STR_CARGO_PLURAL_COTTON_CANDY.acc                               :cukrovou vatu
-STR_CARGO_PLURAL_COTTON_CANDY.big                               :Cukrová vata
+STR_CARGO_PLURAL_CANDYFLOSS                                     :cukrová vata
+STR_CARGO_PLURAL_CANDYFLOSS.gen                                 :cukrové vaty
+STR_CARGO_PLURAL_CANDYFLOSS.acc                                 :cukrovou vatu
+STR_CARGO_PLURAL_CANDYFLOSS.big                                 :Cukrová vata
 STR_CARGO_PLURAL_BUBBLES                                        :bubliny
 STR_CARGO_PLURAL_BUBBLES.gen                                    :bublin
 STR_CARGO_PLURAL_BUBBLES.big                                    :Bubliny
@@ -157,9 +157,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :pšenice
 STR_CARGO_SINGULAR_RUBBER                                       :kaučuku
 STR_CARGO_SINGULAR_SUGAR                                        :cukru
 STR_CARGO_SINGULAR_TOY                                          :hraček
-STR_CARGO_SINGULAR_CANDY                                        :bonbonů
+STR_CARGO_SINGULAR_SWEETS                                       :bonbonů
 STR_CARGO_SINGULAR_COLA                                         :koly
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :cukrové vaty
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :cukrové vaty
 STR_CARGO_SINGULAR_BUBBLE                                       :bublin
 STR_CARGO_SINGULAR_TOFFEE                                       :karamelu
 STR_CARGO_SINGULAR_BATTERY                                      :baterií
@@ -392,6 +392,8 @@ STR_SORT_BY_RANGE                                               :dosah
 STR_SORT_BY_POPULATION                                          :Podle populace
 STR_SORT_BY_RATING                                              :Hodnocení
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pauza
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Zrychlit běh hry
@@ -1854,9 +1856,6 @@ STR_CONFIG_SETTING_TOWN_CARGO_FACTOR_HELPTEXT                   :Cestující, po
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Umístění stromů ve hře: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Náhodné umisťování stromů během hry. Může ovlivnit průmysl závisející na růstu stromů, například pily.
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Žádné {RED}(nefunguje pila)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Jen v deštných pralesech
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Všude
 
 STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE                        :Upravené umístění arktických stromů: {STRING}
 STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE_HELPTEXT               :Upraví umístění stromů kolem sněhové čáry v sub-arktickém klimatu. Stromy nad sněhovou čarou řídnou. Stromy jsou směsí arktických a mírných těsně pod sněhovou čarou. Níže jsou už pouze stromy mírného pásma.
@@ -2274,10 +2273,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Změnit
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multiplayer
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Vypsané
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Vyber mezi propagovanou (internet) a nepropagovanou (Místní síť, LAN) hrou
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Ne
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Ano
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Jméno hráče:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Podle tohoto jména tě ostatní hráči poznají
 
@@ -2318,8 +2313,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Přidat
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Obnovit info
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Znovu načte informace o serveru
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Najít server
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Hledat server v síti
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Přidat server
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Přidá server do seznamu, ve kterém se budou hledat běžící hry
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Spustit server
@@ -2336,6 +2329,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Jméno h
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Nastavit heslo
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Svoji hru si můžeš ochránit heslem, když nechceš, aby se ti do ni hlásili jiní lidé
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Vypsané
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Vyber mezi propagovanou (internet) a nepropagovanou (Místní síť, LAN) hrou
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Ne
 STR_NETWORK_START_SERVER_ADVERTISED                             :Ano
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} klient{P "" i ů}

src/lang/danish.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Hvede
 STR_CARGO_PLURAL_RUBBER                                         :Gummi
 STR_CARGO_PLURAL_SUGAR                                          :Sukker
 STR_CARGO_PLURAL_TOYS                                           :Legetøj
-STR_CARGO_PLURAL_CANDY                                          :Slik
+STR_CARGO_PLURAL_SWEETS                                         :Slik
 STR_CARGO_PLURAL_COLA                                           :Cola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Candyfloss
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Candyfloss
 STR_CARGO_PLURAL_BUBBLES                                        :Bobler
 STR_CARGO_PLURAL_TOFFEE                                         :Karamel
 STR_CARGO_PLURAL_BATTERIES                                      :Batterier
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Hvede
 STR_CARGO_SINGULAR_RUBBER                                       :Gummi
 STR_CARGO_SINGULAR_SUGAR                                        :Sukker
 STR_CARGO_SINGULAR_TOY                                          :Legetøj
-STR_CARGO_SINGULAR_CANDY                                        :Slik
+STR_CARGO_SINGULAR_SWEETS                                       :Slik
 STR_CARGO_SINGULAR_COLA                                         :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Candyfloss
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Candyfloss
 STR_CARGO_SINGULAR_BUBBLE                                       :Boble
 STR_CARGO_SINGULAR_TOFFEE                                       :Karamel
 STR_CARGO_SINGULAR_BATTERY                                      :Batteri
@@ -315,6 +315,8 @@ STR_SORT_BY_RANGE                                               :Interval
 STR_SORT_BY_POPULATION                                          :Indbyggertal
 STR_SORT_BY_RATING                                              :Værdi
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Sæt spillet på pause
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Kør spillet hurtigere
@@ -1605,9 +1607,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Lineær
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Placering af træer i spillet: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Kontroller den tilfældige fremkomst af træer i løbet af spillet. Dette vil påvirke industrier der afhænger træers vækst, f.eks. savværker
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Ingen {RED}(ødelægger træfabrik)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Kun i regnskove
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Alle steder
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Placering af værktøjslinje: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Horisontal placering af hovedværktøjlinjen i toppen af skærmen
@@ -1929,10 +1928,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Ændre s
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Netværksspil
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Offentlig
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Vælg mellem et offentligt (internet) og et ikke offentligt (lokalnetværk, LAN) spil
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Nej
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Ja
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Spiller navn:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Dette er det navn, som andre spillere vil kende dig ved
 
@@ -1973,8 +1968,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Tilslut
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Genopfrisk server
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Genopfrisk serverens info
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Find server
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Søg netværket for en server
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Tilføj server
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Tilføjer en server til listen, som altid vil blive tjekket for kørerende spil.
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Start server
@@ -1991,6 +1984,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Navnet v
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Sæt kodeord
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Beskyt dit spil med et kodeord hvis du ikke vil have fremmede med
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Offentlig
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Vælg mellem et offentligt (internet) og et ikke offentligt (lokalnetværk, LAN) spil
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Nej
 STR_NETWORK_START_SERVER_ADVERTISED                             :Ja
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} klient{P "" er}

src/lang/dutch.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Tarwe
 STR_CARGO_PLURAL_RUBBER                                         :Rubber
 STR_CARGO_PLURAL_SUGAR                                          :Suiker
 STR_CARGO_PLURAL_TOYS                                           :Speelgoed
-STR_CARGO_PLURAL_CANDY                                          :Snoep
+STR_CARGO_PLURAL_SWEETS                                         :Snoep
 STR_CARGO_PLURAL_COLA                                           :Cola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Suikerspin
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Suikerspin
 STR_CARGO_PLURAL_BUBBLES                                        :Bellen
 STR_CARGO_PLURAL_TOFFEE                                         :Toffee
 STR_CARGO_PLURAL_BATTERIES                                      :Batterijen
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Tarwe
 STR_CARGO_SINGULAR_RUBBER                                       :Rubber
 STR_CARGO_SINGULAR_SUGAR                                        :Suiker
 STR_CARGO_SINGULAR_TOY                                          :Speelgoed
-STR_CARGO_SINGULAR_CANDY                                        :Snoep
+STR_CARGO_SINGULAR_SWEETS                                       :Snoep
 STR_CARGO_SINGULAR_COLA                                         :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Suikerspin
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Suikerspin
 STR_CARGO_SINGULAR_BUBBLE                                       :Bubbel
 STR_CARGO_SINGULAR_TOFFEE                                       :Toffee
 STR_CARGO_SINGULAR_BATTERY                                      :Batterij
@@ -315,6 +315,8 @@ STR_SORT_BY_RANGE                                               :Bereik
 STR_SORT_BY_POPULATION                                          :Aantal inwoners
 STR_SORT_BY_RATING                                              :Waardering
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Hiermee pauzeer je het spel
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Hiermee verhoog je de spelsnelheid
@@ -1604,9 +1606,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Lineair
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Plaatsing van bomen in het spel: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Beheert het willekeurig verschijnen van bomen tijdens het spel. Dit kan gevolgen hebben voor industrietakken die afhankelijk zijn van groei van bomen, bijvoorbeeld houtzagerijen.
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Geen {RED}(houtzagerijen werken niet)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Alleen in regenwouden
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Overal
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Positie van algemene knoppenbalk: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Horizontale positie van de algemene taakbalk aan de bovenkant van het scherm.
@@ -1928,10 +1927,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Verander
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Netwerkspel
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Openbaar
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Kies tussen een openbaar (internet) en een niet-openbaar (Local Area Network, LAN) spel
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Nee
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Ja
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Spelersnaam:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Dit is de naam waarmee andere spelers je herkennen
 
@@ -1972,8 +1967,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Meespele
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Ververs server
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Ververs de informatie over deze server
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Server zoeken
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Zoek op het netwerk naar een server
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Voeg server toe
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Voegt een server toe aan de lijst die altijd gecontroleerd zal worden op draaiende spellen
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Start server
@@ -1990,6 +1983,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}De speln
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Wachtwoord instellen
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Beveilig je spel met een wachtwoord als je niet wilt dat dit algemeen toegankelijk is
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Openbaar
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Kies tussen een openbaar (internet) en een niet-openbaar (Local Area Network, LAN) spel
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Nee
 STR_NETWORK_START_SERVER_ADVERTISED                             :Ja
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} speler{P "" s}

src/lang/english.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Wheat
 STR_CARGO_PLURAL_RUBBER                                         :Rubber
 STR_CARGO_PLURAL_SUGAR                                          :Sugar
 STR_CARGO_PLURAL_TOYS                                           :Toys
-STR_CARGO_PLURAL_CANDY                                          :Sweets
+STR_CARGO_PLURAL_SWEETS                                         :Sweets
 STR_CARGO_PLURAL_COLA                                           :Cola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Candyfloss
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Candyfloss
 STR_CARGO_PLURAL_BUBBLES                                        :Bubbles
 STR_CARGO_PLURAL_TOFFEE                                         :Toffee
 STR_CARGO_PLURAL_BATTERIES                                      :Batteries
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Wheat
 STR_CARGO_SINGULAR_RUBBER                                       :Rubber
 STR_CARGO_SINGULAR_SUGAR                                        :Sugar
 STR_CARGO_SINGULAR_TOY                                          :Toy
-STR_CARGO_SINGULAR_CANDY                                        :Sweet
+STR_CARGO_SINGULAR_SWEETS                                       :Sweet
 STR_CARGO_SINGULAR_COLA                                         :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Candyfloss
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Candyfloss
 STR_CARGO_SINGULAR_BUBBLE                                       :Bubble
 STR_CARGO_SINGULAR_TOFFEE                                       :Toffee
 STR_CARGO_SINGULAR_BATTERY                                      :Battery
@@ -319,6 +319,15 @@ STR_SORT_BY_VEHICLE_COUNT                                       :Vehicle count
 STR_SORT_BY_RANGE                                               :Range
 STR_SORT_BY_POPULATION                                          :Population
 STR_SORT_BY_RATING                                              :Rating
+STR_SORT_BY_NUM_VEHICLES                                        :Number of vehicles
+STR_SORT_BY_TOTAL_PROFIT_LAST_YEAR                              :Total profit last year
+STR_SORT_BY_TOTAL_PROFIT_THIS_YEAR                              :Total profit this year
+STR_SORT_BY_AVERAGE_PROFIT_LAST_YEAR                            :Average profit last year
+STR_SORT_BY_AVERAGE_PROFIT_THIS_YEAR                            :Average profit this year
+
+# Group by options for vehicle list
+STR_GROUP_BY_NONE                                               :None
+STR_GROUP_BY_SHARED_ORDERS                                      :Shared orders
 
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pause game
@@ -1809,9 +1818,10 @@ STR_CONFIG_SETTING_INDUSTRY_CARGO_FACTOR_HELPTEXT               :Primary industr
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :In game placement of trees: {STRING2}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Control random appearance of trees during the game. This might affect industries which rely on tree growth, for example lumber mills
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :None {RED}(breaks lumber mill)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Only in rain forests
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Everywhere
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_SPREAD               :Grow but don't spread {RED}(breaks lumber mill)
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_RAINFOREST       :Grow but only spread in rain forests
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_ALL              :Grow and spread everywhere
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_GROWTH_NO_SPREAD     :Don't grow, don't spread {RED}(breaks lumber mill)
 
 STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE                        :Adjusted arctic tree placement: {STRING2}
 STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE_HELPTEXT               :Adjust placement of trees around snow line in artic climate. Trees thin out above snowline. Trees are a mix of arctic and temperate just below snowline. Below that trees are temperate.
@@ -2253,10 +2263,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Change t
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multiplayer
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Advertised
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Choose between an advertised (internet) and a not advertised (Local Area Network, LAN) game
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :No
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Yes
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Player name:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}This is the name other players will identify you by
 
@@ -2297,8 +2303,10 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Join gam
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Refresh server
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Refresh the server info
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Find server
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Search network for a server
+STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET                  :{BLACK}Search internet
+STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET_TOOLTIP          :{BLACK}Search internet for public servers
+STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN                       :{BLACK}Search LAN
+STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN_TOOLTIP               :{BLACK}Search local area network for servers
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Add server
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Adds a server to the list which will always be checked for running games
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Start server
@@ -2315,6 +2323,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}The game
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Set password
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Protect your game with a password if you don't want it to be publicly accessible
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Advertised
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Choose between an advertised (internet) and a not advertised (Local Area Network, LAN) game
 STR_NETWORK_START_SERVER_UNADVERTISED                           :No
 STR_NETWORK_START_SERVER_ADVERTISED                             :Yes
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} client{P "" s}

src/lang/english_AU.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Wheat
 STR_CARGO_PLURAL_RUBBER                                         :Rubber
 STR_CARGO_PLURAL_SUGAR                                          :Sugar
 STR_CARGO_PLURAL_TOYS                                           :Toys
-STR_CARGO_PLURAL_CANDY                                          :Lollies
+STR_CARGO_PLURAL_SWEETS                                         :Lollies
 STR_CARGO_PLURAL_COLA                                           :Cola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Fairy Floss
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Fairy Floss
 STR_CARGO_PLURAL_BUBBLES                                        :Bubbles
 STR_CARGO_PLURAL_TOFFEE                                         :Toffee
 STR_CARGO_PLURAL_BATTERIES                                      :Batteries
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Wheat
 STR_CARGO_SINGULAR_RUBBER                                       :Rubber
 STR_CARGO_SINGULAR_SUGAR                                        :Sugar
 STR_CARGO_SINGULAR_TOY                                          :Toy
-STR_CARGO_SINGULAR_CANDY                                        :lollies
+STR_CARGO_SINGULAR_SWEETS                                       :lollies
 STR_CARGO_SINGULAR_COLA                                         :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Fairy Floss
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Fairy Floss
 STR_CARGO_SINGULAR_BUBBLE                                       :Bubble
 STR_CARGO_SINGULAR_TOFFEE                                       :Toffee
 STR_CARGO_SINGULAR_BATTERY                                      :Battery
@@ -302,6 +302,8 @@ STR_SORT_BY_RANGE                                               :Range
 STR_SORT_BY_POPULATION                                          :Population
 STR_SORT_BY_RATING                                              :Rating
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pause game
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Fast forward the game
@@ -1530,9 +1532,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :Allowed, custom
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :In game placement of trees: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Control random appearance of trees during the game. This might affect industries which rely on tree growth, for example lumber mills
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :None {RED}(breaks lumber mill)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Only in rain forests
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Everywhere
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Position of main toolbar: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Horizontal position of the main toolbar at the top of the screen
@@ -1848,10 +1847,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Change t
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multiplayer
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Advertised
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Choose between an advertised (internet) and a not advertised (Local Area Network, LAN) game
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :No
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Yes
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Player name:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}This is the name other players will identify you by
 
@@ -1892,8 +1887,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Join gam
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Refresh server
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Refresh the server info
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Find server
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Search network for a server
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Add server
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Adds a server to the list which will always be checked for running games
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Start server
@@ -1910,6 +1903,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}The game
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Set password
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Protect your game with a password if you don't want it to be publicly accessible
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Advertised
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Choose between an advertised (internet) and a not advertised (Local Area Network, LAN) game
 STR_NETWORK_START_SERVER_UNADVERTISED                           :No
 STR_NETWORK_START_SERVER_ADVERTISED                             :Yes
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} client{P "" s}

src/lang/english_US.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Wheat
 STR_CARGO_PLURAL_RUBBER                                         :Rubber
 STR_CARGO_PLURAL_SUGAR                                          :Sugar
 STR_CARGO_PLURAL_TOYS                                           :Toys
-STR_CARGO_PLURAL_CANDY                                          :Candy
+STR_CARGO_PLURAL_SWEETS                                         :Candy
 STR_CARGO_PLURAL_COLA                                           :Cola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Cotton Candy
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Cotton Candy
 STR_CARGO_PLURAL_BUBBLES                                        :Bubbles
 STR_CARGO_PLURAL_TOFFEE                                         :Toffee
 STR_CARGO_PLURAL_BATTERIES                                      :Batteries
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Wheat
 STR_CARGO_SINGULAR_RUBBER                                       :Rubber
 STR_CARGO_SINGULAR_SUGAR                                        :Sugar
 STR_CARGO_SINGULAR_TOY                                          :Toy
-STR_CARGO_SINGULAR_CANDY                                        :Candy
+STR_CARGO_SINGULAR_SWEETS                                       :Candy
 STR_CARGO_SINGULAR_COLA                                         :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Cotton Candy
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Cotton Candy
 STR_CARGO_SINGULAR_BUBBLE                                       :Bubble
 STR_CARGO_SINGULAR_TOFFEE                                       :Toffee
 STR_CARGO_SINGULAR_BATTERY                                      :Battery
@@ -315,6 +315,8 @@ STR_SORT_BY_RANGE                                               :Range
 STR_SORT_BY_POPULATION                                          :Population
 STR_SORT_BY_RATING                                              :Rating
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pause game
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Fast forward the game
@@ -1602,9 +1604,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Linear
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :In-game placement of trees: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Control random appearance of trees during the game. This might affect industries which rely on tree growth, for example lumber mills
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :None {RED}(breaks lumber mill)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Only in rain forests
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Everywhere
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Position of main toolbar: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Horizontal position of the main toolbar at the top of the screen
@@ -1926,10 +1925,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Change t
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multiplayer
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Advertised
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Choose between an advertised (internet) and a not advertised (Local Area Network, LAN) game
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :No
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Yes
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Player name:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}This is the name other players will identify you by
 
@@ -1970,8 +1965,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Join gam
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Refresh server
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Refresh the server info
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Find server
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Search network for a server
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Add server
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Adds a server to the list which will always be checked for running games
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Start server
@@ -1988,6 +1981,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}The game
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Set password
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Protect your game with a password if you don't want it to be publicly accessible
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Advertised
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Choose between an advertised (internet) and a not advertised (Local Area Network, LAN) game
 STR_NETWORK_START_SERVER_UNADVERTISED                           :No
 STR_NETWORK_START_SERVER_ADVERTISED                             :Yes
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} client{P "" s}

src/lang/esperanto.txt

@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Tritiko
 STR_CARGO_PLURAL_RUBBER                                         :Kaŭĉuko
 STR_CARGO_PLURAL_SUGAR                                          :Sukero
 STR_CARGO_PLURAL_TOYS                                           :Ludiloj
-STR_CARGO_PLURAL_CANDY                                          :Dolĉaĵoj
+STR_CARGO_PLURAL_SWEETS                                         :Dolĉaĵoj
 STR_CARGO_PLURAL_COLA                                           :Kolao
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Sukerŝpinaĵoj
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Sukerŝpinaĵoj
 STR_CARGO_PLURAL_BUBBLES                                        :Vezikoj
 STR_CARGO_PLURAL_TOFFEE                                         :Tofeoj
 STR_CARGO_PLURAL_BATTERIES                                      :Baterioj
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Tritiko
 STR_CARGO_SINGULAR_RUBBER                                       :Kaŭĉuko
 STR_CARGO_SINGULAR_SUGAR                                        :Sukero
 STR_CARGO_SINGULAR_TOY                                          :Ludilo
-STR_CARGO_SINGULAR_CANDY                                        :Dolĉaĵo
+STR_CARGO_SINGULAR_SWEETS                                       :Dolĉaĵo
 STR_CARGO_SINGULAR_COLA                                         :Kolao
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Sukerŝpinaĵo
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Sukerŝpinaĵo
 STR_CARGO_SINGULAR_BUBBLE                                       :Veziko
 STR_CARGO_SINGULAR_TOFFEE                                       :Tofeo
 STR_CARGO_SINGULAR_BATTERY                                      :Baterio
@@ -304,6 +304,8 @@ STR_SORT_BY_CARGO_CAPACITY                                      :Ŝarĝkapablo
 STR_SORT_BY_RANGE                                               :Atingopovo
 STR_SORT_BY_POPULATION                                          :Enloĝantaro
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Paŭzigu la ludon
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Rapide pluirigu la ludon
@@ -1324,9 +1326,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED                        :permesate
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :permesate, kutimo urbomapo
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :En ludo metanta de arbojn: {STRING}
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :neniu {RED}(rompas ligno muelilo)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :nur en tropika praarbaroj
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Ĉie
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Loko de ĉefa ilbreto: {STRING}
 STR_CONFIG_SETTING_STATUSBAR_POS                                :Loko de kondiĉbaro: {STRING}
@@ -1572,8 +1571,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Aliĝu a
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Refreŝigu servilon
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Refreŝigu servilajn informojn
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Trovu servilon
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Serĉu reton por servilo
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Aldonu servilon
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Aldonas servilon al la listo kiu ĉiam estos kontrolata pri kurantaj ludoj
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Startu servilon

src/lang/estonian.txt

@@ -72,12 +72,12 @@ STR_CARGO_PLURAL_SUGAR                                          :Suhkur
 STR_CARGO_PLURAL_SUGAR.g                                        :Suhkru
 STR_CARGO_PLURAL_TOYS                                           :Mänguasjad
 STR_CARGO_PLURAL_TOYS.g                                         :Mänguasjade
-STR_CARGO_PLURAL_CANDY                                          :Maiustused
-STR_CARGO_PLURAL_CANDY.g                                        :Maiustuste
+STR_CARGO_PLURAL_SWEETS                                         :Maiustused
+STR_CARGO_PLURAL_SWEETS.g                                       :Maiustuste
 STR_CARGO_PLURAL_COLA                                           :Koola
 STR_CARGO_PLURAL_COLA.g                                         :Koola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Suhkruvatt
-STR_CARGO_PLURAL_COTTON_CANDY.g                                 :Suhkruvati
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Suhkruvatt
+STR_CARGO_PLURAL_CANDYFLOSS.g                                   :Suhkruvati
 STR_CARGO_PLURAL_BUBBLES                                        :Mullid
 STR_CARGO_PLURAL_BUBBLES.g                                      :Mullide
 STR_CARGO_PLURAL_TOFFEE                                         :Iiris
@@ -137,9 +137,9 @@ STR_CARGO_SINGULAR_SUGAR                                        :Suhkur
 STR_CARGO_SINGULAR_SUGAR.g                                      :Suhkru
 STR_CARGO_SINGULAR_TOY                                          :Mänguasjad
 STR_CARGO_SINGULAR_TOY.g                                        :Mänguasjade
-STR_CARGO_SINGULAR_CANDY                                        :Maiustus
+STR_CARGO_SINGULAR_SWEETS                                       :Maiustus
 STR_CARGO_SINGULAR_COLA                                         :Koola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Suhkruvatt
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Suhkruvatt
 STR_CARGO_SINGULAR_BUBBLE                                       :Mullid
 STR_CARGO_SINGULAR_TOFFEE                                       :Iiris
 STR_CARGO_SINGULAR_TOFFEE.g                                     :Iirise
@@ -368,6 +368,8 @@ STR_SORT_BY_RANGE                                               :Vahekaugus
 STR_SORT_BY_POPULATION                                          :Rahvaarv
 STR_SORT_BY_RATING                                              :Hinnang
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Seiska mäng
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Kiirenda mängu
@@ -1619,9 +1621,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :Lubatud, koos l
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Mängu jooksul kasvavad puud: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Juhib suvalist puude kasvu mängu jooksul. See seade võib mõjutada osade tööstuste tööd, mis sõltuvad puude kasvust (näiteks saekaater)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Ei {RED}(saeveski ei tööta)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Ainult vihmametsades
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Igal pool
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Peamine tarvikuriba paikneb: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Tarvikuriba rõhtne paiknemine ekraani ülaosas
@@ -1942,10 +1941,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Vaheta k
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Mitmikmäng
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Reklaamitav
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Valib reklaamitava (internet) või mittereklaamitava (kohtvõrk, LAN) mängu
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Ei
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Jah
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Mängija nimi:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Teised mängijad tunnevad sind selle nime järgi
 
@@ -1986,8 +1981,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Liitu m
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Uuenda andmeid
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Serveri info värskendamine
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Uuenda loendit
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Uuenda võrgus asuvate serverite loendit
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Sisesta server
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Sisesta loendisse uus server, milles toimuvaid mänge jälgida
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Tee server
@@ -2004,6 +1997,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Serveril
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Määra salasõna
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Et server ei oleks avalik, kaitse oma mäng salasõnaga
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Reklaamitav
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Valib reklaamitava (internet) või mittereklaamitava (kohtvõrk, LAN) mängu
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Jah
 STR_NETWORK_START_SERVER_ADVERTISED                             :Jah
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} klient{P "" i}

src/lang/faroese.txt

@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT                                          :{G=n}Hveiti
 STR_CARGO_PLURAL_RUBBER                                         :{G=n}Gummi
 STR_CARGO_PLURAL_SUGAR                                          :{G=n}Sukur
 STR_CARGO_PLURAL_TOYS                                           :{G=n}Leikutoy
-STR_CARGO_PLURAL_CANDY                                          :{G=n}Góðgæti
+STR_CARGO_PLURAL_SWEETS                                         :{G=n}Góðgæti
 STR_CARGO_PLURAL_COLA                                           :{G=n}Kola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :{G=n}Kandifloss
+STR_CARGO_PLURAL_CANDYFLOSS                                     :{G=n}Kandifloss
 STR_CARGO_PLURAL_BUBBLES                                        :{G=f}Sápiblørir
 STR_CARGO_PLURAL_TOFFEE                                         :{G=n}Toffee
 STR_CARGO_PLURAL_BATTERIES                                      :{G=n}Battarí
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :{G=n}Hveiti
 STR_CARGO_SINGULAR_RUBBER                                       :{G=n}Gummi
 STR_CARGO_SINGULAR_SUGAR                                        :{G=n}Sukur
 STR_CARGO_SINGULAR_TOY                                          :{G=n}Leikutoy
-STR_CARGO_SINGULAR_CANDY                                        :{G=n}Góðgæti
+STR_CARGO_SINGULAR_SWEETS                                       :{G=n}Góðgæti
 STR_CARGO_SINGULAR_COLA                                         :{G=n}Kola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :{G=n}Kandifloss
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :{G=n}Kandifloss
 STR_CARGO_SINGULAR_BUBBLE                                       :{G=f}Sápibløra
 STR_CARGO_SINGULAR_TOFFEE                                       :{G=n}Toffee
 STR_CARGO_SINGULAR_BATTERY                                      :{G=n}Battarí
@@ -292,6 +292,8 @@ STR_SORT_BY_RANGE                                               :Vídd
 STR_SORT_BY_POPULATION                                          :Fólkatal
 STR_SORT_BY_RATING                                              :Virði
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Steðga spælinum
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Skunda undir spæli
@@ -1695,8 +1697,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Broyt sl
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Hópspæl
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Nei
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Ja
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Spælara navn:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Hetta er navni aðrir spælarir fara at kenna teg vi
 
@@ -1737,8 +1737,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Tak lut
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Endurnýggja servara
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Endurnýggja kunning um servara
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Finn servara
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Leita eftir servara á netverki
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Legg servara aftrat
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Leggur ein servara til listan sum altíð verður kannaður fyri koyrandi spøl
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Set servara í gongd

src/lang/finnish.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Vehnää
 STR_CARGO_PLURAL_RUBBER                                         :Kumia
 STR_CARGO_PLURAL_SUGAR                                          :Sokeria
 STR_CARGO_PLURAL_TOYS                                           :Leluja
-STR_CARGO_PLURAL_CANDY                                          :Karkkia
+STR_CARGO_PLURAL_SWEETS                                         :Karkkia
 STR_CARGO_PLURAL_COLA                                           :Limsaa
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Hattaraa
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Hattaraa
 STR_CARGO_PLURAL_BUBBLES                                        :Kuplia
 STR_CARGO_PLURAL_TOFFEE                                         :Toffeeta
 STR_CARGO_PLURAL_BATTERIES                                      :Paristoja
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Vehnä
 STR_CARGO_SINGULAR_RUBBER                                       :Kumi
 STR_CARGO_SINGULAR_SUGAR                                        :Sokeri
 STR_CARGO_SINGULAR_TOY                                          :Lelu
-STR_CARGO_SINGULAR_CANDY                                        :Karkki
+STR_CARGO_SINGULAR_SWEETS                                       :Karkki
 STR_CARGO_SINGULAR_COLA                                         :Limsa
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Hattara
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Hattara
 STR_CARGO_SINGULAR_BUBBLE                                       :Kupla
 STR_CARGO_SINGULAR_TOFFEE                                       :Toffee
 STR_CARGO_SINGULAR_BATTERY                                      :Paristo
@@ -315,6 +315,15 @@ STR_SORT_BY_CARGO_CAPACITY                                      :Rahtikapasiteet
 STR_SORT_BY_RANGE                                               :Toimintasäde
 STR_SORT_BY_POPULATION                                          :Asukasluku
 STR_SORT_BY_RATING                                              :Arvio
+STR_SORT_BY_NUM_VEHICLES                                        :Kulkuneuvojen määrä
+STR_SORT_BY_TOTAL_PROFIT_LAST_YEAR                              :Kokonaistuotto viime vuonna
+STR_SORT_BY_TOTAL_PROFIT_THIS_YEAR                              :Kokonaistuotto tänä vuonna
+STR_SORT_BY_AVERAGE_PROFIT_LAST_YEAR                            :Keskimääräinen tuotto viime vuonna
+STR_SORT_BY_AVERAGE_PROFIT_THIS_YEAR                            :Keskimääräinen tuotto tänä vuonna
+
+# Group by options for vehicle list
+STR_GROUP_BY_NONE                                               :Ei mitään
+STR_GROUP_BY_SHARED_ORDERS                                      :Jaetut käskyt
 
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Tauko
@@ -771,6 +780,7 @@ STR_SMALLMAP_TOOLTIP_ENABLE_ALL_CARGOS                          :{BLACK}Näytä
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Näytä viimeisin viesti tai uutisraportti
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
 STR_STATUSBAR_PAUSED                                            :{YELLOW}*  *  TAUKO  *  *
+STR_STATUSBAR_PAUSED_LINK_GRAPH                                 :{ORANGE}*  *  TAUKO (odotetaan yhteyskuvaajan päivittymistä) *  *
 STR_STATUSBAR_AUTOSAVE                                          :{RED}AUTOMAATTITALLENNUS
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  TALLENNETAAN PELIÄ  *  *
 
@@ -1609,10 +1619,11 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_ORIGINAL                   :Neliöllinen (a
 STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Lineaarinen
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Puiden istutus pelissä: {STRING}
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Määrittää puiden sattumanvaraisen luomisen. Tämä voi vaikuttaa teollisuuslaitoksiin jotka ovat riippuvaisia puiden kasvamisesta, esimerkiksi sahat
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Ei ollenkaan {RED}(rikkoo sahan)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Vain sademetsiin
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Kaikkialle
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Määrittää puiden sattumanvaraisen luomisen. Tämä voi vaikuttaa teollisuuslaitoksiin, jotka ovat riippuvaisia puiden kasvamisesta, esimerkiksi sahat.
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_SPREAD               :Puut kasvavat, mutta eivät leviä {RED}(rikkoo sahan)
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_RAINFOREST       :Puut kasvavat, mutta leviävät vain sademetsissä
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_ALL              :Puut kasvavat ja leviävät kaikkialla
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_GROWTH_NO_SPREAD     :Puut eivät kasva eivätkä leviä {RED}(rikkoo sahan)
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Päätyökalupalkin sijainti: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Ruudun yläreunassa olevan työkalupalkin sijainti vaakasuunnassa
@@ -1936,10 +1947,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Vaihda s
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Moninpeli
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Mainostettu
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Valitse mainostettu (internet) tai ei-mainostettu (paikallisverkko, LAN) peli
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Ei
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Kyllä
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Pelaajan nimi
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Pelaajat tunnistetaan ja erotetaan toisistaan nimien avulla
 
@@ -1980,8 +1987,10 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Liity pe
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Päivitä
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Päivitä palvelintiedot
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Etsi palvelin
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Etsi palvelin verkosta
+STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET                  :{BLACK}Etsi internetistä
+STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET_TOOLTIP          :{BLACK}Etsi julkisia palvelimia internetistä
+STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN                       :{BLACK}Etsi lähiverkosta
+STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN_TOOLTIP               :{BLACK}Etsi palvelimia lähiverkosta
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Lisää palvelin
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Lisää palvelin listaan, joka käydään läpi aina uusia pelejä haettaessa
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Käynnistä palvelin
@@ -1998,6 +2007,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Nimi nä
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Aseta salasana
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Jos peliin ei halua ulkopuolisia, voi sen suojata salasanalla
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Mainostettu
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Valitse mainostettu (internet) tai ei-mainostettu (paikallisverkko, LAN) peli
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Ei
 STR_NETWORK_START_SERVER_ADVERTISED                             :Kyllä
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} asiakas{P "" ta}
@@ -2205,11 +2216,13 @@ STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_1                  :Peli yhä pysä
 STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_2                  :Peli yhä pysäytetty ({STRING}, {STRING})
 STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_3                  :Peli yhä pysäytetty ({STRING}, {STRING}, {STRING})
 STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_4                  :Peli yhä pysäytetty ({STRING}, {STRING}, {STRING}, {STRING})
+STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_5                  :Peli yhä pysäytetty ({STRING}, {STRING}, {STRING}, {STRING}, {STRING})
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED                        :Peliä jatketaan ({STRING})
 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS       :pelaajien määrä
 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_CONNECTING_CLIENTS       :yhdistäviä pelaajia
 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_MANUAL                   :manuaalinen
 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_GAME_SCRIPT              :peliskripti
+STR_NETWORK_SERVER_MESSAGE_GAME_REASON_LINK_GRAPH               :odotetaan yhteyskuvaajan päivittymistä
 ############ End of leave-in-this-order
 STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :poistutaan
 STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} on liittynyt peliin
@@ -4240,10 +4253,11 @@ STR_ERROR_UNABLE_TO_DELETE_FILE                                 :{WHITE}Tiedosto
 STR_ERROR_GAME_LOAD_FAILED                                      :{WHITE}Lataus epäonnistui.{}{STRING}
 STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR                   :Sisäinen virhe: {STRING}
 STR_GAME_SAVELOAD_ERROR_BROKEN_SAVEGAME                         :Viallinen tallennus – {STRING}
-STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME                        :Tallennus on tehty uudemalla versiolla
+STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME                        :Tallennus on tehty uudemmalla versiolla
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE                       :Tiedostoa ei voi lukea
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE                      :Tiedostoa ei voi kirjoittaa
 STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED             :Tietojen varmistustarkistus epäonnistui
+STR_GAME_SAVELOAD_ERROR_PATCHPACK                               :Tallennus on tehty muunnellulla versiolla
 STR_GAME_SAVELOAD_NOT_AVAILABLE                                 :<ei saatavilla>
 STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Peli tallennettiin versiossa, joka ei tue raitiovaunuja. Kaikki raitiovaunut on poistettu
 
@@ -4718,7 +4732,7 @@ STR_INDUSTRY_NAME_WATER_SUPPLY                                  :Lähde
 STR_INDUSTRY_NAME_WATER_TOWER                                   :Vesitorni
 STR_INDUSTRY_NAME_FACTORY_2                                     :Tehdas
 STR_INDUSTRY_NAME_FARM_2                                        :Maatila
-STR_INDUSTRY_NAME_LUMBER_MILL                                   :Hakkuualue
+STR_INDUSTRY_NAME_LUMBER_MILL                                   :Saha
 STR_INDUSTRY_NAME_COTTON_CANDY_FOREST                           :Hattarametsä
 STR_INDUSTRY_NAME_CANDY_FACTORY                                 :Karkkitehdas
 STR_INDUSTRY_NAME_BATTERY_FARM                                  :Paristomaatila

src/lang/french.txt

@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Blé
 STR_CARGO_PLURAL_RUBBER                                         :Caoutchouc
 STR_CARGO_PLURAL_SUGAR                                          :Sucre
 STR_CARGO_PLURAL_TOYS                                           :Jouets
-STR_CARGO_PLURAL_CANDY                                          :Bonbons
+STR_CARGO_PLURAL_SWEETS                                         :Bonbons
 STR_CARGO_PLURAL_COLA                                           :Cola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Barbe à papa
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Barbe à papa
 STR_CARGO_PLURAL_BUBBLES                                        :Bulles
 STR_CARGO_PLURAL_TOFFEE                                         :Caramel
 STR_CARGO_PLURAL_BATTERIES                                      :Batteries
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Blé
 STR_CARGO_SINGULAR_RUBBER                                       :Caoutchouc
 STR_CARGO_SINGULAR_SUGAR                                        :Sucre
 STR_CARGO_SINGULAR_TOY                                          :Jouet
-STR_CARGO_SINGULAR_CANDY                                        :Bonbon
+STR_CARGO_SINGULAR_SWEETS                                       :Bonbon
 STR_CARGO_SINGULAR_COLA                                         :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Barbe à papa
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Barbe à papa
 STR_CARGO_SINGULAR_BUBBLE                                       :Bulle
 STR_CARGO_SINGULAR_TOFFEE                                       :Caramel
 STR_CARGO_SINGULAR_BATTERY                                      :Batterie
@@ -317,6 +317,8 @@ STR_SORT_BY_RANGE                                               :Rayon d'action
 STR_SORT_BY_POPULATION                                          :Population
 STR_SORT_BY_RATING                                              :Qualité de service
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Mettre le jeu en pause
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Avance rapide du jeu
@@ -1611,9 +1613,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Linéaire
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Plantation d'arbres durant la partie{NBSP}: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Contrôle l'apparition aléatoire des arbres durant la partie. Cela peut affecter les industries qui dépendent de la croissance des arbres, par exemple les scieries
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Nulle part {RED}(les scieries ne fonctionneront plus)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Seulement dans les forêts tropicales
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Partout
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Position de la barre d'outils principale{NBSP}: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Position horizontale de la barre d'outils principale en haut de l'écran
@@ -1937,10 +1936,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Modifier
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multijoueurs
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Publiée
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Choisir entre une partie publiée (internet) et une partie non publiée (Réseau local, LAN)
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Non
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Oui
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Nom du joueur{NBSP}:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Ceci est le nom sous lequel vous serez connu des autres joueurs
 
@@ -1981,8 +1976,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Rejoindr
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Actualiser
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Actualiser les informations sur le serveur
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Trouver un serveur
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Chercher un serveur sur le réseau
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Ajouter un serveur
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Ajouter un serveur à la liste de ceux parmi lesquels des parties en cours seront toujours cherchées
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Démarrer le serveur
@@ -1999,6 +1992,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Les autr
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Choisir le mot de passe
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Protégez votre partie avec un mot de passe si vous ne souhaitez pas que d'autres l'utilisent
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Publiée
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Choisir entre une partie publiée (internet) et une partie non publiée (Réseau local, LAN)
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Non
 STR_NETWORK_START_SERVER_ADVERTISED                             :Oui
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} client{P "" s}

src/lang/gaelic.txt

@@ -119,18 +119,18 @@ STR_CARGO_PLURAL_TOYS                                           :{G=f}Dèideagan
 STR_CARGO_PLURAL_TOYS.nom                                       :Dèideagan
 STR_CARGO_PLURAL_TOYS.gen                                       :Dhèideagan
 STR_CARGO_PLURAL_TOYS.dat                                       :Dèideagan
-STR_CARGO_PLURAL_CANDY                                          :{G=m}Mìlseanan
-STR_CARGO_PLURAL_CANDY.nom                                      :Mìlseanan
-STR_CARGO_PLURAL_CANDY.gen                                      :Mhìlseanan
-STR_CARGO_PLURAL_CANDY.dat                                      :Mìlseanan
+STR_CARGO_PLURAL_SWEETS                                         :{G=m}Mìlseanan
+STR_CARGO_PLURAL_SWEETS.nom                                     :Mìlseanan
+STR_CARGO_PLURAL_SWEETS.gen                                     :Mhìlseanan
+STR_CARGO_PLURAL_SWEETS.dat                                     :Mìlseanan
 STR_CARGO_PLURAL_COLA                                           :{G=m}Cola
 STR_CARGO_PLURAL_COLA.nom                                       :Cola
 STR_CARGO_PLURAL_COLA.gen                                       :Cola
 STR_CARGO_PLURAL_COLA.dat                                       :Cola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :{G=f}Canach-shiùcair
-STR_CARGO_PLURAL_COTTON_CANDY.nom                               :Canach-shiùcair
-STR_CARGO_PLURAL_COTTON_CANDY.gen                               :Canaich-siùcair
-STR_CARGO_PLURAL_COTTON_CANDY.dat                               :Canach-shiùcair
+STR_CARGO_PLURAL_CANDYFLOSS                                     :{G=f}Canach-shiùcair
+STR_CARGO_PLURAL_CANDYFLOSS.nom                                 :Canach-shiùcair
+STR_CARGO_PLURAL_CANDYFLOSS.gen                                 :Canaich-siùcair
+STR_CARGO_PLURAL_CANDYFLOSS.dat                                 :Canach-shiùcair
 STR_CARGO_PLURAL_BUBBLES                                        :{G=m}Builgeanan
 STR_CARGO_PLURAL_BUBBLES.nom                                    :Builgeanan
 STR_CARGO_PLURAL_BUBBLES.gen                                    :Bhuilgeanan
@@ -246,18 +246,18 @@ STR_CARGO_SINGULAR_TOY                                          :{G=f}Dèideag
 STR_CARGO_SINGULAR_TOY.nom                                      :Dèideag
 STR_CARGO_SINGULAR_TOY.gen                                      :Dèideig
 STR_CARGO_SINGULAR_TOY.dat                                      :Dèideag
-STR_CARGO_SINGULAR_CANDY                                        :{G=m}Mìlsean
-STR_CARGO_SINGULAR_CANDY.nom                                    :Mìlsean
-STR_CARGO_SINGULAR_CANDY.gen                                    :Mìlsein
-STR_CARGO_SINGULAR_CANDY.dat                                    :Mìlsean
+STR_CARGO_SINGULAR_SWEETS                                       :{G=m}Mìlsean
+STR_CARGO_SINGULAR_SWEETS.nom                                   :Mìlsean
+STR_CARGO_SINGULAR_SWEETS.gen                                   :Mìlsein
+STR_CARGO_SINGULAR_SWEETS.dat                                   :Mìlsean
 STR_CARGO_SINGULAR_COLA                                         :{G=m}Cola
 STR_CARGO_SINGULAR_COLA.nom                                     :Cola
 STR_CARGO_SINGULAR_COLA.gen                                     :Cola
 STR_CARGO_SINGULAR_COLA.dat                                     :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :{G=f}Canach-shiùcair
-STR_CARGO_SINGULAR_COTTON_CANDY.nom                             :Canach-shiùcair
-STR_CARGO_SINGULAR_COTTON_CANDY.gen                             :Canaich-siùcair
-STR_CARGO_SINGULAR_COTTON_CANDY.dat                             :Canach-shiùcair
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :{G=f}Canach-shiùcair
+STR_CARGO_SINGULAR_CANDYFLOSS.nom                               :Canach-shiùcair
+STR_CARGO_SINGULAR_CANDYFLOSS.gen                               :Canaich-siùcair
+STR_CARGO_SINGULAR_CANDYFLOSS.dat                               :Canach-shiùcair
 STR_CARGO_SINGULAR_BUBBLE                                       :{G=m}Builgean
 STR_CARGO_SINGULAR_BUBBLE.nom                                   :Builgean
 STR_CARGO_SINGULAR_BUBBLE.gen                                   :Builgein
@@ -498,6 +498,8 @@ STR_SORT_BY_RANGE                                               :Dlùths
 STR_SORT_BY_POPULATION                                          :Àireamh-shluaigh
 STR_SORT_BY_RATING                                              :Rangachadh
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Cuir an geama na stad / a' dol
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Cuir an geama air adhart gu luath
@@ -1761,9 +1763,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :Ceadaichte, co-
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Cur nan craobh sa gheama: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Cùm smachd air na craobhan a nochdas sa gheama air thuaiream. Dh'fhaoidte gun toir seo buaidh air gnìomhachasan a tha an eisimeil fàs nan craobhan a leithid muileannan-fiodha
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Chan eil gin {RED}(brisidh seo muileannan-fiodha)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Ann an coilltean-uisge a-mhàin
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Àite sam bith
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Ionad a' phrìomh bhàir-inneal: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Ionad còmhnard a' phrìomh bhàir-inneal air barr na sgrìn
@@ -2085,10 +2084,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Atharrai
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Ioma-chluicheadair
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Sanasaichte
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Dèan taghadh eadar geama sanasaichte (eadar-lìon) no gun sanasachadh (lìonra ionadail, LAN)
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Gun sanasachadh
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Sanasaichte
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Ainm cluicheadair:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Seo an t-ainm leis an aithnich cluicheadairean eile thu
 
@@ -2129,8 +2124,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Gabh sa
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Ath-nuadhaich am frithealaiche
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Ath-nuadhaich fiosrachadh an fhrithealaiche
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Lorg frithealaiche
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Lorg san lìonraidh airson frithealaiche
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Cuir frithealaiche ris
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Cuiridh seo frithealaiche ris an liosta gus an tèid sùil a thoirt air airson geamannan nan ruith
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Tòisich frithealaiche
@@ -2147,6 +2140,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Thèid a
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Suidhich facal-faire
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Dìon an geama agad le facal-faire ach nach eil e ri fhaighinn gu poblach
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Sanasaichte
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Dèan taghadh eadar geama sanasaichte (eadar-lìon) no gun sanasachadh (lìonra ionadail, LAN)
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Chan eil
 STR_NETWORK_START_SERVER_ADVERTISED                             :Tha
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} {P chliant chliant cliantan cliant}

src/lang/galician.txt

@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Trigo
 STR_CARGO_PLURAL_RUBBER                                         :Caucho
 STR_CARGO_PLURAL_SUGAR                                          :Azucre
 STR_CARGO_PLURAL_TOYS                                           :Xoguetes
-STR_CARGO_PLURAL_CANDY                                          :Lambetadas
+STR_CARGO_PLURAL_SWEETS                                         :Lambetadas
 STR_CARGO_PLURAL_COLA                                           :Cola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Algodón de azucre
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Algodón de azucre
 STR_CARGO_PLURAL_BUBBLES                                        :Burbullas
 STR_CARGO_PLURAL_TOFFEE                                         :Toffee
 STR_CARGO_PLURAL_BATTERIES                                      :Pilas
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Trigo
 STR_CARGO_SINGULAR_RUBBER                                       :Caucho
 STR_CARGO_SINGULAR_SUGAR                                        :Azucre
 STR_CARGO_SINGULAR_TOY                                          :Xoguete
-STR_CARGO_SINGULAR_CANDY                                        :Lambetada
+STR_CARGO_SINGULAR_SWEETS                                       :Lambetada
 STR_CARGO_SINGULAR_COLA                                         :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Algodón de azucre
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Algodón de azucre
 STR_CARGO_SINGULAR_BUBBLE                                       :Burbulla
 STR_CARGO_SINGULAR_TOFFEE                                       :Toffee
 STR_CARGO_SINGULAR_BATTERY                                      :Pila
@@ -316,6 +316,8 @@ STR_SORT_BY_RANGE                                               :Autonomía
 STR_SORT_BY_POPULATION                                          :Poboación
 STR_SORT_BY_RATING                                              :Puntuación
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pausar partida
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Avance rápido da partida
@@ -1597,9 +1599,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Lineal
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Colocación de árbores durante a partida: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Controla a aparición aleatoria de árbores durante a partida. Isto pode afectar ás industrias que dependan do crecemento arbóreo, por exemplo o serradoiro
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Ningún {RED}(rompe o serradoiro)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Só nos bosques
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :En todas partes
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Posición da barra de ferramentas principal: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Posición horizontal da barra de ferramentas principal da parte superior da pantalla
@@ -1921,10 +1920,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Cambia-l
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multixogador
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Anunciado
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Escolle entre unha partida con anuncios (internet) ou sen eles (LAN)
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Non
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Si
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Nome do xogador:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Este é o nome polo que te identificarán os outros xogadores
 
@@ -1965,8 +1960,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Unirse
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Actualizar servidor
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Actualiza-la información do servidor
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Procurar servidor
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Buscar un servidor na rede
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Engadir servidor
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Engade un servidor á lista que será comprobado sempre para buscar partidas.
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Iniciar servidor
@@ -1983,6 +1976,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}O nome d
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Establecer contrasinal
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Protexe a túa partida cun contrasinal se non queres ser accesible públicamente
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Anunciado
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Escolle entre unha partida con anuncios (internet) ou sen eles (LAN)
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Non
 STR_NETWORK_START_SERVER_ADVERTISED                             :Si
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} cliente{P "" s}

src/lang/german.txt

@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT                                          :{G=m}Weizen
 STR_CARGO_PLURAL_RUBBER                                         :{G=m}Kautschuk
 STR_CARGO_PLURAL_SUGAR                                          :{G=m}Zucker
 STR_CARGO_PLURAL_TOYS                                           :{G=p}Spielzeuge
-STR_CARGO_PLURAL_CANDY                                          :{G=p}Bonbons
+STR_CARGO_PLURAL_SWEETS                                         :{G=p}Bonbons
 STR_CARGO_PLURAL_COLA                                           :{G=w}Cola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :{G=w}Zuckerwatte
+STR_CARGO_PLURAL_CANDYFLOSS                                     :{G=w}Zuckerwatte
 STR_CARGO_PLURAL_BUBBLES                                        :{G=p}Luftblasen
 STR_CARGO_PLURAL_TOFFEE                                         :{G=n}Karamell
 STR_CARGO_PLURAL_BATTERIES                                      :{G=p}Batterien
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :{G=n}Weizen
 STR_CARGO_SINGULAR_RUBBER                                       :{G=m}Kautschuk
 STR_CARGO_SINGULAR_SUGAR                                        :{G=m}Zucker
 STR_CARGO_SINGULAR_TOY                                          :{G=n}Spielzeug
-STR_CARGO_SINGULAR_CANDY                                        :{G=m}Bonbon
+STR_CARGO_SINGULAR_SWEETS                                       :{G=m}Bonbon
 STR_CARGO_SINGULAR_COLA                                         :{G=w}Cola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :{G=w}Zuckerwatte
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :{G=w}Zuckerwatte
 STR_CARGO_SINGULAR_BUBBLE                                       :{G=w}Luftblase
 STR_CARGO_SINGULAR_TOFFEE                                       :{G=n}Karamell
 STR_CARGO_SINGULAR_BATTERY                                      :{G=w}Batterie
@@ -321,6 +321,8 @@ STR_SORT_BY_RANGE                                               :Reichweite
 STR_SORT_BY_POPULATION                                          :Bevölkerung
 STR_SORT_BY_RATING                                              :Bewertung
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Spiel anhalten
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Zeitraffer (Zeit vergeht schnellstmöglich)
@@ -1797,9 +1799,6 @@ STR_CONFIG_SETTING_INDUSTRY_CARGO_FACTOR_HELPTEXT               :Die Frachterzeu
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Platzierung von Bäumen während des Spiels: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Lege das Ausmaß des zufälligen Baumwachstums während des Spiels fest. Dies kann Industrien wie die Sägemühle beeinflussen, welche auf nachwachsende Bäume angewiesen sind
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Nirgends {RED}(macht Sägemühle nutzlos)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Nur im Regenwald
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :überall
 
 STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE                        :Angepasste Platzierung von subarktischen Bäumen: {STRING}
 STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE_HELPTEXT               :Passt die Platzierung von Bäumen um die Schneegrenze im arktischen Klima an. Bäume dünnen oberhalb der Schneegrenze aus. Bäume direkt unterhalb der Schneegrenze sind eine Mischung aus subarktischen und gemäßigten Bäumen. Darunter werden gemäßigte Bäume platziert.
@@ -2241,10 +2240,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Krawatte
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Mehrspieler
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Angekündigt
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Zwischen öffentlich angekündigtem (Internet) und nicht angekündigtem (Local Area Network, LAN) Spiel wählen
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Nein
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Ja
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Spielername:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Dieser Name dient zur Identifizierung anderen Spielern gegenüber
 
@@ -2285,8 +2280,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Spiel be
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Aktualisieren
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Aktualisiert die Serverinformationen
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Server suchen
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Netzwerk nach einem Server durchsuchen
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Server hinzufügen
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Fügt einen Server zu der Liste von Servern hinzu, die immer nach laufenden Spielen kontrolliert werden
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Server starten
@@ -2303,6 +2296,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Der Name
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Passwort setzen
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Ein Passwort verhindert, dass unbefugte Leute beitreten
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Angekündigt
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Zwischen öffentlich angekündigtem (Internet) und nicht angekündigtem (Local Area Network, LAN) Spiel wählen
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Nein
 STR_NETWORK_START_SERVER_ADVERTISED                             :Ja
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} Teilnehmer

src/lang/greek.txt

@@ -72,12 +72,12 @@ STR_CARGO_PLURAL_SUGAR                                          :{G=f}Ζάχαρ
 STR_CARGO_PLURAL_SUGAR.geniki                                   :Ζάχαρης
 STR_CARGO_PLURAL_TOYS                                           :{G=n}Παιχνίδια
 STR_CARGO_PLURAL_TOYS.geniki                                    :Παιχνιδιών
-STR_CARGO_PLURAL_CANDY                                          :{G=n}Γλυκίσματα
-STR_CARGO_PLURAL_CANDY.geniki                                   :Γλυκισμάτων
+STR_CARGO_PLURAL_SWEETS                                         :{G=n}Γλυκίσματα
+STR_CARGO_PLURAL_SWEETS.geniki                                  :Γλυκισμάτων
 STR_CARGO_PLURAL_COLA                                           :{G=f}Κόλα
 STR_CARGO_PLURAL_COLA.geniki                                    :Κόλας
-STR_CARGO_PLURAL_COTTON_CANDY                                   :{G=n}Μαλλιά της γριάς
-STR_CARGO_PLURAL_COTTON_CANDY.geniki                            :Μαλλιών της γριάς
+STR_CARGO_PLURAL_CANDYFLOSS                                     :{G=n}Μαλλιά της γριάς
+STR_CARGO_PLURAL_CANDYFLOSS.geniki                              :Μαλλιών της γριάς
 STR_CARGO_PLURAL_BUBBLES                                        :{G=f}Φυσαλίδες
 STR_CARGO_PLURAL_BUBBLES.geniki                                 :Φυσαλίδων
 STR_CARGO_PLURAL_TOFFEE                                         :{G=n}Καραμέλες βουτύρου
@@ -136,11 +136,11 @@ STR_CARGO_SINGULAR_SUGAR                                        :{G=f}Ζάχαρ
 STR_CARGO_SINGULAR_SUGAR.subs                                   :Ζάχαρες
 STR_CARGO_SINGULAR_TOY                                          :{G=n}Παιχνίδι
 STR_CARGO_SINGULAR_TOY.subs                                     :Παιχνίδια
-STR_CARGO_SINGULAR_CANDY                                        :{G=n}Γλυκό
-STR_CARGO_SINGULAR_CANDY.subs                                   :Γλυκα
+STR_CARGO_SINGULAR_SWEETS                                       :{G=n}Γλυκό
+STR_CARGO_SINGULAR_SWEETS.subs                                  :Γλυκα
 STR_CARGO_SINGULAR_COLA                                         :{G=f}Κόλα
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :{G=n}Μαλλί της γριάς
-STR_CARGO_SINGULAR_COTTON_CANDY.subs                            :Μαλλί της γριάς
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :{G=n}Μαλλί της γριάς
+STR_CARGO_SINGULAR_CANDYFLOSS.subs                              :Μαλλί της γριάς
 STR_CARGO_SINGULAR_BUBBLE                                       :{G=f}Φυσαλίδα
 STR_CARGO_SINGULAR_BUBBLE.subs                                  :Φυσαλίδες
 STR_CARGO_SINGULAR_TOFFEE                                       :{G=n}Καραμέλα βουτύρου
@@ -373,6 +373,8 @@ STR_SORT_BY_RANGE                                               :Εμβέλει
 STR_SORT_BY_POPULATION                                          :Πληθυσμός
 STR_SORT_BY_RATING                                              :Εκτίμηση
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Παύση παιχνιδιού
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Γρήγορη ταχύτητα παιχνιδιού
@@ -1690,9 +1692,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Γραμμικ
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Τοποθέτηση δέντρων εντός παιχνιδιού: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Έλεγχος της τυχαίας εμφάνισης δέντρων κατά τη διάρκεια του παιχνιδιού. Αυτό είναι πιθανό να επηρεάσει βιομηχανίες που εξαρτώνται από την ανάπτυξη των δέντρων, όπως για παράδειγμα οι υλοτομίες
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Κανένα {RED}(καταστρέφει το ξυλουργείο)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Μόνο σε τροπικά δάση
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Παντού
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Θέση κύριας εργαλειοθήκης: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Οριζόντια τοποθέτηση της κύριας γραμμής εργαλείων στο επάνω μέρος της οθόνης
@@ -2014,10 +2013,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Αλλα
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Παιχνίδι πολλών παικτών
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Διαφημιζόμενο
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Επιλογή ανάμεσα σε ένα διαφημιζόμενο (διαδίκτυο) ή μη διαφημιζόμενο (Τοπικό Δίκτυο/LAN) παιχνίδι
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Όχι
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Ναι
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Όνομα παίκτη:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Αυτό είναι το όνομα με το οποίο θα σας αναγνωρίζουν οι άλλοι παίκτες
 
@@ -2058,8 +2053,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Συμμ
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Ανανέωση διακομιστή
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Ανανεώση πληροφοριών του διακομιστή
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Αναζήτηση διακομιστή
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Ψάξτε το δίκτυο για ένα διακομιστή
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Προσθήκη διακομιστή
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Προσθέτει ένα διακομιστή στη λίστα ο οποίος θα ελέγχεται κάθε φορά για ενεργά παιχνίδια.
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Εκκίνηση διακομιστή
@@ -2076,6 +2069,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Το ό
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Θέση κωδικού
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Προστατέψτε το παιχνίδι με έναν κωδικό εάν δε θέλετε να είναι δημοσίως προσβάσιμο
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Διαφημιζόμενο
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Επιλογή ανάμεσα σε ένα διαφημιζόμενο (διαδίκτυο) ή μη διαφημιζόμενο (Τοπικό Δίκτυο/LAN) παιχνίδι
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Όχι
 STR_NETWORK_START_SERVER_ADVERTISED                             :Ναι
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} συμπαίκτ{P ης ες}

src/lang/hebrew.txt

@@ -50,9 +50,9 @@ STR_CARGO_PLURAL_WHEAT                                          :חיטה
 STR_CARGO_PLURAL_RUBBER                                         :גומי
 STR_CARGO_PLURAL_SUGAR                                          :סוכר
 STR_CARGO_PLURAL_TOYS                                           :צעצועים
-STR_CARGO_PLURAL_CANDY                                          :ממתקים
+STR_CARGO_PLURAL_SWEETS                                         :ממתקים
 STR_CARGO_PLURAL_COLA                                           :קולה
-STR_CARGO_PLURAL_COTTON_CANDY                                   :שערות סבתא
+STR_CARGO_PLURAL_CANDYFLOSS                                     :שערות סבתא
 STR_CARGO_PLURAL_BUBBLES                                        :בועות
 STR_CARGO_PLURAL_TOFFEE                                         :טופי
 STR_CARGO_PLURAL_BATTERIES                                      :סוללות
@@ -92,10 +92,10 @@ STR_CARGO_SINGULAR_RUBBER                                       :גומי
 STR_CARGO_SINGULAR_SUGAR                                        :סוכר
 STR_CARGO_SINGULAR_TOY                                          :צעצוע
 STR_CARGO_SINGULAR_TOY.plural                                   :צעצועים
-STR_CARGO_SINGULAR_CANDY                                        :ממתק
-STR_CARGO_SINGULAR_CANDY.plural                                 :ממתקים
+STR_CARGO_SINGULAR_SWEETS                                       :ממתק
+STR_CARGO_SINGULAR_SWEETS.plural                                :ממתקים
 STR_CARGO_SINGULAR_COLA                                         :קולה
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :צמר גפן מתוק
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :צמר גפן מתוק
 STR_CARGO_SINGULAR_BUBBLE                                       :בועה
 STR_CARGO_SINGULAR_BUBBLE.plural                                :בועות
 STR_CARGO_SINGULAR_TOFFEE                                       :טופי
@@ -324,6 +324,8 @@ STR_SORT_BY_RANGE                                               :טווח
 STR_SORT_BY_POPULATION                                          :אכלוסיה
 STR_SORT_BY_RATING                                              :דרוג
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}השהה משחק
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}הרץ את הזמן במהירות
@@ -1576,9 +1578,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :מותר, מת
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :מיקום עצים במהלך המשחק: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :שלוט בהופעה אקראית של עצים במהלך המשחק. זה עלול להשפיע על תעשיות המסתמכות על צמיחת עצים, לדוגמא מנסרות
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :ללא {RED}(שובר מנסרת עץ)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :רק ביערות גשם
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :בכל מקום
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :{STRING} :מיקום הסרגל העיקרי
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :מיקום אופקי של סרגל הכלים הראשי בראש המסך
@@ -1899,10 +1898,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK} שנה
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}משחק רשת
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}מפורסם
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}בחר בין משחק מפורסם (אינטרנטי) ומשחק לא מפורסם (רשת מקומית, LAN)
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :לא
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :כן
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK} :שם השחקן
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}זהו שמך כפי שיצפה ע"י המשתתפים האחרים
 
@@ -1943,8 +1938,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}הצטר
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}רענן שרת
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}רענן את המידע המוצג לגבי השרת
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}אתר שרת
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}סרוק את הרשת לאיתור שרת
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}הוסף שרת
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}מוסיף שרת לרשימה שתמיד תבדק למשחקים פעילים.
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}הפעל שרת
@@ -1961,6 +1954,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}השם
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}קבע סיסמה
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}הגן על המשחק שלך עם סיסמה אם אתה לא רוצה שהוא יהיה זמין לכולם
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}מפורסם
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}בחר בין משחק מפורסם (אינטרנטי) ומשחק לא מפורסם (רשת מקומית, LAN)
 STR_NETWORK_START_SERVER_UNADVERTISED                           :לא
 STR_NETWORK_START_SERVER_ADVERTISED                             :כן
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} לקוח{P "" "ות"}

src/lang/hungarian.txt

@@ -72,12 +72,12 @@ STR_CARGO_PLURAL_SUGAR                                          :Cukor
 STR_CARGO_PLURAL_SUGAR.t                                        :cukrot
 STR_CARGO_PLURAL_TOYS                                           :Játék
 STR_CARGO_PLURAL_TOYS.t                                         :játékot
-STR_CARGO_PLURAL_CANDY                                          :Cukorka
-STR_CARGO_PLURAL_CANDY.t                                        :cukorkát
+STR_CARGO_PLURAL_SWEETS                                         :Cukorka
+STR_CARGO_PLURAL_SWEETS.t                                       :cukorkát
 STR_CARGO_PLURAL_COLA                                           :Kóla
 STR_CARGO_PLURAL_COLA.t                                         :kólát
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Vattacukor
-STR_CARGO_PLURAL_COTTON_CANDY.t                                 :vattacukrot
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Vattacukor
+STR_CARGO_PLURAL_CANDYFLOSS.t                                   :vattacukrot
 STR_CARGO_PLURAL_BUBBLES                                        :Buborék
 STR_CARGO_PLURAL_BUBBLES.t                                      :buborékot
 STR_CARGO_PLURAL_TOFFEE                                         :Tejkaramella
@@ -137,12 +137,12 @@ STR_CARGO_SINGULAR_SUGAR                                        :cukor
 STR_CARGO_SINGULAR_SUGAR.t                                      :cukrot
 STR_CARGO_SINGULAR_TOY                                          :játék
 STR_CARGO_SINGULAR_TOY.t                                        :játékot
-STR_CARGO_SINGULAR_CANDY                                        :cukorka
-STR_CARGO_SINGULAR_CANDY.t                                      :cukorkát
+STR_CARGO_SINGULAR_SWEETS                                       :cukorka
+STR_CARGO_SINGULAR_SWEETS.t                                     :cukorkát
 STR_CARGO_SINGULAR_COLA                                         :kóla
 STR_CARGO_SINGULAR_COLA.t                                       :kólát
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :vattacukor
-STR_CARGO_SINGULAR_COTTON_CANDY.t                               :vattacukrot
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :vattacukor
+STR_CARGO_SINGULAR_CANDYFLOSS.t                                 :vattacukrot
 STR_CARGO_SINGULAR_BUBBLE                                       :buborék
 STR_CARGO_SINGULAR_BUBBLE.t                                     :buborékot
 STR_CARGO_SINGULAR_TOFFEE                                       :tejkaramella
@@ -378,6 +378,8 @@ STR_SORT_BY_RANGE                                               :Hatótávolság
 STR_SORT_BY_POPULATION                                          :Lakosság
 STR_SORT_BY_RATING                                              :Értékelés
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Játék szüneteltetése
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Játék gyorsítása
@@ -1668,9 +1670,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Lineáris
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Játékbeli faelhelyezkedés: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Fák véletlenszerű megjelenésének szabályozása a játék során. Ez befolyásolhatja a gazdasági épületeket, melyek a fák növekedésétől függnek, mint a favágók
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :sehol {RED}(favágók ellehetetlenítése)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :csak esőerdőkben
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :mindenhol
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :A fő eszközsor helye: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :A fő eszközsor vízszintes elhelyezésének beállítása a képernyő tetején
@@ -1992,10 +1991,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Nyakkend
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Hálózati játék
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Hírdetett
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Válassz hírdetett (internet) és nem hírdetett (helyi hálózat, LAN) játék közül.
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Nem
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Igen
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Játékos neve:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}A többi játékos ilyen néven fog ismerni Téged.
 
@@ -2036,8 +2031,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Csatlako
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Szerver frissítése
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Szerver infó frissítése
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Szerver keresése
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Szerver keresése a hálózaton
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Szerver hozzáadása
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Hozzáadja a szervert a listához, így később gyorsabban tudsz hozzá csatlakozni
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Szerver indítása
@@ -2054,6 +2047,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}A játé
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Jelszó beállítása
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Védd le a játékodat jelszóval, ha nem akarod hogy illetéktelenek csatlakozzanak
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Hírdetett
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Válassz hírdetett (internet) és nem hírdetett (helyi hálózat, LAN) játék közül.
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Nem
 STR_NETWORK_START_SERVER_ADVERTISED                             :Igen
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} kliens

src/lang/icelandic.txt

@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Hveiti
 STR_CARGO_PLURAL_RUBBER                                         :Gúmmí
 STR_CARGO_PLURAL_SUGAR                                          :Sykur
 STR_CARGO_PLURAL_TOYS                                           :Leikföng
-STR_CARGO_PLURAL_CANDY                                          :Sælgæti
+STR_CARGO_PLURAL_SWEETS                                         :Sælgæti
 STR_CARGO_PLURAL_COLA                                           :Kóladrykkir
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Sykurfrauð
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Sykurfrauð
 STR_CARGO_PLURAL_BUBBLES                                        :Kúlur
 STR_CARGO_PLURAL_TOFFEE                                         :Toffý
 STR_CARGO_PLURAL_BATTERIES                                      :Rafhlöður
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Hveitis
 STR_CARGO_SINGULAR_RUBBER                                       :Gúmmí
 STR_CARGO_SINGULAR_SUGAR                                        :Sykur
 STR_CARGO_SINGULAR_TOY                                          :Leikfanga
-STR_CARGO_SINGULAR_CANDY                                        :Sælgætis
+STR_CARGO_SINGULAR_SWEETS                                       :Sælgætis
 STR_CARGO_SINGULAR_COLA                                         :Kóladrykkja
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Sykurfrauðs
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Sykurfrauðs
 STR_CARGO_SINGULAR_BUBBLE                                       :Kúlu
 STR_CARGO_SINGULAR_TOFFEE                                       :Toffý
 STR_CARGO_SINGULAR_BATTERY                                      :Rafhlöðu
@@ -292,6 +292,8 @@ STR_SORT_BY_RANGE                                               :Drægni
 STR_SORT_BY_POPULATION                                          :Fólksfjöldi
 STR_SORT_BY_RATING                                              :Einkunn
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Stöðva leik
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Spóla leikinn áfram
@@ -1485,9 +1487,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :Leyft, sérsni
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Staðsetning trjáa í leik: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Stjórnar hvernig tré birtast meðan á leiknum stendur. Þessi stilling getur haft áhrif á iðnað sem byggir á trjám, til dæmis timburverksmiðjur
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Engin {RED}(skemmir timburverksmiðjur)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :aðeins í regnskógum
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :allstaðar
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Staðsetning tækjasláar: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Lárétt staða aðal tækjasláar efst á skjánum
@@ -1776,8 +1775,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Tengjast
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Endurnýja þjón
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Endurnýja upplýsingar um þjón
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Finna þjón
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Leita að þjónum á neti
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Bæta við þjóni
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Bætir þjóni við listann, hann mun alltaf vera athugaður þegar leitað er eftir leikjum í gangi
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Hefja þjón

src/lang/indonesian.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Gandum
 STR_CARGO_PLURAL_RUBBER                                         :Karet
 STR_CARGO_PLURAL_SUGAR                                          :Gula
 STR_CARGO_PLURAL_TOYS                                           :Mainan
-STR_CARGO_PLURAL_CANDY                                          :Manisan
+STR_CARGO_PLURAL_SWEETS                                         :Manisan
 STR_CARGO_PLURAL_COLA                                           :Kola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Arum Manis
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Arum Manis
 STR_CARGO_PLURAL_BUBBLES                                        :Gelembung
 STR_CARGO_PLURAL_TOFFEE                                         :Gula-gula
 STR_CARGO_PLURAL_BATTERIES                                      :Baterai
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Gandum
 STR_CARGO_SINGULAR_RUBBER                                       :Karet
 STR_CARGO_SINGULAR_SUGAR                                        :Gula
 STR_CARGO_SINGULAR_TOY                                          :Mainan
-STR_CARGO_SINGULAR_CANDY                                        :Manisan
+STR_CARGO_SINGULAR_SWEETS                                       :Manisan
 STR_CARGO_SINGULAR_COLA                                         :Kola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Arum Manis
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Arum Manis
 STR_CARGO_SINGULAR_BUBBLE                                       :Gelembung
 STR_CARGO_SINGULAR_TOFFEE                                       :Gula-gula
 STR_CARGO_SINGULAR_BATTERY                                      :Baterai
@@ -315,6 +315,8 @@ STR_SORT_BY_RANGE                                               :Jangkauan
 STR_SORT_BY_POPULATION                                          :Populasi
 STR_SORT_BY_RATING                                              :Peringkat
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Hentikan sementara permainan
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Percepat maju waktu permainan
@@ -1604,9 +1606,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Linier
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Penempatan pohon dalam permainan: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Mengendalikan kemunculan pohon dalam permainan. Ini akan berefek pada industri yang memerlukan pohon, contohnya pengolahan kayu gelondongan
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Tidak ada {RED}(memotong Pabrik Pengolahan Kayu Gelondongan)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Hanya pada hutan hujan
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Dimanapun
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Posisi toolbar utama: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Posisi horizontal toolbar utama di bagian atas layar
@@ -1928,10 +1927,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Ubah das
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Bermain bersama
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Diiklankan
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Pilih antara permainan diiklankan (internet) dan tidak diiklankan (Jaringan wilayah lokal, LAN)
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Tidak
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Ya
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Nama pemain:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Ini adalah nama yang akan terlihat oleh pemain lain
 
@@ -1972,8 +1967,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Bergabun
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Cek server
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Periksa lagi status server
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Cari server
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Cari jaringan server
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Tambah server
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Daftarkan server baru yang akan dipantau aktivitasnya
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Mulai server
@@ -1990,6 +1983,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Nama per
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Atur kata sandi
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Lindungi permainan ini dengan kata kunci jika anda tidak ingin membiarkannya terbuka untuk umum
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Diiklankan
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Pilih antara permainan diiklankan (internet) dan tidak diiklankan (Jaringan wilayah lokal, LAN)
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Tidak
 STR_NETWORK_START_SERVER_ADVERTISED                             :Ya
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} klien

src/lang/irish.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Cruinneacht
 STR_CARGO_PLURAL_RUBBER                                         :Rubar
 STR_CARGO_PLURAL_SUGAR                                          :Siúcra
 STR_CARGO_PLURAL_TOYS                                           :Bréagáin
-STR_CARGO_PLURAL_CANDY                                          :Milseáin
+STR_CARGO_PLURAL_SWEETS                                         :Milseáin
 STR_CARGO_PLURAL_COLA                                           :Cóla
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Scamall siúcra
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Scamall siúcra
 STR_CARGO_PLURAL_BUBBLES                                        :Súilíní
 STR_CARGO_PLURAL_TOFFEE                                         :Taifí
 STR_CARGO_PLURAL_BATTERIES                                      :Cadhnraí
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Cruithneacht
 STR_CARGO_SINGULAR_RUBBER                                       :Rubar
 STR_CARGO_SINGULAR_SUGAR                                        :Siúcra
 STR_CARGO_SINGULAR_TOY                                          :Bréagán
-STR_CARGO_SINGULAR_CANDY                                        :Milseán
+STR_CARGO_SINGULAR_SWEETS                                       :Milseán
 STR_CARGO_SINGULAR_COLA                                         :Cóla
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Scamall siúcra
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Scamall siúcra
 STR_CARGO_SINGULAR_BUBBLE                                       :Súilín
 STR_CARGO_SINGULAR_TOFFEE                                       :Taifí
 STR_CARGO_SINGULAR_BATTERY                                      :Ceallra
@@ -310,6 +310,8 @@ STR_SORT_BY_RANGE                                               :Raon
 STR_SORT_BY_POPULATION                                          :Daonra
 STR_SORT_BY_RATING                                              :Rátáil
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Cuir an cluiche ar sos
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Bog an cluiche ar aghaidh go scioptha
@@ -1551,9 +1553,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :ceadaithe, leag
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Áit a chuirtear crainnte sa chluiche: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Rialaigh an áit a gcuirfear na crainn go fánach i rith an chluiche. D'fhéadfadh tionchar a bheith aige seo ar thionscail a bhíonn ag brath ar fhás na gcrann, muilte adhmaid mar shampla
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :ná dean{RED}(bristear an muileann adhmaid)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :i bhforaois bháistí amháin
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :gach áit
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Suíomh an phríomhbharra uirlisí: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Suíomh cothrománach an phríomhbharra uirlise ag barr an scáileáin
@@ -1873,10 +1872,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Athraigh
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Ilimreoirí
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Fógartha
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Roghnaigh idir cluiche fógartha (idirlín) agus cluiche neamhfhógartha (Líonra Achair Logánta, LAN)
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Níl
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Tá
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Ainm imreora:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Seo an t-ainm faoina mbeidh imreoirí eile in ann tú a aithint
 
@@ -1917,8 +1912,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Téigh i
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Athnuaigh an freastalaí
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Athnuaigh faisnéis an fhreastalaí
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Aimsigh freastalaí
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Cuardaigh líonra le haghaidh freastalaí
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Cuir freastalaí leis
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Cuirtear freastalaí leis an liosta a sheiceálfar i gcónaí le haghaidh cluichí ar rith.
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Tosaigh freastalaí
@@ -1935,6 +1928,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Taispeá
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Socraigh pasfhocal
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Cosain do chluiche le pasfhocal más mian leat nach mbeidh rochtain phoiblí air
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Fógartha
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Roghnaigh idir cluiche fógartha (idirlín) agus cluiche neamhfhógartha (Líonra Achair Logánta, LAN)
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Níl
 STR_NETWORK_START_SERVER_ADVERTISED                             :Tá
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} {P ch ch ch gc c}lia{P "" "" "" "" i}nt

src/lang/italian.txt

@@ -50,9 +50,9 @@ STR_CARGO_PLURAL_WHEAT                                          :{G=m}Frumento
 STR_CARGO_PLURAL_RUBBER                                         :{G=f}Gomma
 STR_CARGO_PLURAL_SUGAR                                          :{G=m}Zucchero
 STR_CARGO_PLURAL_TOYS                                           :{G=m}Giocattoli
-STR_CARGO_PLURAL_CANDY                                          :{G=f}Caramelle
+STR_CARGO_PLURAL_SWEETS                                         :{G=f}Caramelle
 STR_CARGO_PLURAL_COLA                                           :{G=f}Cola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :{G=m}Zucchero filato
+STR_CARGO_PLURAL_CANDYFLOSS                                     :{G=m}Zucchero filato
 STR_CARGO_PLURAL_BUBBLES                                        :{G=f}Bollicine
 STR_CARGO_PLURAL_TOFFEE                                         :{G=m}Toffee
 STR_CARGO_PLURAL_BATTERIES                                      :{G=f}Batterie
@@ -84,9 +84,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :{G=m}Frumento
 STR_CARGO_SINGULAR_RUBBER                                       :{G=f}Gomma
 STR_CARGO_SINGULAR_SUGAR                                        :{G=m}Zucchero
 STR_CARGO_SINGULAR_TOY                                          :{G=m}Giocattolo
-STR_CARGO_SINGULAR_CANDY                                        :{G=f}Caramella
+STR_CARGO_SINGULAR_SWEETS                                       :{G=f}Caramella
 STR_CARGO_SINGULAR_COLA                                         :{G=f}Cola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :{G=m}Zucchero filato
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :{G=m}Zucchero filato
 STR_CARGO_SINGULAR_BUBBLE                                       :{G=f}Bollicine
 STR_CARGO_SINGULAR_TOFFEE                                       :{G=m}Toffee
 STR_CARGO_SINGULAR_BATTERY                                      :{G=f}Batterie
@@ -317,6 +317,8 @@ STR_SORT_BY_RANGE                                               :{G=f}Autonomia
 STR_SORT_BY_POPULATION                                          :Popolazione
 STR_SORT_BY_RATING                                              :Valutazione
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pausa
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Aumenta la velocità di gioco
@@ -1628,9 +1630,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Lineare
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Collocazione di alberi durante la partita: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Controlla la comparsa casuale di alberi durante una partita. Può influenzare le industrie che dipendono dalla crescita degli alberi, come le segherie
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Nessuna {RED}(funzionamento errato segherie)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Solo nelle foreste pluviali
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Ovunque
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Posizione barra degli strumenti principale: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Posizione orizzontale della barra degli strumenti principale sul bordo superiore dello schermo
@@ -1952,10 +1951,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Cambia l
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multigiocatore
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Pubblico
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Sceglie fra partita pubblica (su Internet) o privata (su rete locale, LAN)
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :No
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Sì
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Nome giocatore:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Questo è il nome con cui si verrà identificati dagli altri giocatori
 
@@ -1996,8 +1991,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Entra ne
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Aggiorna
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Aggiorna le informazioni sul server
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Trova server
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Cerca un server sulla rete
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Aggiungi server
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Aggiunge un server alla lista di server in cui cercare sempre partite in corso
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Avvia server
@@ -2014,6 +2007,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Il nome
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Imposta password
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Protegge la partita con una password in modo che non sia accessibile pubblicamente
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Pubblico
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Sceglie fra partita pubblica (su Internet) o privata (su rete locale, LAN)
 STR_NETWORK_START_SERVER_UNADVERTISED                           :No
 STR_NETWORK_START_SERVER_ADVERTISED                             :Sì
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} client

src/lang/japanese.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :小麦
 STR_CARGO_PLURAL_RUBBER                                         :ゴム
 STR_CARGO_PLURAL_SUGAR                                          :砂糖
 STR_CARGO_PLURAL_TOYS                                           :おもちゃ
-STR_CARGO_PLURAL_CANDY                                          :お菓子
+STR_CARGO_PLURAL_SWEETS                                         :お菓子
 STR_CARGO_PLURAL_COLA                                           :コーラ
-STR_CARGO_PLURAL_COTTON_CANDY                                   :わたあめ
+STR_CARGO_PLURAL_CANDYFLOSS                                     :わたあめ
 STR_CARGO_PLURAL_BUBBLES                                        :泡
 STR_CARGO_PLURAL_TOFFEE                                         :タフィー
 STR_CARGO_PLURAL_BATTERIES                                      :電池
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :小麦
 STR_CARGO_SINGULAR_RUBBER                                       :ゴム
 STR_CARGO_SINGULAR_SUGAR                                        :砂糖
 STR_CARGO_SINGULAR_TOY                                          :おもちゃ
-STR_CARGO_SINGULAR_CANDY                                        :お菓子
+STR_CARGO_SINGULAR_SWEETS                                       :お菓子
 STR_CARGO_SINGULAR_COLA                                         :コーラ
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :わたあめ
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :わたあめ
 STR_CARGO_SINGULAR_BUBBLE                                       :泡
 STR_CARGO_SINGULAR_TOFFEE                                       :タフィー
 STR_CARGO_SINGULAR_BATTERY                                      :電池
@@ -312,6 +312,8 @@ STR_SORT_BY_RANGE                                               :航続距離
 STR_SORT_BY_POPULATION                                          :人口
 STR_SORT_BY_RATING                                              :レーティング
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}ゲームをポーズします
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}ゲームスピードを早くします
@@ -1554,9 +1556,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :有効(道路
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :樹木の自然成長: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :ゲーム中、ランダムに生えてくる樹種を設定します。設定によっては樹木の生育に依存する産業に悪影響が生じる可能性があります(「不可」にした場合、亜熱帯地域の伐採所を機能させ続けるためには手動で植林し続ける必要があります)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :不能 {RED}(亜熱帯地域の伐採所に影響)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :熱帯雨林地帯のみ
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :全地域
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :メインツールバーの位置: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :画面上のメインツールバーの位置を決めます
@@ -1881,10 +1880,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}ネク
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}マルチプレイヤーゲーム
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}ゲーム公示
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}ゲームを公示(インターネット)するか、非公示(LAN)にするかを選びます
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :非公示
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :公示
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}プレイヤー名:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}他のプレーヤーがあなたを特定するために使う名前です
 
@@ -1925,8 +1920,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}ゲー
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}サーバーを更新
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}サーバー情報を更新します
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}サーバーを検索
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}ネットワーク上のサーバーを検索します
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}サーバーを追加
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}検索時、常に稼働確認するサーバーのリストに追加します
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}サーバーを開始
@@ -1943,6 +1936,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}ゲー
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}パスワードを設定
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}ゲームをパスワードで保護することができます。一般から公然とアクセスされたくない場合等に設定します
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}ゲーム公示
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}ゲームを公示(インターネット)するか、非公示(LAN)にするかを選びます
 STR_NETWORK_START_SERVER_UNADVERTISED                           :非公示
 STR_NETWORK_START_SERVER_ADVERTISED                             :公示
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}接続者数: {NUM}

src/lang/korean.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :{G=m}밀
 STR_CARGO_PLURAL_RUBBER                                         :{G=f}고무
 STR_CARGO_PLURAL_SUGAR                                          :{G=m}설탕
 STR_CARGO_PLURAL_TOYS                                           :{G=m}장난감
-STR_CARGO_PLURAL_CANDY                                          :{G=m}사탕
+STR_CARGO_PLURAL_SWEETS                                         :{G=m}사탕
 STR_CARGO_PLURAL_COLA                                           :{G=f}콜라
-STR_CARGO_PLURAL_COTTON_CANDY                                   :{G=m}솜사탕
+STR_CARGO_PLURAL_CANDYFLOSS                                     :{G=m}솜사탕
 STR_CARGO_PLURAL_BUBBLES                                        :{G=m}거품
 STR_CARGO_PLURAL_TOFFEE                                         :{G=f}토피
 STR_CARGO_PLURAL_BATTERIES                                      :{G=f}건전지
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :{G=m}밀
 STR_CARGO_SINGULAR_RUBBER                                       :{G=f}고무
 STR_CARGO_SINGULAR_SUGAR                                        :{G=m}설탕
 STR_CARGO_SINGULAR_TOY                                          :{G=m}장난감
-STR_CARGO_SINGULAR_CANDY                                        :{G=m}사탕
+STR_CARGO_SINGULAR_SWEETS                                       :{G=m}사탕
 STR_CARGO_SINGULAR_COLA                                         :{G=f}콜라
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :{G=m}솜사탕
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :{G=m}솜사탕
 STR_CARGO_SINGULAR_BUBBLE                                       :{G=m}거품
 STR_CARGO_SINGULAR_TOFFEE                                       :{G=f}토피
 STR_CARGO_SINGULAR_BATTERY                                      :{G=f}건전지
@@ -319,6 +319,15 @@ STR_SORT_BY_VEHICLE_COUNT                                       :차량 수
 STR_SORT_BY_RANGE                                               :항속거리
 STR_SORT_BY_POPULATION                                          :인구
 STR_SORT_BY_RATING                                              :등급
+STR_SORT_BY_NUM_VEHICLES                                        :차량 수
+STR_SORT_BY_TOTAL_PROFIT_LAST_YEAR                              :작년 총 이익
+STR_SORT_BY_TOTAL_PROFIT_THIS_YEAR                              :올해 총 이익
+STR_SORT_BY_AVERAGE_PROFIT_LAST_YEAR                            :작년 평균 이익
+STR_SORT_BY_AVERAGE_PROFIT_THIS_YEAR                            :올해 평균 이익
+
+# Group by options for vehicle list
+STR_GROUP_BY_NONE                                               :없음
+STR_GROUP_BY_SHARED_ORDERS                                      :공유된 경로
 
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}게임을 일시 정지합니다.
@@ -781,7 +790,7 @@ STR_SMALLMAP_TOOLTIP_ENABLE_ALL_CARGOS                          :{BLACK}모든
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}마지막 메시지/뉴스 보기
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
 STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  일시 정지  *  *
-STR_STATUSBAR_PAUSED_LINK_GRAPH                                 :{ORANGE}*  *  일시 정지 (연결 상태 갱신을 기다리는 중) *  *
+STR_STATUSBAR_PAUSED_LINK_GRAPH                                 :{ORANGE}*  *  일시 정지됨 (연결 상태가 업데이트되기를 기다리는 중) *  *
 STR_STATUSBAR_AUTOSAVE                                          :{RED}자동 저장
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  게임 저장 중  *  *
 
@@ -1803,9 +1812,6 @@ STR_CONFIG_SETTING_INDUSTRY_CARGO_FACTOR_HELPTEXT               :1차 산업 시
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :게임 진행 중에 나무가 자동적으로 번식: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :게임 중에 나무가 자동적으로 번식하는지 여부를 조절합니다. 이 설정을 조정하면, 아열대 기후의 벌목소처럼 나무의 성장에 의존하는 산업시설에 영향을 끼칠 수 있습니다.
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :자라지 않음 {RED}(제재소에 의해 벌목될 수 있음)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :열대 우림 지역에서만
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :어디서나
 
 STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE                        :조정된 눈 쌓인 나무: {STRING}
 STR_CONFIG_SETTING_TREES_AROUND_SNOWLINE_HELPTEXT               :아한대 기후에서의 설선 근처의 눈 쌓인 나무의 개수를 조정합니다. 설선 위에는 나무가 적어집니다. 설선에서는 온대 기후의 나무와 눈 쌓인 나무가 공존할 것입니다. 설선 아래에선 온대 기후의 나무가 자랄 것입니다.
@@ -2247,10 +2253,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}넥타
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}멀티 플레이
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}공개 여부
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}공개된 게임(인터넷)과 비공개된 게임(LAN) 중에서 선택하십시오.
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :아니요
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :예
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}플레이어 이름:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}다른 사람들에게 보여줄 당신의 이름입니다.
 
@@ -2291,8 +2293,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}게임
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}새로고침
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}서버 정보를 새로 고칩니다.
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}서버 검색
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}네트워크에 등록되어 있는 서버를 검색합니다.
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}서버 추가
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}서버를 목록에 수동으로 추가합니다.
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}서버 열기
@@ -2309,6 +2309,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}멀티
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}비밀번호 설정
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}서버에 공개적으로 접근하는 것을 막고 싶을 때 비밀번호를 걸어 보호합니다.
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}공개 여부
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}공개된 게임(인터넷)과 비공개된 게임(LAN) 중에서 선택하십시오.
 STR_NETWORK_START_SERVER_UNADVERTISED                           :아니요
 STR_NETWORK_START_SERVER_ADVERTISED                             :예
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM}명
@@ -2512,17 +2514,17 @@ STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION                    :{WHITE}마지
 STR_NETWORK_SERVER_MESSAGE                                      :*** {1:STRING}
 ############ Leave those lines in this order!!
 STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED                          :게임이 일시 정지되었습니다. ({STRING})
-STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_1                  :게임이 아직 일시 정지된 상태입니다. ({STRING})
-STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_2                  :게임이 아직 일시 정지된 상태입니다. ({STRING}, {STRING})
-STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_3                  :게임이 아직 일시 정지된 상태입니다. ({STRING}, {STRING}, {STRING})
-STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_4                  :게임이 아직 일시 정지된 상태입니다. ({STRING}, {STRING}, {STRING}, {STRING})
-STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_5                  :게임이 아직 일시 정지된 상태입니다. ({STRING}, {STRING}, {STRING}, {STRING}, {STRING})
+STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_1                  :게임이 아직 일시 정지된 상태입니다 ({STRING})
+STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_2                  :게임이 아직 일시 정지된 상태입니다 ({STRING}, {STRING})
+STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_3                  :게임이 아직 일시 정지된 상태입니다 ({STRING}, {STRING}, {STRING})
+STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_4                  :게임이 아직 일시 정지된 상태입니다 ({STRING}, {STRING}, {STRING}, {STRING})
+STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_5                  :게임이 아직 일시 정지된 상태입니다 ({STRING}, {STRING}, {STRING}, {STRING}, {STRING})
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED                        :게임이 재개되었습니다. ({STRING})
 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS       :플레이하는 사람 수
 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_CONNECTING_CLIENTS       :접속자와 연결중
 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_MANUAL                   :수동
 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_GAME_SCRIPT              :게임 스크립트
-STR_NETWORK_SERVER_MESSAGE_GAME_REASON_LINK_GRAPH               :연결 상태 갱신을 기다리는 중
+STR_NETWORK_SERVER_MESSAGE_GAME_REASON_LINK_GRAPH               :연결 상태가 업데이트되기를 기다리는 중
 ############ End of leave-in-this-order
 STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :게임 종료
 STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} 님이 입장하셨습니다
@@ -2562,7 +2564,7 @@ STR_CONTENT_OPEN_URL                                            :{BLACK}웹 사
 STR_CONTENT_OPEN_URL_TOOLTIP                                    :{BLACK}이 컨텐츠의 웹 사이트를 방문합니다
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}다운로드
 STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}선택한 콘텐츠의 다운로드를 시작합니다
-STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}다운로드 할 파일의 총 용량: {WHITE}{BYTES}
+STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}다운로드할 파일의 총 용량: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}콘텐츠 정보
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}이 콘텐츠를 선택하지 않았습니다
 STR_CONTENT_DETAIL_SUBTITLE_SELECTED                            :{SILVER}이 콘텐츠를 다운로드하기 위해 선택하였습니다
@@ -2580,7 +2582,7 @@ STR_CONTENT_DETAIL_SELECTED_BECAUSE_OF                          :{WHITE}{STRING}
 STR_CONTENT_DETAIL_DEPENDENCIES                                 :{SILVER}필요한 요소: {WHITE}{STRING}
 STR_CONTENT_DETAIL_TAGS                                         :{SILVER}태그: {WHITE}{STRING}
 STR_CONTENT_NO_ZLIB                                             :{WHITE}OpenTTD가 "zlib" 지원 기능이 없는 상태에서 빌드되었습니다...
-STR_CONTENT_NO_ZLIB_SUB                                         :{WHITE}... 콘텐츠를 다운로드 할 수 없습니다!
+STR_CONTENT_NO_ZLIB_SUB                                         :{WHITE}... 콘텐츠를 다운로드할 수 없습니다!
 
 # Order of these is important!
 STR_CONTENT_TYPE_BASE_GRAPHICS                                  :{G=m}기본 그래픽
@@ -6140,6 +6142,7 @@ STR_FORMAT_BUOY_NAME                                            :{TOWN} 부표
 STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} 부표 #{COMMA}
 STR_FORMAT_COMPANY_NUM                                          :(회사 {COMMA})
 STR_FORMAT_GROUP_NAME                                           :그룹 {COMMA}
+STR_FORMAT_GROUP_VEHICLE_NAME                                   :{GROUP} {COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
 STR_FORMAT_WAYPOINT_NAME                                        :{TOWN} 경유지
 STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} 경유지 #{COMMA}

src/lang/latin.txt

@@ -119,18 +119,18 @@ STR_CARGO_PLURAL_TOYS                                           :{G=np}Ludicra
 STR_CARGO_PLURAL_TOYS.gen                                       :ludicrorum
 STR_CARGO_PLURAL_TOYS.acc                                       :Ludicra
 STR_CARGO_PLURAL_TOYS.dat                                       :Ludicris
-STR_CARGO_PLURAL_CANDY                                          :{G=np}Bellaria
-STR_CARGO_PLURAL_CANDY.gen                                      :bellariorum
-STR_CARGO_PLURAL_CANDY.acc                                      :Bellaria
-STR_CARGO_PLURAL_CANDY.dat                                      :Bellariis
+STR_CARGO_PLURAL_SWEETS                                         :{G=np}Bellaria
+STR_CARGO_PLURAL_SWEETS.gen                                     :bellariorum
+STR_CARGO_PLURAL_SWEETS.acc                                     :Bellaria
+STR_CARGO_PLURAL_SWEETS.dat                                     :Bellariis
 STR_CARGO_PLURAL_COLA                                           :{G=f}Cola
 STR_CARGO_PLURAL_COLA.gen                                       :colae
 STR_CARGO_PLURAL_COLA.acc                                       :Colam
 STR_CARGO_PLURAL_COLA.dat                                       :Colae
-STR_CARGO_PLURAL_COTTON_CANDY                                   :{G=n}Sacchari Xylinum
-STR_CARGO_PLURAL_COTTON_CANDY.gen                               :sacchari xylini
-STR_CARGO_PLURAL_COTTON_CANDY.acc                               :Sacchari Xylinum
-STR_CARGO_PLURAL_COTTON_CANDY.dat                               :Sacchari Xylino
+STR_CARGO_PLURAL_CANDYFLOSS                                     :{G=n}Sacchari Xylinum
+STR_CARGO_PLURAL_CANDYFLOSS.gen                                 :sacchari xylini
+STR_CARGO_PLURAL_CANDYFLOSS.acc                                 :Sacchari Xylinum
+STR_CARGO_PLURAL_CANDYFLOSS.dat                                 :Sacchari Xylino
 STR_CARGO_PLURAL_BUBBLES                                        :{G=fp}Bullae
 STR_CARGO_PLURAL_BUBBLES.gen                                    :bullarum
 STR_CARGO_PLURAL_BUBBLES.acc                                    :Bullas
@@ -246,18 +246,18 @@ STR_CARGO_SINGULAR_TOY                                          :{G=np}Ludicra
 STR_CARGO_SINGULAR_TOY.gen                                      :ludicrorum
 STR_CARGO_SINGULAR_TOY.acc                                      :Ludicra
 STR_CARGO_SINGULAR_TOY.dat                                      :Ludicris
-STR_CARGO_SINGULAR_CANDY                                        :{G=np}Bellaria
-STR_CARGO_SINGULAR_CANDY.gen                                    :bellariorum
-STR_CARGO_SINGULAR_CANDY.acc                                    :Bellaria
-STR_CARGO_SINGULAR_CANDY.dat                                    :Bellariis
+STR_CARGO_SINGULAR_SWEETS                                       :{G=np}Bellaria
+STR_CARGO_SINGULAR_SWEETS.gen                                   :bellariorum
+STR_CARGO_SINGULAR_SWEETS.acc                                   :Bellaria
+STR_CARGO_SINGULAR_SWEETS.dat                                   :Bellariis
 STR_CARGO_SINGULAR_COLA                                         :{G=f}Cola
 STR_CARGO_SINGULAR_COLA.gen                                     :colae
 STR_CARGO_SINGULAR_COLA.acc                                     :Colam
 STR_CARGO_SINGULAR_COLA.dat                                     :Colae
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :{G=n}Sacchari Xylinum
-STR_CARGO_SINGULAR_COTTON_CANDY.gen                             :sacchari xylini
-STR_CARGO_SINGULAR_COTTON_CANDY.acc                             :Sacchari Xylinum
-STR_CARGO_SINGULAR_COTTON_CANDY.dat                             :Sacchari Xylino
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :{G=n}Sacchari Xylinum
+STR_CARGO_SINGULAR_CANDYFLOSS.gen                               :sacchari xylini
+STR_CARGO_SINGULAR_CANDYFLOSS.acc                               :Sacchari Xylinum
+STR_CARGO_SINGULAR_CANDYFLOSS.dat                               :Sacchari Xylino
 STR_CARGO_SINGULAR_BUBBLE                                       :{G=fp}Bullae
 STR_CARGO_SINGULAR_BUBBLE.gen                                   :bullarum
 STR_CARGO_SINGULAR_BUBBLE.acc                                   :Bullas
@@ -500,6 +500,8 @@ STR_SORT_BY_RANGE                                               :Distantia volat
 STR_SORT_BY_POPULATION                                          :Numero Incolarum
 STR_SORT_BY_RATING                                              :Censione
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Ludum intermittere
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Ludum adcelerare
@@ -1768,9 +1770,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Linearis
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Positio arborum in ludo: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Quomodo arbores apparent intra ludum. Forsitan industriae afficiuntur quibus necesse sunt arbores, e.g. castra lignatorum
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Nulla {RED}(rumpit castra lignatorum)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Modo in silvis plivualibus
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Ubique
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Locus primariae arcae instrumentorum: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Locus horizontalis arcae instrumentorum primariae apud apicem fenestrae
@@ -2092,10 +2091,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Mutare f
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Modus Plurium Lusorum
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Ostensum
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Eligere servatrum ostensum (interretis) aut non ostensum (LAN)
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Non
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Ita
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Nomen lusoris:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Hoc est nomen tuum aliis lusoribus visibile
 
@@ -2136,8 +2131,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Ludum iu
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Servatrum instaurare
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Iterum arcessere indicia servatri
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Servatrum quaerere
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Quarere servatrum in rete
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Addere servatrum
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Addit servatrum indici quod semper inspicetur si ludus activus insit
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Servatrum incohare
@@ -2154,6 +2147,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Hoc ludi
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Elige tesseram
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Custodire tessera ludum tuum, si non vis publicos iungere
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Ostensum
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Eligere servatrum ostensum (interretis) aut non ostensum (LAN)
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Non
 STR_NETWORK_START_SERVER_ADVERTISED                             :Ita
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} clien{P s tes}

src/lang/latvian.txt

@@ -50,9 +50,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Kvieši
 STR_CARGO_PLURAL_RUBBER                                         :Kaučuks
 STR_CARGO_PLURAL_SUGAR                                          :Cukurs
 STR_CARGO_PLURAL_TOYS                                           :Rotaļlietas
-STR_CARGO_PLURAL_CANDY                                          :Saldumi
+STR_CARGO_PLURAL_SWEETS                                         :Saldumi
 STR_CARGO_PLURAL_COLA                                           :Kola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Cukurvate
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Cukurvate
 STR_CARGO_PLURAL_BUBBLES                                        :Burbuļi
 STR_CARGO_PLURAL_TOFFEE                                         :Īriss
 STR_CARGO_PLURAL_BATTERIES                                      :Baterijas
@@ -84,9 +84,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Kvieši
 STR_CARGO_SINGULAR_RUBBER                                       :Kaučuks
 STR_CARGO_SINGULAR_SUGAR                                        :Cukurs
 STR_CARGO_SINGULAR_TOY                                          :Rotaļlieta
-STR_CARGO_SINGULAR_CANDY                                        :Saldumi
+STR_CARGO_SINGULAR_SWEETS                                       :Saldumi
 STR_CARGO_SINGULAR_COLA                                         :Kola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Cukurvate
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Cukurvate
 STR_CARGO_SINGULAR_BUBBLE                                       :Burbuļi
 STR_CARGO_SINGULAR_TOFFEE                                       :Īriss
 STR_CARGO_SINGULAR_BATTERY                                      :Baterijas
@@ -196,6 +196,7 @@ STR_COLOUR_DEFAULT                                              :Noklusējuma
 STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA}{NBSP}jūdzes stundā
 STR_UNITS_VELOCITY_METRIC                                       :{COMMA}{NBSP}km/h
 STR_UNITS_VELOCITY_SI                                           :{COMMA}{NBSP}m/s
+STR_UNITS_VELOCITY_GAMEUNITS                                    :{DECIMAL}{NBSP}lauciņi/diena
 
 STR_UNITS_POWER_IMPERIAL                                        :{COMMA}{NBSP}ZS
 STR_UNITS_POWER_METRIC                                          :{COMMA}{NBSP}ZS
@@ -317,6 +318,8 @@ STR_SORT_BY_RANGE                                               :apgabala
 STR_SORT_BY_POPULATION                                          :iedzīvotāju skaita
 STR_SORT_BY_RATING                                              :vērtējuma
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pauzēt spēli
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Paātrināta spēle
@@ -1555,6 +1558,11 @@ STR_CONFIG_SETTING_ENDING_YEAR                                  :Vērtēšanas b
 STR_CONFIG_SETTING_ENDING_YEAR_HELPTEXT                         :Spēles beigas gads (tiek izmantots rezultāta noteikšanai). Šī gada beigās uzņēmuma rezultāti tiek ierakstīti un uz ekrāna tiek parādīti labākie rezultāti, bet spēlētāji var turpināt spēlēt arī pēc šī datuma.{}Ja tas ir norādīts pirms spēles sākuma datuma, labākie rezultāti nekad netiek parādīti.
 STR_CONFIG_SETTING_ENDING_YEAR_VALUE                            :{NUM}
 STR_CONFIG_SETTING_ENDING_YEAR_ZERO                             :Nekad
+STR_CONFIG_SETTING_ECONOMY_TYPE                                 :Ekonomikas tips: {STRING}
+STR_CONFIG_SETTING_ECONOMY_TYPE_HELPTEXT                        :Vienmērīga ekonomika liek mainīt ražošanas apjomus biežāk un mazākos soļos. Saldēta ekonomika aptur ražošanas izmaiņas un nozaru slēgšanu. Šim iestatījumam var nebūt ietekmes, ja nozares veidus nodrošina NewGRF.
+STR_CONFIG_SETTING_ECONOMY_TYPE_ORIGINAL                        :Orģināls
+STR_CONFIG_SETTING_ECONOMY_TYPE_SMOOTH                          :Gluds
+STR_CONFIG_SETTING_ECONOMY_TYPE_FROZEN                          :Saldēts
 STR_CONFIG_SETTING_ALLOW_SHARES                                 :Atļaut akciju pirkšanu no citiem uzņēmumiem: {STRING}
 STR_CONFIG_SETTING_ALLOW_SHARES_HELPTEXT                        :Ja iespējots, ir atļauts pirkt un pārdodot uzņēmumu akcijas. Akcijas būs pieejamas tikai atbilstošu vecumu sasniegušiem uzņēmumiem
 STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES                         :Minimālais uzņēmuma vecums, lai tirgotos ar akcijām: {STRING}
@@ -1606,9 +1614,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Lineārs
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Koku izvietojums spēlē: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Vadīt nejaušu koku parādīšanos spēles laikā. Tas var ietekmēt no kokaudzēšanas atkarīgas ražotnes, piemēram kokzāģētavas
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :nav {RED}(nedarbosies kokzāģētavas)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :tikai lietusmežos
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :visur
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Galvenās rīkjoslas novietojums: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Galvenās rīkjoslas horizontālais novietojums ekrāna augšējā daļā
@@ -1675,6 +1680,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT         :Vai lietotāja
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL         :impērijas, britu (jūdzes stundā)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_METRIC           :metriskās (km/h)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_SI               :SI, starptautiskās (m/s)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_GAMEUNITS        :Spēles vienības (lauciņi/dienas)
 
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER                     :Transportlīdzekļu jaudas mērvienības: {STRING}
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT            :Vai lietotāja saskarnē rāda transporta līdzekļa jaudu, rādīt norādītajās mērvienībās
@@ -1809,6 +1815,7 @@ STR_INTRO_TRANSLATION                                           :{BLACK}Šim tul
 
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Iziet
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Vai esat pārliecināts ka vēlaties iziet no OpenTTD?
 STR_QUIT_YES                                                    :{BLACK}Jā
 STR_QUIT_NO                                                     :{BLACK}Nē
 
@@ -1932,10 +1939,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Mainīt
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Vairākspēlētāju spēle
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Izsludināt
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Izvēlieties starp reklamēto (interneta) un nereklamēto (lokālā tīkla, LAN) spēli
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Nē
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Jā
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Spēlētāja vārds:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Pēc šā vārda jūs atpazīs citi spēlētāji
 
@@ -1976,8 +1979,6 @@ 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_FIND_SERVER                             :{BLACK}Atrast serveri
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Meklēt serveri tīklā
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Pievienot serveri
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Pievienot serveri sarakstam, kurš vienmēr tiks pārbaudīts vai tajā nav palaistas spēles
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Palaist serveri
@@ -1994,6 +1995,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Spēles
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Uzstādīt paroli
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Aizsargā jūsu spēli ar paroli, ja nevēlaties lai tā būtu publiski pieejama
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Izsludināt
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Izvēlieties starp reklamēto (interneta) un nereklamēto (lokālā tīkla, LAN) spēli
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Nē
 STR_NETWORK_START_SERVER_ADVERTISED                             :Jā
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} spēlētāj{P s i u}
@@ -5044,6 +5047,7 @@ STR_FORMAT_BUOY_NAME                                            :{TOWN} boja
 STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} boja Nr. #{COMMA}
 STR_FORMAT_COMPANY_NUM                                          :({COMMA}. uzņēmums)
 STR_FORMAT_GROUP_NAME                                           :Grupa {COMMA}
+STR_FORMAT_GROUP_VEHICLE_NAME                                   :{GROUP} #{COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} {0:TOWN}
 STR_FORMAT_WAYPOINT_NAME                                        :Pieturas punkts {TOWN}
 STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Pieturas punkts {TOWN} #{COMMA}

src/lang/lithuanian.txt

@@ -194,13 +194,13 @@ STR_CARGO_PLURAL_TOYS.kam                                       :žaislams
 STR_CARGO_PLURAL_TOYS.ka                                        :žaislus
 STR_CARGO_PLURAL_TOYS.kuo                                       :žaislais
 STR_CARGO_PLURAL_TOYS.kur                                       :žaisluose
-STR_CARGO_PLURAL_CANDY                                          :Saldumynai
-STR_CARGO_PLURAL_CANDY.kas                                      :saldumynai
-STR_CARGO_PLURAL_CANDY.ko                                       :saldumynų
-STR_CARGO_PLURAL_CANDY.kam                                      :saldumynams
-STR_CARGO_PLURAL_CANDY.ka                                       :saldumynus
-STR_CARGO_PLURAL_CANDY.kuo                                      :saldumynais
-STR_CARGO_PLURAL_CANDY.kur                                      :saldumynuose
+STR_CARGO_PLURAL_SWEETS                                         :Saldumynai
+STR_CARGO_PLURAL_SWEETS.kas                                     :saldumynai
+STR_CARGO_PLURAL_SWEETS.ko                                      :saldumynų
+STR_CARGO_PLURAL_SWEETS.kam                                     :saldumynams
+STR_CARGO_PLURAL_SWEETS.ka                                      :saldumynus
+STR_CARGO_PLURAL_SWEETS.kuo                                     :saldumynais
+STR_CARGO_PLURAL_SWEETS.kur                                     :saldumynuose
 STR_CARGO_PLURAL_COLA                                           :Kola
 STR_CARGO_PLURAL_COLA.kas                                       :kola
 STR_CARGO_PLURAL_COLA.ko                                        :kolos
@@ -208,13 +208,13 @@ STR_CARGO_PLURAL_COLA.kam                                       :kolai
 STR_CARGO_PLURAL_COLA.ka                                        :kolą
 STR_CARGO_PLURAL_COLA.kuo                                       :kola
 STR_CARGO_PLURAL_COLA.kur                                       :koloje
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Cukraus vata
-STR_CARGO_PLURAL_COTTON_CANDY.kas                               :cukraus vata
-STR_CARGO_PLURAL_COTTON_CANDY.ko                                :cukraus vatos
-STR_CARGO_PLURAL_COTTON_CANDY.kam                               :cukraus vatai
-STR_CARGO_PLURAL_COTTON_CANDY.ka                                :cukraus vatą
-STR_CARGO_PLURAL_COTTON_CANDY.kuo                               :cukraus vata
-STR_CARGO_PLURAL_COTTON_CANDY.kur                               :cukraus vatoje
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Cukraus vata
+STR_CARGO_PLURAL_CANDYFLOSS.kas                                 :cukraus vata
+STR_CARGO_PLURAL_CANDYFLOSS.ko                                  :cukraus vatos
+STR_CARGO_PLURAL_CANDYFLOSS.kam                                 :cukraus vatai
+STR_CARGO_PLURAL_CANDYFLOSS.ka                                  :cukraus vatą
+STR_CARGO_PLURAL_CANDYFLOSS.kuo                                 :cukraus vata
+STR_CARGO_PLURAL_CANDYFLOSS.kur                                 :cukraus vatoje
 STR_CARGO_PLURAL_BUBBLES                                        :Burbulai
 STR_CARGO_PLURAL_BUBBLES.kas                                    :burbulai
 STR_CARGO_PLURAL_BUBBLES.ko                                     :burbulų
@@ -276,9 +276,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Kviečių
 STR_CARGO_SINGULAR_RUBBER                                       :Kaučiuko
 STR_CARGO_SINGULAR_SUGAR                                        :Cukraus
 STR_CARGO_SINGULAR_TOY                                          :Žaislų
-STR_CARGO_SINGULAR_CANDY                                        :Saldumynų
+STR_CARGO_SINGULAR_SWEETS                                       :Saldumynų
 STR_CARGO_SINGULAR_COLA                                         :Kolos
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Cukraus vatos
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Cukraus vatos
 STR_CARGO_SINGULAR_BUBBLE                                       :Burbulų
 STR_CARGO_SINGULAR_TOFFEE                                       :Karamelės
 STR_CARGO_SINGULAR_BATTERY                                      :Baterijų
@@ -506,6 +506,8 @@ STR_SORT_BY_RANGE                                               :atstumą
 STR_SORT_BY_POPULATION                                          :populiaciją
 STR_SORT_BY_RATING                                              :reitingą
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pristabdyti žaidimą
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Pagreitinti žaidimą
@@ -1766,9 +1768,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :Leista, pasirin
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Savaiminis medžių atsiradimas: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Savaiminio medžių išdygimo nuostatos. Atkreipkite dėmesį, kad šios nuostatos gali paveikti kai kurių pramonės įmonių, pvz., lentpjūvių, darbą
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :nėra {RED}(trukdo lentpjūvėms)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :tik tropiniuose miškuose
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Visur
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Pagrindinės įrankių juostos pozicija: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Pagrindinės įrankių lentelės horizontali padėtis ekrano viršuje
@@ -2102,10 +2101,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Pakeisti
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Žaidimas tinkle
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Reklamuoti
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Pasirinkite tarp reklamuojamo (internetas) ir nereklamuojamo (Vietinis Tinklas, LAN) žaidimo
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Ne
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Taip
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Žaidėjo vardas:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Tai vardas, pagal kurį kiti žaidėjai jus atpažins
 
@@ -2146,8 +2141,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Jungtis
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Atnaujinti serverį
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Atnaujinti serverio informaciją
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Rasti serveri
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Ieškoti serverio
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Pridėti serverį
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Prideda serverį į sąrašą, kuris tikrinamas ieškant žaidimų
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Sukurti serverį
@@ -2164,6 +2157,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Žaidimo
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Nustatyti slaptažodi
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Apsaugokite savo žaidimą slaptažodžiu, jei nenorite, kad jis būtų viešai prieinamas
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Reklamuoti
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Pasirinkite tarp reklamuojamo (internetas) ir nereklamuojamo (Vietinis Tinklas, LAN) žaidimo
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Ne
 STR_NETWORK_START_SERVER_ADVERTISED                             :Taip
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} klient{P as ai ų}

src/lang/luxembourgish.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Weess
 STR_CARGO_PLURAL_RUBBER                                         :Kautschuk
 STR_CARGO_PLURAL_SUGAR                                          :Zocker
 STR_CARGO_PLURAL_TOYS                                           :Spillsaachen
-STR_CARGO_PLURAL_CANDY                                          :Séissegkeeten
+STR_CARGO_PLURAL_SWEETS                                         :Séissegkeeten
 STR_CARGO_PLURAL_COLA                                           :Cola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Zockerwatt
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Zockerwatt
 STR_CARGO_PLURAL_BUBBLES                                        :Blosen
 STR_CARGO_PLURAL_TOFFEE                                         :Karamell
 STR_CARGO_PLURAL_BATTERIES                                      :Batterien
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Weess
 STR_CARGO_SINGULAR_RUBBER                                       :Kautschuck
 STR_CARGO_SINGULAR_SUGAR                                        :Zocker
 STR_CARGO_SINGULAR_TOY                                          :Spillsaach
-STR_CARGO_SINGULAR_CANDY                                        :Séissegkeet
+STR_CARGO_SINGULAR_SWEETS                                       :Séissegkeet
 STR_CARGO_SINGULAR_COLA                                         :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Zockerwatt
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Zockerwatt
 STR_CARGO_SINGULAR_BUBBLE                                       :Blos
 STR_CARGO_SINGULAR_TOFFEE                                       :Karamell
 STR_CARGO_SINGULAR_BATTERY                                      :Batterie
@@ -315,6 +315,8 @@ STR_SORT_BY_RANGE                                               :Längt
 STR_SORT_BY_POPULATION                                          :Bevölkerung
 STR_SORT_BY_RATING                                              :Rating
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Spill pausen
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Spill schnell lafe loossen
@@ -1603,9 +1605,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Linear
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Bamplazéirung: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Kontrolléiert zoufälleg Optauche vu Beem während dem Spill. Dëst kann Industrie beaflossen, déi op d'Wuessen vu Beem ugewisen sinn
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Keng{RED}(zerstéiert Bauholzfabrik)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Nëmmen am Reebësch
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Iwwerall
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Positioun vun der Haapt-Toolbar: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Horizontal Positioun vun der Haapt-Toolbar uewen um Schierm
@@ -1927,10 +1926,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Krawatt
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multiplayer
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Ugekënnegt
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Wiel tëschent engem ugekënnegten (Internet) an net ugekënnegten (LAN) Spill
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Nee
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Jo
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Spillernumm:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Daat ass den Numm mat deem iech déi aner Spiller Identifizéieren kënnen
 
@@ -1971,8 +1966,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Spill b
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Server erneieren
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Serverinfo erneieren
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Server sichen
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Am Netzwierk no engem Server sichen
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Server bäisetzen
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Setzt en Server op d'Lëscht wou ëmmer no enger Partie gesicht gëtt
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Server starten
@@ -1989,6 +1982,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Den Numm
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Passwuert setzen
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}En Passwuert fir d'Spill setzen, dass et net Public accessibel ass
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Ugekënnegt
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Wiel tëschent engem ugekënnegten (Internet) an net ugekënnegten (LAN) Spill
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Nee
 STR_NETWORK_START_SERVER_ADVERTISED                             :Jo
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} Spiller

src/lang/malay.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Gandum
 STR_CARGO_PLURAL_RUBBER                                         :Getah
 STR_CARGO_PLURAL_SUGAR                                          :Gula
 STR_CARGO_PLURAL_TOYS                                           :Mainan
-STR_CARGO_PLURAL_CANDY                                          :Gula-gula
+STR_CARGO_PLURAL_SWEETS                                         :Gula-gula
 STR_CARGO_PLURAL_COLA                                           :Minuman cola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Gula kapas
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Gula kapas
 STR_CARGO_PLURAL_BUBBLES                                        :Buih
 STR_CARGO_PLURAL_TOFFEE                                         :Tofi
 STR_CARGO_PLURAL_BATTERIES                                      :Bateri
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Gandum
 STR_CARGO_SINGULAR_RUBBER                                       :Getah
 STR_CARGO_SINGULAR_SUGAR                                        :Gula
 STR_CARGO_SINGULAR_TOY                                          :Mainan
-STR_CARGO_SINGULAR_CANDY                                        :Manisan
+STR_CARGO_SINGULAR_SWEETS                                       :Manisan
 STR_CARGO_SINGULAR_COLA                                         :Minuman cola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Gula kapas
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Gula kapas
 STR_CARGO_SINGULAR_BUBBLE                                       :Buih
 STR_CARGO_SINGULAR_TOFFEE                                       :Tofi
 STR_CARGO_SINGULAR_BATTERY                                      :Bateri
@@ -295,6 +295,8 @@ STR_SORT_BY_CARGO_CAPACITY                                      :Muatan Kargo
 STR_SORT_BY_RANGE                                               :Jarak
 STR_SORT_BY_POPULATION                                          :Jumlah Penduduk
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Henti Sebentar Permainan
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Rancakkan permainan
@@ -1393,9 +1395,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED                        :Dibenarkan
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :Dibenarkan, susunan bandar sendiri
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Peletakan pokok-pokok dalam permainan: {STRING}
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Tiada {RED}(kilang kayu tidak berfungsi)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Hanya di hutan hujan
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Setiap tempat
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Kedudukan palang alat utama: {STRING}
 STR_CONFIG_SETTING_STATUSBAR_POS                                :Kedudukan bar status: {STRING}
@@ -1675,8 +1674,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Sertai p
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Kemaskini
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Kemaskini maklumat pelayan
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Cari pelayan
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Cari rangkaian untuk pelayan
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Tambah pelayan
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Memasukkan pelayan ke dalam senarai yang sentiasa akan disemak untuk permainan yang sedang berjalan.
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Mulakan pelayan

src/lang/norwegian_bokmal.txt

@@ -50,9 +50,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Hvete
 STR_CARGO_PLURAL_RUBBER                                         :Gummi
 STR_CARGO_PLURAL_SUGAR                                          :Sukker
 STR_CARGO_PLURAL_TOYS                                           :Leketøy
-STR_CARGO_PLURAL_CANDY                                          :Godteri
+STR_CARGO_PLURAL_SWEETS                                         :Godteri
 STR_CARGO_PLURAL_COLA                                           :Cola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Sukkerspinn
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Sukkerspinn
 STR_CARGO_PLURAL_BUBBLES                                        :Bobler
 STR_CARGO_PLURAL_TOFFEE                                         :Karamell
 STR_CARGO_PLURAL_BATTERIES                                      :Batterier
@@ -84,9 +84,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Hvete
 STR_CARGO_SINGULAR_RUBBER                                       :Gummi
 STR_CARGO_SINGULAR_SUGAR                                        :Sukker
 STR_CARGO_SINGULAR_TOY                                          :Leketøy
-STR_CARGO_SINGULAR_CANDY                                        :Godteri
+STR_CARGO_SINGULAR_SWEETS                                       :Godteri
 STR_CARGO_SINGULAR_COLA                                         :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Sukkerspinn
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Sukkerspinn
 STR_CARGO_SINGULAR_BUBBLE                                       :Boble
 STR_CARGO_SINGULAR_TOFFEE                                       :Karamell
 STR_CARGO_SINGULAR_BATTERY                                      :Batteri
@@ -317,6 +317,8 @@ STR_SORT_BY_RANGE                                               :Rekkevidde
 STR_SORT_BY_POPULATION                                          :Folketall
 STR_SORT_BY_RATING                                              :Rangering
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Sett spillet på pause
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Dobbel hastighet på spillet
@@ -1605,9 +1607,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Lineær
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Plassering av trær i spillet: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Kontroll tilfeldige utseender til tre under spillet. Dette kan påvirke industrier som avhenger av trevekst, for eksempel trelast
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Ingen {RED}(ødelegger sagbruk)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Kun i regnskog
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Overalt
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Plassering av hovedverktøylinje: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Horisontal posisjon av hoved verktøylinjen på toppen av skjermen
@@ -1929,10 +1928,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Endre sl
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Flerspiller
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Annonsert
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Velg mellom et utlyst (internett) og et ikke utlyst (Lokalnettverk, LAN) spill
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Nei
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Ja
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Spillernavn:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Dette er navnet andre spillere vil identifisere deg med
 
@@ -1973,8 +1968,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Bli med
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Oppdater tjener
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Oppdater tjenerinfo
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Finn tjenere
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Søk på nettverket etter en tjener
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Legg til tjener
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Legger til en tjener til listen som alltid vil bli sjekket for aktive spill.
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Start tjener
@@ -1991,6 +1984,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Spillnav
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Sett passord
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Beskytt ditt spill med et passord hvis du ikke vil at hvem som helst skal bli med på det
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Annonsert
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Velg mellom et utlyst (internett) og et ikke utlyst (Lokalnettverk, LAN) spill
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Nei
 STR_NETWORK_START_SERVER_ADVERTISED                             :Ja
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} klient{P "" er}

src/lang/norwegian_nynorsk.txt

@@ -50,9 +50,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Kveite
 STR_CARGO_PLURAL_RUBBER                                         :Gummi
 STR_CARGO_PLURAL_SUGAR                                          :Sukker
 STR_CARGO_PLURAL_TOYS                                           :Leiketøy
-STR_CARGO_PLURAL_CANDY                                          :Godteri
+STR_CARGO_PLURAL_SWEETS                                         :Godteri
 STR_CARGO_PLURAL_COLA                                           :Cola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Sukkerspinn
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Sukkerspinn
 STR_CARGO_PLURAL_BUBBLES                                        :Bobler
 STR_CARGO_PLURAL_TOFFEE                                         :Karamell
 STR_CARGO_PLURAL_BATTERIES                                      :Batteri
@@ -84,9 +84,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Kveite
 STR_CARGO_SINGULAR_RUBBER                                       :Gummi
 STR_CARGO_SINGULAR_SUGAR                                        :Sukker
 STR_CARGO_SINGULAR_TOY                                          :Leiketøy
-STR_CARGO_SINGULAR_CANDY                                        :Godteri
+STR_CARGO_SINGULAR_SWEETS                                       :Godteri
 STR_CARGO_SINGULAR_COLA                                         :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Sukkerspinn
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Sukkerspinn
 STR_CARGO_SINGULAR_BUBBLE                                       :Boble
 STR_CARGO_SINGULAR_TOFFEE                                       :Karamell
 STR_CARGO_SINGULAR_BATTERY                                      :Batteri
@@ -312,6 +312,8 @@ STR_SORT_BY_RANGE                                               :Rekkevidde
 STR_SORT_BY_POPULATION                                          :Innbyggjartal
 STR_SORT_BY_RATING                                              :Vurdering
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pause
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Dobbel fart på spelet
@@ -1487,9 +1489,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED                        :tillete
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :tillete, eigendefinert oppsett av by
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Plassering av tre i spelet: {STRING}
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :ingen {RED}(øydelegg sagbruk)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :kun i regnskogen
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :over alt
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Plassering av hovudverktøylinje: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Plassering av verktøylinja øvst på skjermen
@@ -1797,10 +1796,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Byt slip
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Fleirspelar
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Kunngjort
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Vel mellom spel på internett (kunngjort) og spel på lokalt nett (ikkje kunngjort)
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Nei
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Ja
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Spelarnamn:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Dette er namnet andre spelarar vil identifisere deg med
 
@@ -1841,8 +1836,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Bli med
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Oppdater tenar
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Oppdater tenarinformasjon
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Finn tenar
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Søk på nettverket etter ein tenar
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Legg til tenar
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Legg til ein tenar i lista over tenarar som alltid vil verte sjekka for aktive spel.
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Start tenar
@@ -1859,6 +1852,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Spelnamn
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Set passord
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Beskytt spelet ditt med passord så ikkje kven som helst kan verte med på det
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Kunngjort
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Vel mellom spel på internett (kunngjort) og spel på lokalt nett (ikkje kunngjort)
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Nei
 STR_NETWORK_START_SERVER_ADVERTISED                             :Ja
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} klient{P "" er}

src/lang/polish.txt

@@ -188,13 +188,13 @@ STR_CARGO_PLURAL_TOYS.b                                         :zabawki
 STR_CARGO_PLURAL_TOYS.n                                         :zabawkami
 STR_CARGO_PLURAL_TOYS.m                                         :zabawkach
 STR_CARGO_PLURAL_TOYS.w                                         :zabawki
-STR_CARGO_PLURAL_CANDY                                          :Słodycze
-STR_CARGO_PLURAL_CANDY.d                                        :słodyczy
-STR_CARGO_PLURAL_CANDY.c                                        :słodyczom
-STR_CARGO_PLURAL_CANDY.b                                        :słodycze
-STR_CARGO_PLURAL_CANDY.n                                        :słodyczami
-STR_CARGO_PLURAL_CANDY.m                                        :słodyczach
-STR_CARGO_PLURAL_CANDY.w                                        :słodycze
+STR_CARGO_PLURAL_SWEETS                                         :Słodycze
+STR_CARGO_PLURAL_SWEETS.d                                       :słodyczy
+STR_CARGO_PLURAL_SWEETS.c                                       :słodyczom
+STR_CARGO_PLURAL_SWEETS.b                                       :słodycze
+STR_CARGO_PLURAL_SWEETS.n                                       :słodyczami
+STR_CARGO_PLURAL_SWEETS.m                                       :słodyczach
+STR_CARGO_PLURAL_SWEETS.w                                       :słodycze
 STR_CARGO_PLURAL_COLA                                           :Cola
 STR_CARGO_PLURAL_COLA.d                                         :coli
 STR_CARGO_PLURAL_COLA.c                                         :coli
@@ -202,13 +202,13 @@ STR_CARGO_PLURAL_COLA.b                                         :colę
 STR_CARGO_PLURAL_COLA.n                                         :colą
 STR_CARGO_PLURAL_COLA.m                                         :coli
 STR_CARGO_PLURAL_COLA.w                                         :colo
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Wata cukrowa
-STR_CARGO_PLURAL_COTTON_CANDY.d                                 :waty cukrowej
-STR_CARGO_PLURAL_COTTON_CANDY.c                                 :wacie cukrowej
-STR_CARGO_PLURAL_COTTON_CANDY.b                                 :watę cukrową
-STR_CARGO_PLURAL_COTTON_CANDY.n                                 :watą cukrową
-STR_CARGO_PLURAL_COTTON_CANDY.m                                 :wacie cukrowej
-STR_CARGO_PLURAL_COTTON_CANDY.w                                 :wato cukrowa
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Wata cukrowa
+STR_CARGO_PLURAL_CANDYFLOSS.d                                   :waty cukrowej
+STR_CARGO_PLURAL_CANDYFLOSS.c                                   :wacie cukrowej
+STR_CARGO_PLURAL_CANDYFLOSS.b                                   :watę cukrową
+STR_CARGO_PLURAL_CANDYFLOSS.n                                   :watą cukrową
+STR_CARGO_PLURAL_CANDYFLOSS.m                                   :wacie cukrowej
+STR_CARGO_PLURAL_CANDYFLOSS.w                                   :wato cukrowa
 STR_CARGO_PLURAL_BUBBLES                                        :Bąbelki
 STR_CARGO_PLURAL_BUBBLES.d                                      :bąbelków
 STR_CARGO_PLURAL_BUBBLES.c                                      :bąbelkom
@@ -408,12 +408,12 @@ STR_CARGO_SINGULAR_TOY.b                                        :zabawkę
 STR_CARGO_SINGULAR_TOY.n                                        :zabawką
 STR_CARGO_SINGULAR_TOY.m                                        :zabawce
 STR_CARGO_SINGULAR_TOY.w                                        :zabawko
-STR_CARGO_SINGULAR_CANDY                                        :Słodycz
-STR_CARGO_SINGULAR_CANDY.d                                      :słodyczy
-STR_CARGO_SINGULAR_CANDY.c                                      :słodyczy
-STR_CARGO_SINGULAR_CANDY.b                                      :słodycz
-STR_CARGO_SINGULAR_CANDY.n                                      :słodyczą
-STR_CARGO_SINGULAR_CANDY.m                                      :słodyczy
+STR_CARGO_SINGULAR_SWEETS                                       :Słodycz
+STR_CARGO_SINGULAR_SWEETS.d                                     :słodyczy
+STR_CARGO_SINGULAR_SWEETS.c                                     :słodyczy
+STR_CARGO_SINGULAR_SWEETS.b                                     :słodycz
+STR_CARGO_SINGULAR_SWEETS.n                                     :słodyczą
+STR_CARGO_SINGULAR_SWEETS.m                                     :słodyczy
 STR_CARGO_SINGULAR_COLA                                         :Cola
 STR_CARGO_SINGULAR_COLA.d                                       :coli
 STR_CARGO_SINGULAR_COLA.c                                       :coli
@@ -421,13 +421,13 @@ STR_CARGO_SINGULAR_COLA.b                                       :colę
 STR_CARGO_SINGULAR_COLA.n                                       :colą
 STR_CARGO_SINGULAR_COLA.m                                       :coli
 STR_CARGO_SINGULAR_COLA.w                                       :colo
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Wata cukrowa
-STR_CARGO_SINGULAR_COTTON_CANDY.d                               :waty cukrowej
-STR_CARGO_SINGULAR_COTTON_CANDY.c                               :wacie cukrowej
-STR_CARGO_SINGULAR_COTTON_CANDY.b                               :watę cukrową
-STR_CARGO_SINGULAR_COTTON_CANDY.n                               :watą cukrową
-STR_CARGO_SINGULAR_COTTON_CANDY.m                               :wacie cukrowej
-STR_CARGO_SINGULAR_COTTON_CANDY.w                               :wato cukrowa
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Wata cukrowa
+STR_CARGO_SINGULAR_CANDYFLOSS.d                                 :waty cukrowej
+STR_CARGO_SINGULAR_CANDYFLOSS.c                                 :wacie cukrowej
+STR_CARGO_SINGULAR_CANDYFLOSS.b                                 :watę cukrową
+STR_CARGO_SINGULAR_CANDYFLOSS.n                                 :watą cukrową
+STR_CARGO_SINGULAR_CANDYFLOSS.m                                 :wacie cukrowej
+STR_CARGO_SINGULAR_CANDYFLOSS.w                                 :wato cukrowa
 STR_CARGO_SINGULAR_BUBBLE                                       :Bąbelek
 STR_CARGO_SINGULAR_BUBBLE.d                                     :bąbelka
 STR_CARGO_SINGULAR_BUBBLE.c                                     :bąbelkowi
@@ -573,6 +573,7 @@ STR_COLOUR_DEFAULT                                              :Domyślny
 STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA}{NBSP}mph
 STR_UNITS_VELOCITY_METRIC                                       :{COMMA}{NBSP}km/h
 STR_UNITS_VELOCITY_SI                                           :{COMMA}{NBSP}m/s
+STR_UNITS_VELOCITY_GAMEUNITS                                    :{DECIMAL}{NBSP}p{P ole ola ól}/dzień
 
 STR_UNITS_POWER_IMPERIAL                                        :{COMMA}{NBSP}KM
 STR_UNITS_POWER_METRIC                                          :{COMMA}{NBSP}KM
@@ -694,6 +695,8 @@ STR_SORT_BY_RANGE                                               :Zasięg
 STR_SORT_BY_POPULATION                                          :Liczba mieszkańców
 STR_SORT_BY_RATING                                              :Ocena
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pauza
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Szybkie przemijanie czasu w grze
@@ -1694,7 +1697,7 @@ STR_CONFIG_SETTING_SHOW_NEWGRF_NAME                             :Pokaż nazwę N
 STR_CONFIG_SETTING_SHOW_NEWGRF_NAME_HELPTEXT                    :Dodaj linię do okna budowy pojazdów, pokazujących z którego NewGRF'a wybrany pojazd pochodzi.
 
 STR_CONFIG_SETTING_LANDSCAPE                                    :Krajobraz: {STRING}
-STR_CONFIG_SETTING_LANDSCAPE_HELPTEXT                           :Krajobrazy określają podstawowe scenariusze gry, które różnią się przedsiębiorstwami, towarami i wymogami dla rozwoju miast. Pliki NewGRF i skrypty umożliwiają dokładniejszą kontrolę warunków rozgrywki
+STR_CONFIG_SETTING_LANDSCAPE_HELPTEXT                           :Krajobrazy określają podstawowe scenariusze gry, które różnią się przedsiębiorstwami, ładunkiem i wymogami dla rozwoju miast. Pliki NewGRF i skrypty umożliwiają dokładniejszą kontrolę warunków rozgrywki
 STR_CONFIG_SETTING_LAND_GENERATOR                               :Generator krajobrazu: {STRING}
 STR_CONFIG_SETTING_LAND_GENERATOR_HELPTEXT                      :Oryginalny generator tworzy tylko proste kształty krajobrazu i jest zależny od podstawowego zestawu grafiki. TerraGenesis jest oparty na generatorze szumu Perlina, który umożliwia precyzyjną kontrolę parametrów
 STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL                      :Oryginalny
@@ -1933,6 +1936,11 @@ STR_CONFIG_SETTING_ENDING_YEAR                                  :Punktacja na ko
 STR_CONFIG_SETTING_ENDING_YEAR_HELPTEXT                         :Rok, w którym gra się kończy na cel punktacji. Na koniec tego roku, punkty firmy są zarejestrowane i ekran wyników najwyższych jest pokazywany, ale gracze mogą po tym dalej grać.{}Jeżeli jest to przed rokiem startowym, ekran wyników najwyższych nie jest nigdy pokazywany.
 STR_CONFIG_SETTING_ENDING_YEAR_VALUE                            :{NUM}
 STR_CONFIG_SETTING_ENDING_YEAR_ZERO                             :Nigdy
+STR_CONFIG_SETTING_ECONOMY_TYPE                                 :Typ ekonomii: {STRING}
+STR_CONFIG_SETTING_ECONOMY_TYPE_HELPTEXT                        :Płynna ekonomia oznacza, że zmiany w produkcji zachodzą częściej i w mniejszych krokach. Zamrożona gospodarka zatrzymuje zmiany w produkcji i zamykanie przedsiębiorstw. To ustawienie może nie mieć żadnego wpływu, jeśli przemysł jest regulowany przez NewGRFy.
+STR_CONFIG_SETTING_ECONOMY_TYPE_ORIGINAL                        :Oryginalna
+STR_CONFIG_SETTING_ECONOMY_TYPE_SMOOTH                          :Płynna
+STR_CONFIG_SETTING_ECONOMY_TYPE_FROZEN                          :Zamrożona
 STR_CONFIG_SETTING_ALLOW_SHARES                                 :Pozwól kupować udziały w innych firmach: {STRING}
 STR_CONFIG_SETTING_ALLOW_SHARES_HELPTEXT                        :Kiedy włączone, pozwala na kupowanie i sprzedawanie udziałów w firmie. Udziały będą dostępne tylko dla firm z odpowiednim stażem
 STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES                         :Minimalny wiek firmy pozwalający na handel udziałami: {STRING}
@@ -1984,9 +1992,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Liniowy
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Rozmieszczenie drzew w grze: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Losowe pojawianie się drzew podczas gry. Może mieć to wpływ na zakłady opierające się na wyrastaniu drzew, np. tartaki
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Brak {RED}(tartaki nie działają)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Tylko w lasach deszczowych
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Wszędzie
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Pozycja głównego paska narzędzi: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Pozioma pozycja głównego paska narzędzi na górze ekranu
@@ -2053,6 +2058,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT         :Kiedy prędkoś
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL         :Imperialne (mph)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_METRIC           :Metryczne (km/h)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_SI               :SI (m/s)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_GAMEUNITS        :Jednostki gry (pola/dzień)
 
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER                     :Jednostka mocy pojazdów: {STRING}
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT            :Kiedy moc pojazdu jest pokazywana w interfejsie użytkownika, wyświetl ją w wybranych jednostkach
@@ -2185,6 +2191,7 @@ STR_INTRO_TRANSLATION                                           :{BLACK}Tej wers
 
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Wyjście
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Czy jesteś pewien, że chcesz wyjść z OpenTTD?
 STR_QUIT_YES                                                    :{BLACK}Tak
 STR_QUIT_NO                                                     :{BLACK}Nie
 
@@ -2308,10 +2315,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Zmień k
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Gra wieloosobowa
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Publiczny
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Wybierz między rozgrywkami reklamowanymi (internetowymi) a niereklamowanymi (w sieci lokalnej LAN)
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Nie
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Tak
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Nazwa gracza:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}To jest nazwa pod którą będą Cię widzieć inni gracze
 
@@ -2352,8 +2355,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Przyłą
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Odśwież serwer
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Odśwież informacje o serwerze
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Znajdź serwery
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Przeszukuje sieć w poszukiwaniu serwera
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Dodaj serwer
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Dodaj serwer do listy, która będzie przeszukiwana w poszukiwaniu uruchomionych gier
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Uruchom serwer
@@ -2370,6 +2371,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Nazwa gr
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Ustaw hasło
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Zabezpiecz grę hasłem jeśli nie chcesz, by była publicznie dostępna
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Publiczny
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Wybierz między rozgrywkami reklamowanymi (internetowymi) a niereklamowanymi (w sieci lokalnej LAN)
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Nie
 STR_NETWORK_START_SERVER_ADVERTISED                             :Tak
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} klient{P "" ów ów}
@@ -4755,7 +4758,7 @@ STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Nie moż
 
 STR_ERROR_ADJOINS_MORE_THAN_ONE_EXISTING                        :{WHITE}Przylega do więcej niż jednej stacji
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}... stacja zbyt rozległa
-STR_ERROR_TOO_MANY_STATIONS_LOADING                             :{WHITE}Za duzo stacji
+STR_ERROR_TOO_MANY_STATIONS_LOADING                             :{WHITE}Za dużo stacji
 STR_ERROR_TOO_MANY_STATION_SPECS                                :{WHITE}Za dużo części stacji kolejowej
 STR_ERROR_TOO_MANY_BUS_STOPS                                    :{WHITE}Zbyt wiele przystanków autobusowych
 STR_ERROR_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Zbyt wiele stacji załadunku ciężarówek
@@ -5456,6 +5459,7 @@ STR_FORMAT_BUOY_NAME                                            :Boja {TOWN}
 STR_FORMAT_BUOY_NAME_SERIAL                                     :Boja {TOWN} #{COMMA}
 STR_FORMAT_COMPANY_NUM                                          :(Firma {COMMA})
 STR_FORMAT_GROUP_NAME                                           :Grupa {COMMA}
+STR_FORMAT_GROUP_VEHICLE_NAME                                   :{GROUP} #{COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} {0:TOWN}
 STR_FORMAT_WAYPOINT_NAME                                        :Post. {TOWN}
 STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Post. {TOWN} #{COMMA}

src/lang/portuguese.txt

@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Trigo
 STR_CARGO_PLURAL_RUBBER                                         :Borracha
 STR_CARGO_PLURAL_SUGAR                                          :Açúcar
 STR_CARGO_PLURAL_TOYS                                           :Brinquedos
-STR_CARGO_PLURAL_CANDY                                          :Doces
+STR_CARGO_PLURAL_SWEETS                                         :Doces
 STR_CARGO_PLURAL_COLA                                           :Bebida de cola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Algodão Doce
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Algodão Doce
 STR_CARGO_PLURAL_BUBBLES                                        :Bolhas
 STR_CARGO_PLURAL_TOFFEE                                         :Caramelo
 STR_CARGO_PLURAL_BATTERIES                                      :Baterias
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Trigo
 STR_CARGO_SINGULAR_RUBBER                                       :Borracha
 STR_CARGO_SINGULAR_SUGAR                                        :Açúcar
 STR_CARGO_SINGULAR_TOY                                          :Brinquedos
-STR_CARGO_SINGULAR_CANDY                                        :Doces
+STR_CARGO_SINGULAR_SWEETS                                       :Doces
 STR_CARGO_SINGULAR_COLA                                         :Bebida de cola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Algodão Doce
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Algodão Doce
 STR_CARGO_SINGULAR_BUBBLE                                       :Bolhas
 STR_CARGO_SINGULAR_TOFFEE                                       :Caramelo
 STR_CARGO_SINGULAR_BATTERY                                      :Baterias
@@ -314,6 +314,8 @@ STR_SORT_BY_RANGE                                               :Alcance
 STR_SORT_BY_POPULATION                                          :População
 STR_SORT_BY_RATING                                              :Classificação
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pausa
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Aumentar velocidade do jogo
@@ -1592,9 +1594,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Linear
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Criação de árvores no decorrer do jogo: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Controlar o aparecimento aleatório de árvores durante o jogo. Isto poderá afectar indústrias que dependem do crescimento de árvores, como as madeireiras
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Nenhuma {RED}(Serrações ficam inactivas)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Apenas em florestas húmidas
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Em todo o lado
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Posição da barra de ferramentas principal: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Posição horizontal da barra de ferramentas principal no topo do ecrã
@@ -1916,10 +1915,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Mudar gr
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multi-jogador
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Anunciado
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Escolher entre jogo público (internet) e privado (Área de Rede Local, LAN)
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Não
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Sim
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Nome do jogador:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Este é o nome pelo qual os outros jogadores o irão identificar
 
@@ -1960,8 +1955,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Entrar n
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Renovar servidor
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Renovar a informação do servidor
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Localizar servidor
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Pesquisar por um servidor na rede
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Adicionar servidor
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Adiciona um servidor à lista que será sempre verificado se existem jogos a decorrer.
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Iniciar servidor
@@ -1978,6 +1971,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}O nome d
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Definir palavra-chave
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Proteja o jogo com uma senha se não desejar que pessoas indesejadas se juntem
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Anunciado
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Escolher entre jogo público (internet) e privado (Área de Rede Local, LAN)
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Não
 STR_NETWORK_START_SERVER_ADVERTISED                             :Sim
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} cliente{P "" s}

src/lang/romanian.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Grâu
 STR_CARGO_PLURAL_RUBBER                                         :Cauciuc
 STR_CARGO_PLURAL_SUGAR                                          :Zahăr
 STR_CARGO_PLURAL_TOYS                                           :Jucării
-STR_CARGO_PLURAL_CANDY                                          :Dulciuri
+STR_CARGO_PLURAL_SWEETS                                         :Dulciuri
 STR_CARGO_PLURAL_COLA                                           :Cola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Vată de zahăr
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Vată de zahăr
 STR_CARGO_PLURAL_BUBBLES                                        :Balonașe
 STR_CARGO_PLURAL_TOFFEE                                         :Caramele
 STR_CARGO_PLURAL_BATTERIES                                      :Baterii
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Grâu
 STR_CARGO_SINGULAR_RUBBER                                       :Cauciuc
 STR_CARGO_SINGULAR_SUGAR                                        :Zahăr
 STR_CARGO_SINGULAR_TOY                                          :Jucărie
-STR_CARGO_SINGULAR_CANDY                                        :Dulciuri
+STR_CARGO_SINGULAR_SWEETS                                       :Dulciuri
 STR_CARGO_SINGULAR_COLA                                         :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Vată de zahăr
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Vată de zahăr
 STR_CARGO_SINGULAR_BUBBLE                                       :Balonaș
 STR_CARGO_SINGULAR_TOFFEE                                       :Caramea
 STR_CARGO_SINGULAR_BATTERY                                      :Baterie
@@ -313,6 +313,8 @@ STR_SORT_BY_RANGE                                               :Raza de acțiun
 STR_SORT_BY_POPULATION                                          :Populaţia
 STR_SORT_BY_RATING                                              :Cotaţie
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pauză joc
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Măreşte viteza de trecere a timpului
@@ -1556,9 +1558,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :permis, aspect
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Poziţionarea copacilor în joc: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Controlează apariția aleatoare a copacilor în joc. Este posibil ca această opțiune să afecteze industrii care depind de creșterea copacilor, cum ar fi fabricile de cherestea
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :niciunul {RED}(afectează producţia fabricii de cherestea)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :doar în pădurile tropicale
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :peste tot
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Poziţia barei principale de instrumente: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Poziţia orizontală a barei principale în partea de sus a ecranului
@@ -1866,10 +1865,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Schimbă
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multiplayer
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Publicat
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Alege între un joc publicat (prin Internet) și unul privat (reț) game
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Nu
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Da
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Numele jucătorului:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Acesta este numele prin care te vor identifica ceilalţi
 
@@ -1910,8 +1905,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Intră
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Actualizează serverul
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Actualizează informaţiile despre server
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Caută server
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Caută un server în reţea
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Adaugă un server
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Adaugă un server la lista care va fi verificată pentru jocuri active
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Porneşte serverul
@@ -1928,6 +1921,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Numele j
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Pune parolă
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Protejează-ţi jocul cu o parolă dacă nu vrei să intre jucători neautorizaţi
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Publicat
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Alege între un joc publicat (prin Internet) și unul privat (reț) game
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Nu
 STR_NETWORK_START_SERVER_ADVERTISED                             :Da
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} clien{P t ţi}

src/lang/russian.txt

@@ -96,15 +96,15 @@ STR_CARGO_PLURAL_SUGAR.acc                                      :сахар
 STR_CARGO_PLURAL_TOYS                                           :{G=p}Игрушки
 STR_CARGO_PLURAL_TOYS.gen                                       :игрушек
 STR_CARGO_PLURAL_TOYS.acc                                       :игрушки
-STR_CARGO_PLURAL_CANDY                                          :{G=p}Конфеты
-STR_CARGO_PLURAL_CANDY.gen                                      :конфет
-STR_CARGO_PLURAL_CANDY.acc                                      :конфеты
+STR_CARGO_PLURAL_SWEETS                                         :{G=p}Конфеты
+STR_CARGO_PLURAL_SWEETS.gen                                     :конфет
+STR_CARGO_PLURAL_SWEETS.acc                                     :конфеты
 STR_CARGO_PLURAL_COLA                                           :{G=f}Кола
 STR_CARGO_PLURAL_COLA.gen                                       :колы
 STR_CARGO_PLURAL_COLA.acc                                       :колу
-STR_CARGO_PLURAL_COTTON_CANDY                                   :{G=f}Сахарная вата
-STR_CARGO_PLURAL_COTTON_CANDY.gen                               :сахарной ваты
-STR_CARGO_PLURAL_COTTON_CANDY.acc                               :сахарную вату
+STR_CARGO_PLURAL_CANDYFLOSS                                     :{G=f}Сахарная вата
+STR_CARGO_PLURAL_CANDYFLOSS.gen                                 :сахарной ваты
+STR_CARGO_PLURAL_CANDYFLOSS.acc                                 :сахарную вату
 STR_CARGO_PLURAL_BUBBLES                                        :{G=p}Пузырьки
 STR_CARGO_PLURAL_BUBBLES.gen                                    :пузырьков
 STR_CARGO_PLURAL_BUBBLES.acc                                    :пузырьки
@@ -192,15 +192,15 @@ STR_CARGO_SINGULAR_SUGAR.acc                                    :сахар
 STR_CARGO_SINGULAR_TOY                                          :{G=p}Игрушки
 STR_CARGO_SINGULAR_TOY.gen                                      :игрушек
 STR_CARGO_SINGULAR_TOY.acc                                      :игрушки
-STR_CARGO_SINGULAR_CANDY                                        :{G=p}Конфеты
-STR_CARGO_SINGULAR_CANDY.gen                                    :конфет
-STR_CARGO_SINGULAR_CANDY.acc                                    :конфеты
+STR_CARGO_SINGULAR_SWEETS                                       :{G=p}Конфеты
+STR_CARGO_SINGULAR_SWEETS.gen                                   :конфет
+STR_CARGO_SINGULAR_SWEETS.acc                                   :конфеты
 STR_CARGO_SINGULAR_COLA                                         :{G=f}Кола
 STR_CARGO_SINGULAR_COLA.gen                                     :колы
 STR_CARGO_SINGULAR_COLA.acc                                     :колу
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :{G=f}Сахарная вата
-STR_CARGO_SINGULAR_COTTON_CANDY.gen                             :сахарной ваты
-STR_CARGO_SINGULAR_COTTON_CANDY.acc                             :сахарную вату
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :{G=f}Сахарная вата
+STR_CARGO_SINGULAR_CANDYFLOSS.gen                               :сахарной ваты
+STR_CARGO_SINGULAR_CANDYFLOSS.acc                               :сахарную вату
 STR_CARGO_SINGULAR_BUBBLE                                       :{G=p}Пузырьки
 STR_CARGO_SINGULAR_BUBBLE.gen                                   :пузырьков
 STR_CARGO_SINGULAR_BUBBLE.acc                                   :пузырьки
@@ -320,7 +320,7 @@ STR_COLOUR_DEFAULT                                              :По умолч
 STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA}{NBSP}мил{P я и ь}/ч
 STR_UNITS_VELOCITY_METRIC                                       :{COMMA}{NBSP}км/ч
 STR_UNITS_VELOCITY_SI                                           :{COMMA}{NBSP}м/с
-STR_UNITS_VELOCITY_GAMEUNITS                                    :{DECIMAL}{NBSP}клет{P ка ки ок}/день
+STR_UNITS_VELOCITY_GAMEUNITS                                    :{DECIMAL}{NBSP}кл./день
 
 STR_UNITS_POWER_IMPERIAL                                        :{COMMA}{NBSP}лс
 STR_UNITS_POWER_METRIC                                          :{COMMA}{NBSP}лс
@@ -443,6 +443,8 @@ STR_SORT_BY_RANGE                                               :Дальнос
 STR_SORT_BY_POPULATION                                          :Население
 STR_SORT_BY_RATING                                              :Рейтинг
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Пауза
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Ускорить игру
@@ -1765,9 +1767,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :линейна
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Размножение деревьев в игре: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Настройка возможности самостоятельного размножения деревьев в игре. Это может влиять на работоспособность некоторых предприятий, например, лесопилок.
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :отключена {RED}(лесопилки не смогут работать)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :только в тропических лесах
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :везде
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Положение главной панели инструментов: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Горизонтальное расположение основной панели инструментов в верхней части экрана
@@ -1834,6 +1833,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT         :Показыв
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL         :английская (миль/ч)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_METRIC           :метрическая (км/ч)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_SI               :СИ (м/с)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_GAMEUNITS        :внутриигровая (клетки в день)
 
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER                     :Система единиц для мощности: {STRING}
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT            :Показывать значения мощности двигателей транспортных средств в выбранной системе единиц
@@ -1881,7 +1881,7 @@ STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}Мар
 STR_CONFIG_SETTING_LIMITATIONS                                  :{ORANGE}Ограничения
 STR_CONFIG_SETTING_ACCIDENTS                                    :{ORANGE}Аварии и катастрофы
 STR_CONFIG_SETTING_GENWORLD                                     :{ORANGE}Создание карты
-STR_CONFIG_SETTING_ENVIRONMENT                                  :{ORANGE}Окружающая среда
+STR_CONFIG_SETTING_ENVIRONMENT                                  :{ORANGE}Окружение
 STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :{ORANGE}Городская администрация
 STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :{ORANGE}Города
 STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :{ORANGE}Предприятия
@@ -2090,10 +2090,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Изме
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Сетевая игра
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Интернет
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Выберите между игрой через Интернет, либо в локальной сети
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Нет
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Да
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Имя игрока:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Это имя, которое будет видно другим игрокам
 
@@ -2134,8 +2130,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Прис
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Обновить сервер
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Обновить информацию о сервере
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Обновить
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Обновить список серверов, которые сейчас есть в сети
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Добавить сервер
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Добавить сервер в список, который будет автоматически проверяться на идущие игры
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Запуск сервера
@@ -2152,6 +2146,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Назв
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Установить пароль
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Защитите вашу игру паролем, если не хотите, чтобы к ней могли подключиться посторонние.
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Интернет
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Выберите между игрой через Интернет, либо в локальной сети
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Нет
 STR_NETWORK_START_SERVER_ADVERTISED                             :Да
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} клиент{P "" а ов}
@@ -5288,6 +5284,7 @@ STR_FORMAT_BUOY_NAME                                            :Буй {TOWN}
 STR_FORMAT_BUOY_NAME_SERIAL                                     :Буй {TOWN} №{COMMA}
 STR_FORMAT_COMPANY_NUM                                          :(Компания {COMMA})
 STR_FORMAT_GROUP_NAME                                           :Группа {COMMA}
+STR_FORMAT_GROUP_VEHICLE_NAME                                   :{GROUP} (№{COMMA})
 STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} {0:TOWN}
 STR_FORMAT_WAYPOINT_NAME                                        :Точка пути {TOWN}
 STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Точка пути {TOWN} №{COMMA}

src/lang/serbian.txt

@@ -119,18 +119,18 @@ STR_CARGO_PLURAL_TOYS                                           :igračke
 STR_CARGO_PLURAL_TOYS.big                                       :Igračke
 STR_CARGO_PLURAL_TOYS.gen                                       :igračaka
 STR_CARGO_PLURAL_TOYS.aku                                       :igračke
-STR_CARGO_PLURAL_CANDY                                          :slatkiši
-STR_CARGO_PLURAL_CANDY.big                                      :Slatkiši
-STR_CARGO_PLURAL_CANDY.gen                                      :slatkiša
-STR_CARGO_PLURAL_CANDY.aku                                      :slatkiše
+STR_CARGO_PLURAL_SWEETS                                         :slatkiši
+STR_CARGO_PLURAL_SWEETS.big                                     :Slatkiši
+STR_CARGO_PLURAL_SWEETS.gen                                     :slatkiša
+STR_CARGO_PLURAL_SWEETS.aku                                     :slatkiše
 STR_CARGO_PLURAL_COLA                                           :kola
 STR_CARGO_PLURAL_COLA.big                                       :Kola
 STR_CARGO_PLURAL_COLA.gen                                       :kole
 STR_CARGO_PLURAL_COLA.aku                                       :kolu
-STR_CARGO_PLURAL_COTTON_CANDY                                   :šećerna vuna
-STR_CARGO_PLURAL_COTTON_CANDY.big                               :Šećerna vuna
-STR_CARGO_PLURAL_COTTON_CANDY.gen                               :šećerne vune
-STR_CARGO_PLURAL_COTTON_CANDY.aku                               :šećernu vunu
+STR_CARGO_PLURAL_CANDYFLOSS                                     :šećerna vuna
+STR_CARGO_PLURAL_CANDYFLOSS.big                                 :Šećerna vuna
+STR_CARGO_PLURAL_CANDYFLOSS.gen                                 :šećerne vune
+STR_CARGO_PLURAL_CANDYFLOSS.aku                                 :šećernu vunu
 STR_CARGO_PLURAL_BUBBLES                                        :mehurići
 STR_CARGO_PLURAL_BUBBLES.big                                    :Mehurići
 STR_CARGO_PLURAL_BUBBLES.gen                                    :mehurića
@@ -246,18 +246,18 @@ STR_CARGO_SINGULAR_TOY                                          :igračka
 STR_CARGO_SINGULAR_TOY.big                                      :Igračka
 STR_CARGO_SINGULAR_TOY.gen                                      :igračke
 STR_CARGO_SINGULAR_TOY.aku                                      :igračku
-STR_CARGO_SINGULAR_CANDY                                        :slatkiš
-STR_CARGO_SINGULAR_CANDY.big                                    :Slatkiš
-STR_CARGO_SINGULAR_CANDY.gen                                    :slatkiša
-STR_CARGO_SINGULAR_CANDY.aku                                    :slatkiš
+STR_CARGO_SINGULAR_SWEETS                                       :slatkiš
+STR_CARGO_SINGULAR_SWEETS.big                                   :Slatkiš
+STR_CARGO_SINGULAR_SWEETS.gen                                   :slatkiša
+STR_CARGO_SINGULAR_SWEETS.aku                                   :slatkiš
 STR_CARGO_SINGULAR_COLA                                         :kola
 STR_CARGO_SINGULAR_COLA.big                                     :Kola
 STR_CARGO_SINGULAR_COLA.gen                                     :kole
 STR_CARGO_SINGULAR_COLA.aku                                     :kolu
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :šećerna vuna
-STR_CARGO_SINGULAR_COTTON_CANDY.big                             :Šećerna vuna
-STR_CARGO_SINGULAR_COTTON_CANDY.gen                             :šećerne vune
-STR_CARGO_SINGULAR_COTTON_CANDY.aku                             :šećernu vunu
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :šećerna vuna
+STR_CARGO_SINGULAR_CANDYFLOSS.big                               :Šećerna vuna
+STR_CARGO_SINGULAR_CANDYFLOSS.gen                               :šećerne vune
+STR_CARGO_SINGULAR_CANDYFLOSS.aku                               :šećernu vunu
 STR_CARGO_SINGULAR_BUBBLE                                       :mehurić
 STR_CARGO_SINGULAR_BUBBLE.big                                   :Mehurić
 STR_CARGO_SINGULAR_BUBBLE.gen                                   :mehurića
@@ -498,6 +498,8 @@ STR_SORT_BY_RANGE                                               :Dometu
 STR_SORT_BY_POPULATION                                          :Naseljenosti
 STR_SORT_BY_RATING                                              :Rejtingu
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pauziranje partije
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Ubrzavanje igre
@@ -1758,9 +1760,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :dozvoljeno, zas
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Rasejavanje drveća tokom partije: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Kontrola nasumične pojave drveća u toku igre. Ovo može uticati na industrije koje zavise o rastu drveća, na primer pilana
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :{G=srednji}nikakvo {RED}(onesposobljava rad drvnih kombinata)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :samo u tropskim šumama
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :svuda
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Lokacija glavne trake sa alatima: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Horizontalna pozicija glavne trake s alatkama na vrhu ekrana
@@ -2080,10 +2079,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Promena
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Mrežna partija
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK} Sa reklamama
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Odaberite između igre s oglasima (internet) i bez oglasa (Local Area Network, LAN)
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Ne
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Da
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Ime igrača:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Sa ovim imenom će Vas drugi igrači (pre)poznavati
 
@@ -2124,8 +2119,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Priklju
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Ažuriranje servera
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Ažurirajte podatke sa servera
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Pronađi server
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Pretražuje mrežu kako bi pronašao servere
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Dodaj server
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Dodaje server na spisak na kojem se uvek proverava za aktivne partije
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Pokreni server
@@ -2142,6 +2135,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Naziv pa
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Postavi lozinku
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Ukoliko ne želite da bude javno dostupna zaštitite Vašu partiju lozinkom
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK} Sa reklamama
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Odaberite između igre s oglasima (internet) i bez oglasa (Local Area Network, LAN)
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Ne
 STR_NETWORK_START_SERVER_ADVERTISED                             :Da
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} igrač{P "" a a}

src/lang/simplified_chinese.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :小麦
 STR_CARGO_PLURAL_RUBBER                                         :橡胶
 STR_CARGO_PLURAL_SUGAR                                          :蔗糖
 STR_CARGO_PLURAL_TOYS                                           :玩具
-STR_CARGO_PLURAL_CANDY                                          :糖果
+STR_CARGO_PLURAL_SWEETS                                         :糖果
 STR_CARGO_PLURAL_COLA                                           :可乐
-STR_CARGO_PLURAL_COTTON_CANDY                                   :棉花糖
+STR_CARGO_PLURAL_CANDYFLOSS                                     :棉花糖
 STR_CARGO_PLURAL_BUBBLES                                        :泡泡
 STR_CARGO_PLURAL_TOFFEE                                         :太妃糖
 STR_CARGO_PLURAL_BATTERIES                                      :电池
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :小麦
 STR_CARGO_SINGULAR_RUBBER                                       :橡胶
 STR_CARGO_SINGULAR_SUGAR                                        :蔗糖
 STR_CARGO_SINGULAR_TOY                                          :玩具
-STR_CARGO_SINGULAR_CANDY                                        :糖果
+STR_CARGO_SINGULAR_SWEETS                                       :糖果
 STR_CARGO_SINGULAR_COLA                                         :可乐
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :棉花糖
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :棉花糖
 STR_CARGO_SINGULAR_BUBBLE                                       :泡泡
 STR_CARGO_SINGULAR_TOFFEE                                       :太妃糖
 STR_CARGO_SINGULAR_BATTERY                                      :电池
@@ -315,6 +315,8 @@ STR_SORT_BY_RANGE                                               :航行距离
 STR_SORT_BY_POPULATION                                          :人口
 STR_SORT_BY_RATING                                              :等级
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}暂停游戏
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}快速游戏模式
@@ -1604,9 +1606,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :线性
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :树木自动生长： {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :控制游戏中数目的随机生长，这将影响依赖树木的工业，比如木材厂
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :无 {RED}(损坏伐木场)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :仅在雨林中
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :任意地点
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :主工具栏位置：{STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :主工具栏在屏幕上方的位置
@@ -1928,10 +1927,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}选择
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}联机游戏
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}发布到互联网
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}选择是否将游戏发布到官方服务器列表。发布的话，可以让互联网上的玩家找到你的服务器并加入游戏，否则进行局域网内的游戏。
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :否
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :是
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}玩家名称：
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}其他玩家将通过该名字来认识您
 
@@ -1972,8 +1967,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}加入
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}刷新服务器
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}刷新服务器信息
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}搜索服务器
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}在网络上搜索服务器
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}添加服务器
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}添加一个永远显示在列表中的服务器
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}启动服务器
@@ -1990,6 +1983,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}游戏
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}设置密码：
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}如果不希望你的游戏被外人加入，请设置一个密码
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}发布到互联网
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}选择是否将游戏发布到官方服务器列表。发布的话，可以让互联网上的玩家找到你的服务器并加入游戏，否则进行局域网内的游戏。
 STR_NETWORK_START_SERVER_UNADVERTISED                           :否
 STR_NETWORK_START_SERVER_ADVERTISED                             :是
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} 客户端

src/lang/slovak.txt

@@ -73,12 +73,12 @@ STR_CARGO_PLURAL_SUGAR                                          :Cukor
 STR_CARGO_PLURAL_SUGAR.g                                        :cukru
 STR_CARGO_PLURAL_TOYS                                           :Hračky
 STR_CARGO_PLURAL_TOYS.g                                         :hračiek
-STR_CARGO_PLURAL_CANDY                                          :Cukríky
-STR_CARGO_PLURAL_CANDY.g                                        :cukríkov
+STR_CARGO_PLURAL_SWEETS                                         :Cukríky
+STR_CARGO_PLURAL_SWEETS.g                                       :cukríkov
 STR_CARGO_PLURAL_COLA                                           :Kofola
 STR_CARGO_PLURAL_COLA.g                                         :kofoly
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Cukrová vata
-STR_CARGO_PLURAL_COTTON_CANDY.g                                 :cukrovej vaty
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Cukrová vata
+STR_CARGO_PLURAL_CANDYFLOSS.g                                   :cukrovej vaty
 STR_CARGO_PLURAL_BUBBLES                                        :Bublinky
 STR_CARGO_PLURAL_BUBBLES.g                                      :bubliniek
 STR_CARGO_PLURAL_TOFFEE                                         :Karamelky
@@ -138,12 +138,12 @@ STR_CARGO_SINGULAR_SUGAR                                        :Cukor
 STR_CARGO_SINGULAR_SUGAR.g                                      :cukru
 STR_CARGO_SINGULAR_TOY                                          :Hračka
 STR_CARGO_SINGULAR_TOY.g                                        :hračky
-STR_CARGO_SINGULAR_CANDY                                        :Cukrík
-STR_CARGO_SINGULAR_CANDY.g                                      :cukríka
+STR_CARGO_SINGULAR_SWEETS                                       :Cukrík
+STR_CARGO_SINGULAR_SWEETS.g                                     :cukríka
 STR_CARGO_SINGULAR_COLA                                         :Kofola
 STR_CARGO_SINGULAR_COLA.g                                       :kofoly
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Cukrová vata
-STR_CARGO_SINGULAR_COTTON_CANDY.g                               :cukrovej vaty
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Cukrová vata
+STR_CARGO_SINGULAR_CANDYFLOSS.g                                 :cukrovej vaty
 STR_CARGO_SINGULAR_BUBBLE                                       :Bublinka
 STR_CARGO_SINGULAR_BUBBLE.g                                     :bublinky
 STR_CARGO_SINGULAR_TOFFEE                                       :Karamel
@@ -380,6 +380,8 @@ STR_SORT_BY_RANGE                                               :Rozsah
 STR_SORT_BY_POPULATION                                          :Populácia
 STR_SORT_BY_RATING                                              :Hodnotenie
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pozastaviť hru
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Zrýchliť priebeh hry
@@ -1678,9 +1680,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Lineárne
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Umiestnenie stromov počas hry: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Riadi náhodný výskyt stromov počas hry. Toto môže ovplyvniť priemysel úzko spojený s rastom stromov ako napríklad Píla.
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :žiadne {RED}(znefunkční pílu)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Len v dažďových pralesoch
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :všade
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Pozícia hlavného menu: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Horizontálna poloha hlavného ovládacieho panela na vrchu obrazovky
@@ -1747,7 +1746,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT         :Vždy, keď sa
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL         :Imperiálne (mph)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_METRIC           :Metrické (km/h)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_SI               :SI (m/s)
-STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_GAMEUNITS        :Jednotky hry (políčka/deň)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_GAMEUNITS        :Jednotky v hre (políčka/deň)
 
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER                     :Jednotky výkonu vozidiel: {STRING}
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT            :Vždy, keď sa zobrazí výkon vozidla v užívateľskom rozhraní, zobrazí sa vo vybraných jednotkách
@@ -2004,10 +2003,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Zmeniť
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Hra pre viac hráčov
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Zverejnené
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Vyberte medzi zverejnenou (internet) alebo nezverejnenou (lokálna sieť, LAN) hrou
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Nie
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Áno
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Meno hráča:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Toto je meno podla ktoreho vas ostatny identifikuju
 
@@ -2048,8 +2043,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Pripojit
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Obnoviť server
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Obnovit info o serveri
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Nájsť server
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Hladať server po sieti
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Pridať server
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Pridá server do zoznamu, v ktorom sa vždy budú hľadať prebiehajúce hry
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Spustiť server
@@ -2066,6 +2059,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Názov h
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Nastaviť heslo
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Zabezpeč hru heslom, ak nechceš povoliť verejný prístup
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Zverejnené
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Vyberte medzi zverejnenou (internet) alebo nezverejnenou (lokálna sieť, LAN) hrou
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Nie
 STR_NETWORK_START_SERVER_ADVERTISED                             :Áno
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} klient{P "" i ov}
@@ -4805,7 +4800,7 @@ STR_INDUSTRY_NAME_SUGAR_MINE                                    :{G=z}Cukrová b
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Bez názvu
 STR_SV_TRAIN_NAME                                               :{G=m}Vlak č. {COMMA}
-STR_SV_ROAD_VEHICLE_NAME                                        :{G=s}Cestné vozidlo {COMMA}
+STR_SV_ROAD_VEHICLE_NAME                                        :{G=s}Cestné vozidlo č. {COMMA}
 STR_SV_SHIP_NAME                                                :{G=z}Loď č. {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :{G=s}Lietadlo č. {COMMA}
 
@@ -5106,20 +5101,20 @@ STR_FORMAT_DATE_LONG                                            :{STRING} {STRIN
 STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
 
 STR_FORMAT_BUOY_NAME                                            :{TOWN} Bója
-STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} Bója #{COMMA}
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} Bója č. {COMMA}
 STR_FORMAT_COMPANY_NUM                                          :(Spoločnosť {COMMA})
 STR_FORMAT_GROUP_NAME                                           :Skupina {COMMA}
 STR_FORMAT_GROUP_VEHICLE_NAME                                   :{GROUP} č. {COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} {0:TOWN}
 STR_FORMAT_WAYPOINT_NAME                                        :Smerový bod {TOWN}
-STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Smerový bod {TOWN} #{COMMA}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Smerový bod {TOWN} č. {COMMA}
 
 STR_FORMAT_DEPOT_NAME_TRAIN                                     :Vlakové depo {TOWN}
 STR_FORMAT_DEPOT_NAME_TRAIN_SERIAL                              :Vlakové depo {TOWN} č. {COMMA}
 STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE                              :Garáž {TOWN}
-STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE_SERIAL                       :Garáž {TOWN} #{COMMA}
+STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE_SERIAL                       :Garáž {TOWN} č. {COMMA}
 STR_FORMAT_DEPOT_NAME_SHIP                                      :Lodenica {TOWN}
-STR_FORMAT_DEPOT_NAME_SHIP_SERIAL                               :Lodenica {TOWN} #{COMMA}
+STR_FORMAT_DEPOT_NAME_SHIP_SERIAL                               :Lodenica {TOWN} č. {COMMA}
 STR_FORMAT_DEPOT_NAME_AIRCRAFT                                  :Letecký hangár {STATION}
 
 STR_UNKNOWN_STATION                                             :neznáma stanica

src/lang/slovenian.txt

@@ -105,16 +105,16 @@ STR_CARGO_PLURAL_SUGAR.d                                        :Sladkorju
 STR_CARGO_PLURAL_TOYS                                           :Igrače
 STR_CARGO_PLURAL_TOYS.r                                         :Igrač
 STR_CARGO_PLURAL_TOYS.d                                         :Igračam
-STR_CARGO_PLURAL_CANDY                                          :Sladkarije
-STR_CARGO_PLURAL_CANDY.r                                        :Sladkarij
-STR_CARGO_PLURAL_CANDY.d                                        :Sladkarijam
+STR_CARGO_PLURAL_SWEETS                                         :Sladkarije
+STR_CARGO_PLURAL_SWEETS.r                                       :Sladkarij
+STR_CARGO_PLURAL_SWEETS.d                                       :Sladkarijam
 STR_CARGO_PLURAL_COLA                                           :Cockta
 STR_CARGO_PLURAL_COLA.r                                         :Cockte
 STR_CARGO_PLURAL_COLA.d                                         :Cockti
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Sladkorna pena
-STR_CARGO_PLURAL_COTTON_CANDY.r                                 :Sladkorne pene
-STR_CARGO_PLURAL_COTTON_CANDY.d                                 :Sladkorni peni
-STR_CARGO_PLURAL_COTTON_CANDY.t                                 :Sladkorno peno
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Sladkorna pena
+STR_CARGO_PLURAL_CANDYFLOSS.r                                   :Sladkorne pene
+STR_CARGO_PLURAL_CANDYFLOSS.d                                   :Sladkorni peni
+STR_CARGO_PLURAL_CANDYFLOSS.t                                   :Sladkorno peno
 STR_CARGO_PLURAL_BUBBLES                                        :Mehurčki
 STR_CARGO_PLURAL_BUBBLES.r                                      :Mehurčkov
 STR_CARGO_PLURAL_BUBBLES.d                                      :Mehurčkom
@@ -212,18 +212,18 @@ STR_CARGO_SINGULAR_TOY                                          :Igrača
 STR_CARGO_SINGULAR_TOY.r                                        :Igrače
 STR_CARGO_SINGULAR_TOY.d                                        :Igrači
 STR_CARGO_SINGULAR_TOY.t                                        :Igračo
-STR_CARGO_SINGULAR_CANDY                                        :Sladkarija
-STR_CARGO_SINGULAR_CANDY.r                                      :Sladkarije
-STR_CARGO_SINGULAR_CANDY.d                                      :Sladkariji
-STR_CARGO_SINGULAR_CANDY.t                                      :Sladkarijo
+STR_CARGO_SINGULAR_SWEETS                                       :Sladkarija
+STR_CARGO_SINGULAR_SWEETS.r                                     :Sladkarije
+STR_CARGO_SINGULAR_SWEETS.d                                     :Sladkariji
+STR_CARGO_SINGULAR_SWEETS.t                                     :Sladkarijo
 STR_CARGO_SINGULAR_COLA                                         :Cockta
 STR_CARGO_SINGULAR_COLA.r                                       :Cockte
 STR_CARGO_SINGULAR_COLA.d                                       :Cockti
 STR_CARGO_SINGULAR_COLA.t                                       :Cockto
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Sladkorna pena
-STR_CARGO_SINGULAR_COTTON_CANDY.r                               :Sladkorne pene
-STR_CARGO_SINGULAR_COTTON_CANDY.d                               :Sladkorni peni
-STR_CARGO_SINGULAR_COTTON_CANDY.t                               :Sladkorno peno
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Sladkorna pena
+STR_CARGO_SINGULAR_CANDYFLOSS.r                                 :Sladkorne pene
+STR_CARGO_SINGULAR_CANDYFLOSS.d                                 :Sladkorni peni
+STR_CARGO_SINGULAR_CANDYFLOSS.t                                 :Sladkorno peno
 STR_CARGO_SINGULAR_BUBBLE                                       :Mehurček
 STR_CARGO_SINGULAR_BUBBLE.r                                     :Mehurčka
 STR_CARGO_SINGULAR_BUBBLE.d                                     :Mehurčku
@@ -463,6 +463,8 @@ STR_SORT_BY_RANGE                                               :Domet
 STR_SORT_BY_POPULATION                                          :Prebivalstvo
 STR_SORT_BY_RATING                                              :Ocena
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Premor
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Hitro naprej
@@ -1706,9 +1708,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :Dovoljeno, obli
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Sajenje dreves znotraj igre: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Nadziraj naključne vrste dreves med igro. To lahko vpliva na industrije, ki so odvisne od rasti dreves, na primer gozdarski obrat.
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Nikjer {RED}(onemogoči gozdarski obrat)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Samo v deževnih gozovih
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Povsod
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Pozicija glavne orodne vrstice: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Vodoravna pozicija glavne orodne vrstice na vrhu zaslona.
@@ -2029,10 +2028,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Spremeni
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Več igralcev
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Oglaševano
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Izberi med oglaševano (internet) in neoglaševano (Local Area Network, LAN) igro
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Ne
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Da
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Ime igralca:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}To je ime, po katerem te prepoznajo drugi igralci
 
@@ -2073,8 +2068,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Pridruž
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Osveži strežnik
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Osveži informacije strežnika
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Najdi strežnik
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Poišči strežnik na mreži
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Dodaj strežnik
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Doda strežnik na seznam, ki bo vedno preverjen za pognane igre
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Poženi strežnik
@@ -2091,6 +2084,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Ime bo p
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Nastavi geslo
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Zaščiti igro z geslom, če želiš preprečiti dostop nepovabljenim
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Oglaševano
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Izberi med oglaševano (internet) in neoglaševano (Local Area Network, LAN) igro
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Ne
 STR_NETWORK_START_SERVER_ADVERTISED                             :Da
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} gost{P "" a i ov}

src/lang/spanish.txt

@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT                                          :{G=m}Trigo
 STR_CARGO_PLURAL_RUBBER                                         :{G=m}Caucho
 STR_CARGO_PLURAL_SUGAR                                          :{G=m}Azúcar
 STR_CARGO_PLURAL_TOYS                                           :{G=m}Juguetes
-STR_CARGO_PLURAL_CANDY                                          :{G=m}Caramelos
+STR_CARGO_PLURAL_SWEETS                                         :{G=m}Caramelos
 STR_CARGO_PLURAL_COLA                                           :{G=f}Cola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :{G=m}Algodón de Azúcar
+STR_CARGO_PLURAL_CANDYFLOSS                                     :{G=m}Algodón de Azúcar
 STR_CARGO_PLURAL_BUBBLES                                        :{G=f}Burbujas
 STR_CARGO_PLURAL_TOFFEE                                         :{G=m}Tofes
 STR_CARGO_PLURAL_BATTERIES                                      :{G=f}Pilas
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :{G=m}Trigo
 STR_CARGO_SINGULAR_RUBBER                                       :{G=m}Caucho
 STR_CARGO_SINGULAR_SUGAR                                        :{G=m}Azúcar
 STR_CARGO_SINGULAR_TOY                                          :{G=m}Juguete
-STR_CARGO_SINGULAR_CANDY                                        :{G=m}Caramelo
+STR_CARGO_SINGULAR_SWEETS                                       :{G=m}Caramelo
 STR_CARGO_SINGULAR_COLA                                         :{G=f}Cola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :{G=m}Algodón de Azúcar
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :{G=m}Algodón de Azúcar
 STR_CARGO_SINGULAR_BUBBLE                                       :{G=f}Burbuja
 STR_CARGO_SINGULAR_TOFFEE                                       :{G=m}Tofe
 STR_CARGO_SINGULAR_BATTERY                                      :{G=f}Pila
@@ -316,6 +316,8 @@ STR_SORT_BY_RANGE                                               :Alcance
 STR_SORT_BY_POPULATION                                          :Población
 STR_SORT_BY_RATING                                              :Calificación
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pausar juego
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Avance rápido del juego
@@ -1605,9 +1607,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Lineal
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Crecimiento de árboles durante el juego: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Controla la aparición aleatoria de árboles durante la partida. Esto puede afectar a industrias que dependen del crecimiento de árboles, como los aserraderos
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Ninguno {RED}(rompe aserradero subtropical)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Solo en selva
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Cualquier parte
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Posición de la barra de herramientas principal: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Posicionamiento horizontal de la barra de herramientas principal en la parte superior de la pantalla
@@ -1929,10 +1928,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Cambiar
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multijugador
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Público
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Permite escoger entre una partida pública (internet) y una partida privada (LAN)
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :No
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Sí
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Nombre del jugador:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Este es el nombre con el que otros jugadores le identificarán
 
@@ -1973,8 +1968,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Unirme a
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Recargar servidor
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Recargar información del servidor
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Buscar servidor
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Buscar en la red servidores
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Añadir servidor
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Añade el servidor a una lista que siempre será comprobada para buscar juegos en marcha
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Comenzar servidor
@@ -1991,6 +1984,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}La parti
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Establecer contraseña
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Protege tu juego con una contraseña si no quieres que otras personas se unan a él
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Público
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Permite escoger entre una partida pública (internet) y una partida privada (LAN)
 STR_NETWORK_START_SERVER_UNADVERTISED                           :No
 STR_NETWORK_START_SERVER_ADVERTISED                             :Sí
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} cliente{P "" s}

src/lang/spanish_MX.txt

@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT                                          :{G=m}Trigo
 STR_CARGO_PLURAL_RUBBER                                         :{G=m}Caucho
 STR_CARGO_PLURAL_SUGAR                                          :{G=m}Azúcar
 STR_CARGO_PLURAL_TOYS                                           :{G=m}Juguetes
-STR_CARGO_PLURAL_CANDY                                          :{G=m}Dulces
+STR_CARGO_PLURAL_SWEETS                                         :{G=m}Dulces
 STR_CARGO_PLURAL_COLA                                           :{G=f}Bebida de cola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :{G=m}Algodón de azúcar
+STR_CARGO_PLURAL_CANDYFLOSS                                     :{G=m}Algodón de azúcar
 STR_CARGO_PLURAL_BUBBLES                                        :{G=f}Burbujas
 STR_CARGO_PLURAL_TOFFEE                                         :{G=m}Caramelos suaves
 STR_CARGO_PLURAL_BATTERIES                                      :{G=f}Pilas
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :{G=m}Trigo
 STR_CARGO_SINGULAR_RUBBER                                       :{G=m}Caucho
 STR_CARGO_SINGULAR_SUGAR                                        :{G=m}Azúcar
 STR_CARGO_SINGULAR_TOY                                          :{G=m}Juguete
-STR_CARGO_SINGULAR_CANDY                                        :{G=m}Dulce
+STR_CARGO_SINGULAR_SWEETS                                       :{G=m}Dulce
 STR_CARGO_SINGULAR_COLA                                         :{G=f}Bebida de cola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :{G=m}Algodón de azúcar
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :{G=m}Algodón de azúcar
 STR_CARGO_SINGULAR_BUBBLE                                       :{G=f}Burbuja
 STR_CARGO_SINGULAR_TOFFEE                                       :{G=m}Caramelo suave
 STR_CARGO_SINGULAR_BATTERY                                      :{G=f}Pila
@@ -316,6 +316,8 @@ STR_SORT_BY_RANGE                                               :Alcance
 STR_SORT_BY_POPULATION                                          :Población
 STR_SORT_BY_RATING                                              :Evaluación
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Poner en pausa
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Avance rápido
@@ -1605,9 +1607,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Lineal
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Crecimiento de árboles durante la partida: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Controlar la aparición aleatoria de árboles durante la partida. Esto puede afectar industrias que dependen del crecimiento de árboles, como los aserraderos
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Ninguno {RED}(inutiliza aserraderos)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Solo en selva
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Cualquier parte
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Posición de la barra de herramientas principal: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Posición horizontal de la barra de herramientas principal en la parte superior de la pantalla
@@ -1929,10 +1928,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Cambiar
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multijugador
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Público
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Permitir escoger entre una partida pública (Internet) y una partida privada (LAN)
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :No
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Sí
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Nombre del jugador:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Nombre con el que otros jugadores te identificarán
 
@@ -1973,8 +1968,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Unirse a
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Volver a cargar servidor
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Volver a cargar información del servidor
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Buscar servidor
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Buscar servidor en la red
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Añadir servidor
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Añadir el servidor a una lista que siempre será analizada en busca de partidas activas
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Iniciar servidor
@@ -1991,6 +1984,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}La parti
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Establecer contraseña
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Proteger la partida con una contraseña para prevenir el acceso a otras personas
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Público
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Permitir escoger entre una partida pública (Internet) y una partida privada (LAN)
 STR_NETWORK_START_SERVER_UNADVERTISED                           :No
 STR_NETWORK_START_SERVER_ADVERTISED                             :Sí
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} cliente{P "" s}

src/lang/swedish.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Vete
 STR_CARGO_PLURAL_RUBBER                                         :Gummi
 STR_CARGO_PLURAL_SUGAR                                          :Socker
 STR_CARGO_PLURAL_TOYS                                           :Leksaker
-STR_CARGO_PLURAL_CANDY                                          :Godis
+STR_CARGO_PLURAL_SWEETS                                         :Godis
 STR_CARGO_PLURAL_COLA                                           :Kola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Sockervadd
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Sockervadd
 STR_CARGO_PLURAL_BUBBLES                                        :Bubblor
 STR_CARGO_PLURAL_TOFFEE                                         :Knäck
 STR_CARGO_PLURAL_BATTERIES                                      :Batterier
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Spannmål
 STR_CARGO_SINGULAR_RUBBER                                       :Gummi
 STR_CARGO_SINGULAR_SUGAR                                        :Socker
 STR_CARGO_SINGULAR_TOY                                          :Leksak
-STR_CARGO_SINGULAR_CANDY                                        :Godis
+STR_CARGO_SINGULAR_SWEETS                                       :Godis
 STR_CARGO_SINGULAR_COLA                                         :Kola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Sockervadd
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Sockervadd
 STR_CARGO_SINGULAR_BUBBLE                                       :Bubbla
 STR_CARGO_SINGULAR_TOFFEE                                       :Knäck
 STR_CARGO_SINGULAR_BATTERY                                      :Batteri
@@ -315,6 +315,8 @@ STR_SORT_BY_RANGE                                               :Räckvidd
 STR_SORT_BY_POPULATION                                          :Folkmängd
 STR_SORT_BY_RATING                                              :Värdering
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pausa spelet
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Snabbspola spelet
@@ -1604,9 +1606,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Linjär
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Placering av träd i spelläge: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Kontrollera den slumpmässiga uppkomsten av träd under spelets gång. Detta kan påverka industrier som är beroende av växande träd, till exempel sågverk
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Inga {RED}(förstör sågverk)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Bara i regnskogar
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Överallt
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Verktygsradens position: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Verktygsradens horisontella position i skärmens överkant
@@ -1928,10 +1927,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Ändra s
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Flera spelare
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Publikt
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Välj mellan ett publikt (internet) eller icke publikt (Local Area Network. LAN) spel
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Nej
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Ja
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Spelarnamn:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Namnet som andra spelare kommer se dej som
 
@@ -1972,8 +1967,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Gå med
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Uppdatera server
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Uppdatera server info
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Leta server
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Sök i nätverket efter en server
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Lägg till server
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Lägg till en server till listan som alltid kommer kontrolleras för aktiva spel
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Starta server
@@ -1990,6 +1983,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Namnet p
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Bestäm lösenord
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Skydda spelet med ett lösenord så att inte andra än dem som har lösenordet kan gå med i spelet
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Publikt
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Välj mellan ett publikt (internet) eller icke publikt (Local Area Network. LAN) spel
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Nej
 STR_NETWORK_START_SERVER_ADVERTISED                             :Ja
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} klient{P "" er}

src/lang/tamil.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :கோதும
 STR_CARGO_PLURAL_RUBBER                                         :இறப்பர்
 STR_CARGO_PLURAL_SUGAR                                          :சர்க்கரை
 STR_CARGO_PLURAL_TOYS                                           :பொம்மைகள்
-STR_CARGO_PLURAL_CANDY                                          :இனிப்புகள்
+STR_CARGO_PLURAL_SWEETS                                         :இனிப்புகள்
 STR_CARGO_PLURAL_COLA                                           :கோலா
-STR_CARGO_PLURAL_COTTON_CANDY                                   :பஞ்சுமிட்டாய்
+STR_CARGO_PLURAL_CANDYFLOSS                                     :பஞ்சுமிட்டாய்
 STR_CARGO_PLURAL_BUBBLES                                        :குமிழிகள்
 STR_CARGO_PLURAL_TOFFEE                                         :மிட்டாய்கள்
 STR_CARGO_PLURAL_BATTERIES                                      :பாட்டரிகள்
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :கோதும
 STR_CARGO_SINGULAR_RUBBER                                       :இறப்பர்
 STR_CARGO_SINGULAR_SUGAR                                        :சர்க்கரை
 STR_CARGO_SINGULAR_TOY                                          :பொம்மை
-STR_CARGO_SINGULAR_CANDY                                        :இனிப்பு
+STR_CARGO_SINGULAR_SWEETS                                       :இனிப்பு
 STR_CARGO_SINGULAR_COLA                                         :கோலா
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :பஞ்சுமிட்டாய்
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :பஞ்சுமிட்டாய்
 STR_CARGO_SINGULAR_BUBBLE                                       :குமிழி
 STR_CARGO_SINGULAR_TOFFEE                                       :மிட்டாய்
 STR_CARGO_SINGULAR_BATTERY                                      :மின்கலம்
@@ -309,6 +309,8 @@ STR_SORT_BY_RANGE                                               :வரையற
 STR_SORT_BY_POPULATION                                          :மக்கள் தொகை
 STR_SORT_BY_RATING                                              :மதிப்பீடு
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}இடை நிறுத்து
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}அதி வேகமாக விளையாடு
@@ -1444,9 +1446,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :நேரிய
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :ஆட்டத்தின் போது மரங்களை நடுதல்: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :விளையாட்டின் போது மரங்களின் சீரற்ற தோற்றத்தைக் கட்டுப்படுத்தவும். இது மர வளர்ச்சியை நம்பியுள்ள தொழில்களை பாதிக்கலாம், எடுத்துக்காட்டாக மரம் வெட்டுதல் ஆலைகள்
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :ஒன்றுமில்லை {RED}(மர மில்லை உடைக்கும்)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :மழைக் காடுகளில் மட்டும்
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :எங்கும்
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :முக்கிய toolbarஇன் அமைப்பு இடம்: {STRING}
 STR_CONFIG_SETTING_STATUSBAR_POS                                :status barஇன் அமைப்பு இடம்: {STRING}
@@ -1718,9 +1717,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Tie அ
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}பல்வீரர்
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}விளம்பரப்படுத்தப்பட்ட
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :இல்லை
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :ஆம்
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}விளையாடுபவரின் பெயர்:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}இந்தப் பெயரில் பிறர் உன்னை அறிவர்
 
@@ -1760,8 +1756,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}ஆட
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}சர்வரினை புதுப்பிக்கவும்
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}சர்வரின் விவரத்தினை புதுப்பிக்கவும்
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}சர்வரினைத் தேடு
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}சர்வரினை இணையத்தில் தேடு
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}சர்வரினை இணை
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}சர்வரினை ஆரம்பி
 STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}தங்களின் சர்வரினை ஆரம்பிக்கவும்
@@ -1774,6 +1768,7 @@ STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}பு
 STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}விளையாட்டு பெயர்:
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}கடவுச்சொல்லினை அமைக்கவும்
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}விளம்பரப்படுத்தப்பட்ட
 STR_NETWORK_START_SERVER_UNADVERTISED                           :இல்லை
 STR_NETWORK_START_SERVER_ADVERTISED                             :ஆம்
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} விளையாடுபவர்{P "" கள்}

src/lang/thai.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :ข้าวส
 STR_CARGO_PLURAL_RUBBER                                         :ยางพารา
 STR_CARGO_PLURAL_SUGAR                                          :น้ำตาล
 STR_CARGO_PLURAL_TOYS                                           :ของเล่น
-STR_CARGO_PLURAL_CANDY                                          :ขนมสายไหม
+STR_CARGO_PLURAL_SWEETS                                         :ขนมสายไหม
 STR_CARGO_PLURAL_COLA                                           :โคล่า
-STR_CARGO_PLURAL_COTTON_CANDY                                   :ขนมสายไหม
+STR_CARGO_PLURAL_CANDYFLOSS                                     :ขนมสายไหม
 STR_CARGO_PLURAL_BUBBLES                                        :ฟอง
 STR_CARGO_PLURAL_TOFFEE                                         :ลูกอม
 STR_CARGO_PLURAL_BATTERIES                                      :ถ่านไฟฉาย
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :ข้าวส
 STR_CARGO_SINGULAR_RUBBER                                       :ยางพารา
 STR_CARGO_SINGULAR_SUGAR                                        :น้ำตาล
 STR_CARGO_SINGULAR_TOY                                          :ของเล่น
-STR_CARGO_SINGULAR_CANDY                                        :ขนมสายไหม
+STR_CARGO_SINGULAR_SWEETS                                       :ขนมสายไหม
 STR_CARGO_SINGULAR_COLA                                         :โคล่า
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :ขนมสายไหม
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :ขนมสายไหม
 STR_CARGO_SINGULAR_BUBBLE                                       :ฟอง
 STR_CARGO_SINGULAR_TOFFEE                                       :ลูกอม
 STR_CARGO_SINGULAR_BATTERY                                      :ถ่านไฟฉาย
@@ -303,6 +303,8 @@ STR_SORT_BY_RANGE                                               :ช่วง
 STR_SORT_BY_POPULATION                                          :ประชากร
 STR_SORT_BY_RATING                                              :ความพึงพอใจ
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}หยุดเกมชั่วคราว
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}เร่งความเร็วเกม
@@ -1512,9 +1514,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :ยอม, ร
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :การปลูกป่า: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :ควบคุมการสุ่มการเจริญเติบโตของต้นไม้ระหว่างเล่นเกม
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :ไม่มี {RED}(ไม่มีโรงเลื่อยไม้)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :เฉพาะในป่าฝนเท่านั้น
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :ทุกหนทุกแห่ง
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :ตำแหน่งแถบเครื่องมือหลัก: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :ตำแหน่งของปุ่มเครื่องมือต่างๆด้านบนของจอภาพ
@@ -1822,10 +1821,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}เป
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}เล่นหลายคน
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}การประกาศ
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}เลือกระหว่างการโฆษณา (internet) หรือไม่โฆษณา (Local Area Network, LAN) เกม
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :ไม่ใช่
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :ใช่
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}ชื่อผู้เล่น:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}เป็นชื่อที่ผู้เล่นคนอื่นจะมองเห็น
 
@@ -1866,8 +1861,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}เข
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}เรียกดูเซิร์ฟเวอร์ใหม่
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}เรียกดูข้อมูลเซิร์ฟเวอร์ใหม่
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}หาเซิร์ฟเวอร์
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}ค้นหาเซิร์ฟเวอร์ในเครือข่าย
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}เพิ่มเซิร์ฟเวอร์
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}เพิ่มเซิร์ฟเวอร์เข้าไปในรายการซึ่งจะถูกตรวจสอบเพื่อเข้าเล่นเกม
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}เริ่มเซิร์ฟเวอร์ใหม่
@@ -1884,6 +1877,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}ชื
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}กำหนดรหัสผ่าน
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}ป้องกันเกมด้วยรหัสผ่านหากไม่ต้องการให้มีการเข้าร่วมจากบุคคลทั่วไป
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}การประกาศ
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}เลือกระหว่างการโฆษณา (internet) หรือไม่โฆษณา (Local Area Network, LAN) เกม
 STR_NETWORK_START_SERVER_UNADVERTISED                           :ไม่ใช่
 STR_NETWORK_START_SERVER_ADVERTISED                             :ใช่
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} ลูกข่าย

src/lang/traditional_chinese.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :小麥
 STR_CARGO_PLURAL_RUBBER                                         :橡膠
 STR_CARGO_PLURAL_SUGAR                                          :砂糖
 STR_CARGO_PLURAL_TOYS                                           :玩具
-STR_CARGO_PLURAL_CANDY                                          :糖果
+STR_CARGO_PLURAL_SWEETS                                         :糖果
 STR_CARGO_PLURAL_COLA                                           :可樂
-STR_CARGO_PLURAL_COTTON_CANDY                                   :棉花糖
+STR_CARGO_PLURAL_CANDYFLOSS                                     :棉花糖
 STR_CARGO_PLURAL_BUBBLES                                        :氣泡
 STR_CARGO_PLURAL_TOFFEE                                         :太妃糖
 STR_CARGO_PLURAL_BATTERIES                                      :電池
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :小麥
 STR_CARGO_SINGULAR_RUBBER                                       :橡膠
 STR_CARGO_SINGULAR_SUGAR                                        :砂糖
 STR_CARGO_SINGULAR_TOY                                          :玩具
-STR_CARGO_SINGULAR_CANDY                                        :糖果
+STR_CARGO_SINGULAR_SWEETS                                       :糖果
 STR_CARGO_SINGULAR_COLA                                         :可樂
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :棉花糖
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :棉花糖
 STR_CARGO_SINGULAR_BUBBLE                                       :氣泡
 STR_CARGO_SINGULAR_TOFFEE                                       :太妃糖
 STR_CARGO_SINGULAR_BATTERY                                      :電池
@@ -310,6 +310,8 @@ STR_SORT_BY_RANGE                                               :範圍
 STR_SORT_BY_POPULATION                                          :人口
 STR_SORT_BY_RATING                                              :評價
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}暫停遊戲
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}快轉遊戲
@@ -1553,9 +1555,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :允許，可自
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :遊戲中產生樹木的地點：{STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :控制遊戲內是否隨意種植樹木。此選項可能會影響一些依賴樹木的工業 (例如熱帶氣候的伐木場)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :不產生 {RED}(伐木場會停止運作)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :只在雨林區產生
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :到處產生
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :主工具列位置：{STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :設定主工具列在螢幕頂部的位置
@@ -1876,10 +1875,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}改變
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}多人遊戲
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}已啟用宣傳
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}選擇是否在互聯網上宣傳此遊戲
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :否
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :是
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}玩家名稱：
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}這是其他玩家辨認您的名稱
 
@@ -1920,8 +1915,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}加入
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}更新伺服器
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}更新伺服器資訊
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}尋找伺服器
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}尋找網路上的伺服器
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}新增伺服器
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}在清單新增會檢查遊戲進行的伺服器
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}起動伺服器
@@ -1938,6 +1931,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}遊戲
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}設定密碼
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}如果您不想讓大眾連線的話，可以用密碼保護遊戲
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}已啟用宣傳
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}選擇是否在互聯網上宣傳此遊戲
 STR_NETWORK_START_SERVER_UNADVERTISED                           :否
 STR_NETWORK_START_SERVER_ADVERTISED                             :是
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} 玩家

src/lang/turkish.txt

@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Buğday
 STR_CARGO_PLURAL_RUBBER                                         :Kauçuk
 STR_CARGO_PLURAL_SUGAR                                          :Şeker
 STR_CARGO_PLURAL_TOYS                                           :Oyuncak
-STR_CARGO_PLURAL_CANDY                                          :Tatlı
+STR_CARGO_PLURAL_SWEETS                                         :Tatlı
 STR_CARGO_PLURAL_COLA                                           :Kola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Pamuk şeker
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Pamuk şeker
 STR_CARGO_PLURAL_BUBBLES                                        :Baloncuk
 STR_CARGO_PLURAL_TOFFEE                                         :Şekerleme
 STR_CARGO_PLURAL_BATTERIES                                      :Pil
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Buğday
 STR_CARGO_SINGULAR_RUBBER                                       :Kauçuk
 STR_CARGO_SINGULAR_SUGAR                                        :Şeker
 STR_CARGO_SINGULAR_TOY                                          :Oyuncak
-STR_CARGO_SINGULAR_CANDY                                        :Tatlı
+STR_CARGO_SINGULAR_SWEETS                                       :Tatlı
 STR_CARGO_SINGULAR_COLA                                         :Kola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Pamuk helva
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Pamuk helva
 STR_CARGO_SINGULAR_BUBBLE                                       :Balon
 STR_CARGO_SINGULAR_TOFFEE                                       :Şekerleme
 STR_CARGO_SINGULAR_BATTERY                                      :Pil
@@ -316,6 +316,8 @@ STR_SORT_BY_RANGE                                               :Menzil
 STR_SORT_BY_POPULATION                                          :Nüfus
 STR_SORT_BY_RATING                                              :Değerlendirme
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Oyunu durdur
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Oyunu hızlandır
@@ -1605,9 +1607,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Doğrusal
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Oyunda ağaç dikme: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Oyundaki rastgele ağaçların görünümünü kontrol eder. Bu, ağaçların büyümesine bağımlı olan endüstrileri etkileyebilir, örneğin keresteciler gibi
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Hiçbiri {RED}(kauçuk fabrikasını yok eder)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Yalnız yağmur ormanlarında
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Her yerde
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Ana araç çubuğu konumu: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Ekranın üst kısmındaki ana araç çubuğunun yatay konumu
@@ -1929,10 +1928,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Kravatı
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Çok Oyunculu
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Duyurulan
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Duyurulan (internet) ve duyurulmayan (yerel ağ, LAN) oyun türlerinden birini seçin
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Hayır
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Evet
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Oyuncu adı:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Oyuncuların görecegi adınızı seçin
 
@@ -1973,8 +1968,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Oyuna gi
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Sunucuyu tazele
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Sunucu bilgisini tazele
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Sunucu bul
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Sunucu bulmak için bir agi ara
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Sunucu ekle
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Her zaman çalışan oyunlarına bakabilmek için bir sunucu ekle
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Sunucu başlat
@@ -1991,6 +1984,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Bu oyun
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Parola koy
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Erişimi kısıtlamak için oyuna parola koy
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Duyurulan
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Duyurulan (internet) ve duyurulmayan (yerel ağ, LAN) oyun türlerinden birini seçin
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Hayır
 STR_NETWORK_START_SERVER_ADVERTISED                             :Evet
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} istemci

src/lang/ukrainian.txt

@@ -95,15 +95,15 @@ STR_CARGO_PLURAL_SUGAR.z                                        :цукор
 STR_CARGO_PLURAL_TOYS                                           :іграшки
 STR_CARGO_PLURAL_TOYS.r                                         :іграшок
 STR_CARGO_PLURAL_TOYS.z                                         :іграшки
-STR_CARGO_PLURAL_CANDY                                          :солодощі
-STR_CARGO_PLURAL_CANDY.r                                        :солодощів
-STR_CARGO_PLURAL_CANDY.z                                        :солодощі
+STR_CARGO_PLURAL_SWEETS                                         :солодощі
+STR_CARGO_PLURAL_SWEETS.r                                       :солодощів
+STR_CARGO_PLURAL_SWEETS.z                                       :солодощі
 STR_CARGO_PLURAL_COLA                                           :кола
 STR_CARGO_PLURAL_COLA.r                                         :коли
 STR_CARGO_PLURAL_COLA.z                                         :колу
-STR_CARGO_PLURAL_COTTON_CANDY                                   :солодка вата
-STR_CARGO_PLURAL_COTTON_CANDY.r                                 :солодкої вати
-STR_CARGO_PLURAL_COTTON_CANDY.z                                 :солодку вату
+STR_CARGO_PLURAL_CANDYFLOSS                                     :солодка вата
+STR_CARGO_PLURAL_CANDYFLOSS.r                                   :солодкої вати
+STR_CARGO_PLURAL_CANDYFLOSS.z                                   :солодку вату
 STR_CARGO_PLURAL_BUBBLES                                        :бульбашки
 STR_CARGO_PLURAL_BUBBLES.r                                      :бульбашок
 STR_CARGO_PLURAL_BUBBLES.z                                      :бульбашки
@@ -191,15 +191,15 @@ STR_CARGO_SINGULAR_SUGAR.z                                      :цукор
 STR_CARGO_SINGULAR_TOY                                          :іграшки
 STR_CARGO_SINGULAR_TOY.r                                        :іграшок
 STR_CARGO_SINGULAR_TOY.z                                        :іграшки
-STR_CARGO_SINGULAR_CANDY                                        :цукерки
-STR_CARGO_SINGULAR_CANDY.r                                      :цукерок
-STR_CARGO_SINGULAR_CANDY.z                                      :цукерки
+STR_CARGO_SINGULAR_SWEETS                                       :цукерки
+STR_CARGO_SINGULAR_SWEETS.r                                     :цукерок
+STR_CARGO_SINGULAR_SWEETS.z                                     :цукерки
 STR_CARGO_SINGULAR_COLA                                         :кола
 STR_CARGO_SINGULAR_COLA.r                                       :коли
 STR_CARGO_SINGULAR_COLA.z                                       :колу
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :солодка вата
-STR_CARGO_SINGULAR_COTTON_CANDY.r                               :солодкої вати
-STR_CARGO_SINGULAR_COTTON_CANDY.z                               :солодку вату
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :солодка вата
+STR_CARGO_SINGULAR_CANDYFLOSS.r                                 :солодкої вати
+STR_CARGO_SINGULAR_CANDYFLOSS.z                                 :солодку вату
 STR_CARGO_SINGULAR_BUBBLE                                       :бульбашки
 STR_CARGO_SINGULAR_BUBBLE.r                                     :бульбашок
 STR_CARGO_SINGULAR_BUBBLE.z                                     :бульбашки
@@ -440,6 +440,8 @@ STR_SORT_BY_RANGE                                               :за дальн
 STR_SORT_BY_POPULATION                                          :за населенням
 STR_SORT_BY_RATING                                              :за рейтингом
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Пауза
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Прискорити гру
@@ -1732,9 +1734,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :лінійна
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Поява дерев під час гри: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Налаштування випадкової появи дерев на карті в процесі гри. Ця настройка також впливає на відповідні підприємства, такі як лісопилки.
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Відсутня {RED}(зупиняє лісопилки)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Тільки у тропіках
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Скрізь
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Позиція головного меню: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Горизонтальна позиція основної панелі інструментів.
@@ -2056,10 +2055,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Змін
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Мережева гра
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Інтернет
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Вибір між рекламованою (інтернет) і не рекламованою (локальна мережа, LAN) грою
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Ні
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Так
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Ім'я гравця:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Ім'я, за яким тебе розпізнаватимуть інші гравці
 
@@ -2100,8 +2095,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Приє
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Оновити сервер
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Оновити інформацію про сервер
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Знайти сервер
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Пошук мережі для сервера
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Додати сервер
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Додає сервер до списку, який завжди буде перевірятись на поточні ігри
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Створити сервер
@@ -2118,6 +2111,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Назв
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Встановити пароль
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Захистіть вашу гру паролем, якщо не бажаєте загального доступу
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Інтернет
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Вибір між рекламованою (інтернет) і не рекламованою (локальна мережа, LAN) грою
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Ні
 STR_NETWORK_START_SERVER_ADVERTISED                             :Так
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} клієнт{P "" а ів}

src/lang/unfinished/chuvash.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Тулă
 STR_CARGO_PLURAL_RUBBER                                         :Каучук
 STR_CARGO_PLURAL_SUGAR                                          :Сахăр
 STR_CARGO_PLURAL_TOYS                                           :Теттесем
-STR_CARGO_PLURAL_CANDY                                          :Канфетсем
+STR_CARGO_PLURAL_SWEETS                                         :Канфетсем
 STR_CARGO_PLURAL_COLA                                           :Кола
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Сахăр ваткĕ
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Сахăр ваткĕ
 STR_CARGO_PLURAL_BUBBLES                                        :Хӑмпӑҫӑмсем
 STR_CARGO_PLURAL_TOFFEE                                         :Карамель
 STR_CARGO_PLURAL_BATTERIES                                      :Батарейкасем
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Тулă
 STR_CARGO_SINGULAR_RUBBER                                       :Каучук
 STR_CARGO_SINGULAR_SUGAR                                        :Сахăр
 STR_CARGO_SINGULAR_TOY                                          :Тетте
-STR_CARGO_SINGULAR_CANDY                                        :Канфетсем
+STR_CARGO_SINGULAR_SWEETS                                       :Канфетсем
 STR_CARGO_SINGULAR_COLA                                         :Кола
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Сахăр ваткĕ
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Сахăр ваткĕ
 STR_CARGO_SINGULAR_BUBBLE                                       :Хӑмпӑҫӑм
 STR_CARGO_SINGULAR_TOFFEE                                       :Карамель
 STR_CARGO_SINGULAR_BATTERY                                      :Батарейкасем
@@ -203,6 +203,8 @@ STR_SORT_BY_COST                                                :Хак
 STR_SORT_BY_POWER                                               :Хӑватлӑх
 STR_SORT_BY_POPULATION                                          :Ҫынисем
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Вӑййи тӑхтав
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Вӑййи хӑвӑртлат
@@ -609,8 +611,6 @@ STR_CONFIG_SETTING_TOWN_LAYOUT_DEFAULT                          :чӑн
 STR_CONFIG_SETTING_TOWN_LAYOUT_2X2_GRID                         :2x2
 STR_CONFIG_SETTING_TOWN_LAYOUT_3X3_GRID                         :3x3
 
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :ҫук {RED}(breaks lumber mill)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :таҫта та
 
 STR_CONFIG_SETTING_TOWN_GROWTH_NONE                             :Ҫук
 STR_CONFIG_SETTING_TOWN_GROWTH_SLOW                             :Вӑрах
@@ -753,7 +753,6 @@ STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}ХИР
 
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Сервер ҫӗнет
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Сервер туп
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Сервер хуш
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Сервер пуҫ
 

src/lang/unfinished/frisian.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Weet
 STR_CARGO_PLURAL_RUBBER                                         :Rubber
 STR_CARGO_PLURAL_SUGAR                                          :Sûker
 STR_CARGO_PLURAL_TOYS                                           :Boartersguod
-STR_CARGO_PLURAL_CANDY                                          :Snobbersguod
+STR_CARGO_PLURAL_SWEETS                                         :Snobbersguod
 STR_CARGO_PLURAL_COLA                                           :Kola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Sûkerspin
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Sûkerspin
 STR_CARGO_PLURAL_BUBBLES                                        :Bubbels
 STR_CARGO_PLURAL_TOFFEE                                         :Toffee
 STR_CARGO_PLURAL_BATTERIES                                      :Batterijen
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Weet
 STR_CARGO_SINGULAR_RUBBER                                       :Rubber
 STR_CARGO_SINGULAR_SUGAR                                        :Sûker
 STR_CARGO_SINGULAR_TOY                                          :Boartersguod
-STR_CARGO_SINGULAR_CANDY                                        :Snobbersguod
+STR_CARGO_SINGULAR_SWEETS                                       :Snobbersguod
 STR_CARGO_SINGULAR_COLA                                         :Kola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Sûkerspin
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Sûkerspin
 STR_CARGO_SINGULAR_BUBBLE                                       :Bûle
 STR_CARGO_SINGULAR_TOFFEE                                       :Toffee
 STR_CARGO_SINGULAR_BATTERY                                      :Batterij
@@ -310,6 +310,8 @@ STR_SORT_BY_RANGE                                               :Beryk
 STR_SORT_BY_POPULATION                                          :Ynwenners
 STR_SORT_BY_RATING                                              :Rang
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Spul skoftsjen
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Tiid hurder rinne litte
@@ -1525,9 +1527,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED                        :Tastean
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :Tastean, oanpast strittepatroan
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Bouen fan beamen yn it spul: {STRING}
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Gjin {RED}(brekt houtseachmûne)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Allinich yn reinwâlden
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Oerol
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Plak fan de haad wurkbalk: {STRING}
 STR_CONFIG_SETTING_STATUSBAR_POS                                :Posysje fan statusbalke: {STRING}
@@ -1798,10 +1797,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Feroarje
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multiplayer
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Advertearre
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Kies tusken in advertearre (ynternet) of in net-advertearre (LAN) spul
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Nee
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Ja
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Namme fan spieler:
 
 STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Namme
@@ -1833,7 +1828,6 @@ STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}FERKEAR
 STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Meidwaan mei spul
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Laad tsjinner ynfo opnij
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Server sykje
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Tsjinner tafoegje
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Start tsjinner
 STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Start dien eigen tsjinner
@@ -1847,6 +1841,8 @@ STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Start in
 STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Spulnamme:
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Wachtwurd ynstelle
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Advertearre
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Kies tusken in advertearre (ynternet) of in net-advertearre (LAN) spul
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Nee
 STR_NETWORK_START_SERVER_ADVERTISED                             :Ja
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} kliïnt{P "" en}

src/lang/unfinished/ido.txt

@@ -47,9 +47,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Frumento
 STR_CARGO_PLURAL_RUBBER                                         :Kauchuko
 STR_CARGO_PLURAL_SUGAR                                          :Sukro
 STR_CARGO_PLURAL_TOYS                                           :Ludili
-STR_CARGO_PLURAL_CANDY                                          :Bonboni
+STR_CARGO_PLURAL_SWEETS                                         :Bonboni
 STR_CARGO_PLURAL_COLA                                           :Kolao
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Kandi-lanugo
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Kandi-lanugo
 STR_CARGO_PLURAL_BUBBLES                                        :Buli
 STR_CARGO_PLURAL_TOFFEE                                         :Karamelo
 STR_CARGO_PLURAL_BATTERIES                                      :Baterii
@@ -81,9 +81,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Frumento
 STR_CARGO_SINGULAR_RUBBER                                       :Kauchuko
 STR_CARGO_SINGULAR_SUGAR                                        :Sukro
 STR_CARGO_SINGULAR_TOY                                          :Ludilo
-STR_CARGO_SINGULAR_CANDY                                        :Bonbono
+STR_CARGO_SINGULAR_SWEETS                                       :Bonbono
 STR_CARGO_SINGULAR_COLA                                         :Kolao
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Kandi-lanugo
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Kandi-lanugo
 STR_CARGO_SINGULAR_BUBBLE                                       :Bulo
 STR_CARGO_SINGULAR_TOFFEE                                       :Karamelo
 STR_CARGO_SINGULAR_BATTERY                                      :Baterio
@@ -255,6 +255,8 @@ STR_SORT_BY_FACILITY                                            :Stacion-tipo
 STR_SORT_BY_POWER                                               :Povo
 STR_SORT_BY_POPULATION                                          :Populo
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pauzas ludo
 STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Selekti
@@ -553,7 +555,6 @@ STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET                  :Violkolora
 
 
 
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :omnube
 
 
 

src/lang/unfinished/macedonian.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Пченица
 STR_CARGO_PLURAL_RUBBER                                         :Гума
 STR_CARGO_PLURAL_SUGAR                                          :Шеќер
 STR_CARGO_PLURAL_TOYS                                           :Играчки
-STR_CARGO_PLURAL_CANDY                                          :Колачиња
+STR_CARGO_PLURAL_SWEETS                                         :Колачиња
 STR_CARGO_PLURAL_COLA                                           :Кола (сок)
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Суровина за колачиња
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Суровина за колачиња
 STR_CARGO_PLURAL_BUBBLES                                        :Меурчиња
 STR_CARGO_PLURAL_TOFFEE                                         :Карамели
 STR_CARGO_PLURAL_BATTERIES                                      :Батерии
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Пченица
 STR_CARGO_SINGULAR_RUBBER                                       :Гума
 STR_CARGO_SINGULAR_SUGAR                                        :Шеќер
 STR_CARGO_SINGULAR_TOY                                          :Играчка
-STR_CARGO_SINGULAR_CANDY                                        :Колаче
+STR_CARGO_SINGULAR_SWEETS                                       :Колаче
 STR_CARGO_SINGULAR_COLA                                         :Кола (сок)
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Суровина за колачиња
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Суровина за колачиња
 STR_CARGO_SINGULAR_BUBBLE                                       :Меурче
 STR_CARGO_SINGULAR_TOFFEE                                       :Карамела
 STR_CARGO_SINGULAR_BATTERY                                      :Батерија
@@ -290,6 +290,8 @@ STR_SORT_BY_RANGE                                               :опсег
 STR_SORT_BY_POPULATION                                          :Населеност
 STR_SORT_BY_RATING                                              :Рејтинг
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Паузирај ја играта
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Брзо нанапред играта

src/lang/unfinished/maltese.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Qamħ
 STR_CARGO_PLURAL_RUBBER                                         :Lastku
 STR_CARGO_PLURAL_SUGAR                                          :Zokkor
 STR_CARGO_PLURAL_TOYS                                           :Ġugarelli
-STR_CARGO_PLURAL_CANDY                                          :Ħelu
+STR_CARGO_PLURAL_SWEETS                                         :Ħelu
 STR_CARGO_PLURAL_COLA                                           :Koka
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Kandifloss
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Kandifloss
 STR_CARGO_PLURAL_BUBBLES                                        :Bżieżaq
 STR_CARGO_PLURAL_TOFFEE                                         :Tofija
 STR_CARGO_PLURAL_BATTERIES                                      :Batteriji
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Qamħ
 STR_CARGO_SINGULAR_RUBBER                                       :Lastku
 STR_CARGO_SINGULAR_SUGAR                                        :Zokkor
 STR_CARGO_SINGULAR_TOY                                          :Ġugarell
-STR_CARGO_SINGULAR_CANDY                                        :Ħelwa
+STR_CARGO_SINGULAR_SWEETS                                       :Ħelwa
 STR_CARGO_SINGULAR_COLA                                         :Koka
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Kandiflos
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Kandiflos
 STR_CARGO_SINGULAR_BUBBLE                                       :Bużżieqa
 STR_CARGO_SINGULAR_TOFFEE                                       :Tofija
 STR_CARGO_SINGULAR_BATTERY                                      :Batterija
@@ -241,6 +241,8 @@ STR_SORT_BY_CARGO_CAPACITY                                      :Kapaċita ta' m
 STR_SORT_BY_RANGE                                               :Kemm Twassal
 STR_SORT_BY_POPULATION                                          :Popolazzjoni
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Waqfa temporanja mil-logħba
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Għaġġel il-loghba

src/lang/unfinished/marathi.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :गहू
 STR_CARGO_PLURAL_RUBBER                                         :रबर
 STR_CARGO_PLURAL_SUGAR                                          :साखर
 STR_CARGO_PLURAL_TOYS                                           :खेळणी
-STR_CARGO_PLURAL_CANDY                                          :मिठाई
+STR_CARGO_PLURAL_SWEETS                                         :मिठाई
 STR_CARGO_PLURAL_COLA                                           :शीतपेये
-STR_CARGO_PLURAL_COTTON_CANDY                                   :म्हातारीचा कापूस
+STR_CARGO_PLURAL_CANDYFLOSS                                     :म्हातारीचा कापूस
 STR_CARGO_PLURAL_BUBBLES                                        :बुडबुडे
 STR_CARGO_PLURAL_TOFFEE                                         :टॉफी
 STR_CARGO_PLURAL_BATTERIES                                      :बॅटरी
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :गहू
 STR_CARGO_SINGULAR_RUBBER                                       :रबर
 STR_CARGO_SINGULAR_SUGAR                                        :साखर
 STR_CARGO_SINGULAR_TOY                                          :खेळणी
-STR_CARGO_SINGULAR_CANDY                                        :मिठाई
+STR_CARGO_SINGULAR_SWEETS                                       :मिठाई
 STR_CARGO_SINGULAR_COLA                                         :कोला
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :कँडी फ्लास
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :कँडी फ्लास
 STR_CARGO_SINGULAR_BUBBLE                                       :बुडबुडा
 STR_CARGO_SINGULAR_TOFFEE                                       :टॉफी
 STR_CARGO_SINGULAR_BATTERY                                      :बॅटरी
@@ -291,6 +291,8 @@ STR_SORT_BY_RANGE                                               :प्रका
 STR_SORT_BY_POPULATION                                          :लोकसंख्या
 STR_SORT_BY_RATING                                              :धारा
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK} खेळ स्थगित करा
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}जलद खेळ अग्रेषित

src/lang/unfinished/persian.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :گندم
 STR_CARGO_PLURAL_RUBBER                                         :کائوچو
 STR_CARGO_PLURAL_SUGAR                                          :شکر
 STR_CARGO_PLURAL_TOYS                                           :اسباب بازی
-STR_CARGO_PLURAL_CANDY                                          :شیرینی
+STR_CARGO_PLURAL_SWEETS                                         :شیرینی
 STR_CARGO_PLURAL_COLA                                           :نوشابه
-STR_CARGO_PLURAL_COTTON_CANDY                                   :پشمک
+STR_CARGO_PLURAL_CANDYFLOSS                                     :پشمک
 STR_CARGO_PLURAL_BUBBLES                                        :حباب
 STR_CARGO_PLURAL_TOFFEE                                         :تافی
 STR_CARGO_PLURAL_BATTERIES                                      :باتری
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :گندم
 STR_CARGO_SINGULAR_RUBBER                                       :کائوچو
 STR_CARGO_SINGULAR_SUGAR                                        :شکر
 STR_CARGO_SINGULAR_TOY                                          :اسباب بازی
-STR_CARGO_SINGULAR_CANDY                                        :شیرینی
+STR_CARGO_SINGULAR_SWEETS                                       :شیرینی
 STR_CARGO_SINGULAR_COLA                                         :نوشابه
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :پشمک
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :پشمک
 STR_CARGO_SINGULAR_BUBBLE                                       :حباب
 STR_CARGO_SINGULAR_TOFFEE                                       :تافی
 STR_CARGO_SINGULAR_BATTERY                                      :باتری
@@ -300,6 +300,8 @@ STR_SORT_BY_RANGE                                               :بازه
 STR_SORT_BY_POPULATION                                          :جمعیت
 STR_SORT_BY_RATING                                              :نرخ
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}وقفه موقت بازی
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}بالا بردن سرعت بازی
@@ -1338,9 +1340,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED                        :مجاز
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :آزاد و با نمایه دلخواه
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :محل قرارگرفتن درخت‌ها: {STRING}
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :هیچکدام{RED}(سبب تعطیلی صنعت چوب والوار می‌شود)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :فقط در جنگلهای بارانی
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :همه جا
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :محل نوار ابزار اصلی: {STRING}
 STR_CONFIG_SETTING_STATUSBAR_POS                                :محل نوار وضعیت: {STRING}
@@ -1588,9 +1587,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}تغیی
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}چندنفره
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}تبلیغ دار
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :خیر
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :بله
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}نام بازیگر:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}این نامی است که بقیه بازیگران شما را به آن نام می شناسند
 
@@ -1631,8 +1627,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}الحا
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}تازه سازی سرویس دهنده
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}تازه سازی اطلاعات سرویس دهنده
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}جستجوی سرویس دهنده
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}جستجو در شبکه برای سرویس دهنده
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}اضافه کردن سرویس دهنده
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}اضافه کردن یک سرویس دهنده به لیست که هربار برای بازی در حال اجرا آزمایش می گردد
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}اجرای سرویس دهنده
@@ -1649,6 +1643,7 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}بازی
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}ثبت رمز
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}اگر بازی برای استفاده همگان نیست، بازی خود را با رمز محافظت کنید
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}تبلیغ دار
 STR_NETWORK_START_SERVER_UNADVERTISED                           :خیر
 STR_NETWORK_START_SERVER_ADVERTISED                             :بله
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} سرویس گیرنده

src/lang/unfinished/urdu.txt

@@ -49,9 +49,9 @@ STR_CARGO_PLURAL_WHEAT                                          :گندم
 STR_CARGO_PLURAL_RUBBER                                         :ربڑ
 STR_CARGO_PLURAL_SUGAR                                          :چینی
 STR_CARGO_PLURAL_TOYS                                           :کھلونے
-STR_CARGO_PLURAL_CANDY                                          :مٹھایاں
+STR_CARGO_PLURAL_SWEETS                                         :مٹھایاں
 STR_CARGO_PLURAL_COLA                                           :کوئلہ
-STR_CARGO_PLURAL_COTTON_CANDY                                   :کینڈی فلاس
+STR_CARGO_PLURAL_CANDYFLOSS                                     :کینڈی فلاس
 STR_CARGO_PLURAL_BUBBLES                                        :بلبلے
 STR_CARGO_PLURAL_TOFFEE                                         :ٹافی
 STR_CARGO_PLURAL_BATTERIES                                      :بیٹریاں
@@ -83,9 +83,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :گندم
 STR_CARGO_SINGULAR_RUBBER                                       :ربڑ
 STR_CARGO_SINGULAR_SUGAR                                        :چینی
 STR_CARGO_SINGULAR_TOY                                          :کھلونا
-STR_CARGO_SINGULAR_CANDY                                        :مٹھائی
+STR_CARGO_SINGULAR_SWEETS                                       :مٹھائی
 STR_CARGO_SINGULAR_COLA                                         :کولا
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :کینڈی فلاس
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :کینڈی فلاس
 STR_CARGO_SINGULAR_BUBBLE                                       :بلبلہ
 STR_CARGO_SINGULAR_TOFFEE                                       :ٹافی
 STR_CARGO_SINGULAR_BATTERY                                      :بیٹری
@@ -298,6 +298,8 @@ STR_SORT_BY_CARGO_CAPACITY                                      :سامان کی
 STR_SORT_BY_RANGE                                               :پہنچ
 STR_SORT_BY_POPULATION                                          :آبادی
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK} کھیل میں وقفھ لیجیئے
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK} کھیل کو تیزی سے بڑھایئں
@@ -1265,9 +1267,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED                        :اجازت ہے
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :اپنی مرضی کے شہر کے پھیلاو کی اجازت ہے
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :کھیل میں درخت لگانے کی اجازت: {STRING}
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :کوئی نہیں {RED}(لکڑ مل ٹوٹ گئی)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :صرف بارش کے جنگلوں میں
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :ہر جگہ
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :بنیادی ٹول بار کی جگہ: {STRING}
 STR_CONFIG_SETTING_STATUSBAR_POS                                :حالات کی پٹی: {STRING}
@@ -1524,8 +1523,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}کھیل
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}سرور کو تازہ کریں
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}سرور کی معلومات کو تازہ کریں
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}سرور ڈھونڈیں
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}سرور کے لئے نیٹ ورک تلاش کریں
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}سرور شامل کریں
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}سرور کو اس فہرست میں شامل کریں جو ہمیشہ کھیل شروع کرنے کے لئے پرکھی جاتی ہے
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}سرور شروع کریں

src/lang/vietnamese.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Bột mì
 STR_CARGO_PLURAL_RUBBER                                         :Cao su
 STR_CARGO_PLURAL_SUGAR                                          :Đường
 STR_CARGO_PLURAL_TOYS                                           :Đồ chơi
-STR_CARGO_PLURAL_CANDY                                          :Kẹo
+STR_CARGO_PLURAL_SWEETS                                         :Kẹo
 STR_CARGO_PLURAL_COLA                                           :Nước cola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Kẹo bông
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Kẹo bông
 STR_CARGO_PLURAL_BUBBLES                                        :Bong bóng
 STR_CARGO_PLURAL_TOFFEE                                         :Kẹo bơ cứng
 STR_CARGO_PLURAL_BATTERIES                                      :Pin
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Bột mì
 STR_CARGO_SINGULAR_RUBBER                                       :Cao su
 STR_CARGO_SINGULAR_SUGAR                                        :Đường
 STR_CARGO_SINGULAR_TOY                                          :Đồ chơi
-STR_CARGO_SINGULAR_CANDY                                        :Kẹo
+STR_CARGO_SINGULAR_SWEETS                                       :Kẹo
 STR_CARGO_SINGULAR_COLA                                         :Nước cola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Kẹo bông
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Kẹo bông
 STR_CARGO_SINGULAR_BUBBLE                                       :Bong bóng
 STR_CARGO_SINGULAR_TOFFEE                                       :Kẹo bơ cứng
 STR_CARGO_SINGULAR_BATTERY                                      :Pin
@@ -315,6 +315,8 @@ STR_SORT_BY_RANGE                                               :Tầm xa
 STR_SORT_BY_POPULATION                                          :Dân số
 STR_SORT_BY_RATING                                              :Đánh giá
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Tạm dừng trò chơi
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Tua nhanh trò chơi
@@ -1553,6 +1555,8 @@ STR_CONFIG_SETTING_ENDING_YEAR                                  :Năm kết thú
 STR_CONFIG_SETTING_ENDING_YEAR_HELPTEXT                         :Năm mà ván chơi sẽ kết thúc và tính điểm. Khi năm đó kết thúc, điểm số của công ty sẽ được lưu lại và hiển thị bảng điểm chơi cao nhất, sau đó người chơi vẫn có thể tiếp tục ván chơi.{} Nếu năm được đặt nhỏ hơn năm bắt đầu, bảng điểm chơi cao nhất sẽ không bao giờ được hiển thị.
 STR_CONFIG_SETTING_ENDING_YEAR_VALUE                            :{NUM}
 STR_CONFIG_SETTING_ENDING_YEAR_ZERO                             :Không bao giờ
+STR_CONFIG_SETTING_ECONOMY_TYPE_ORIGINAL                        :Nguyên gốc
+STR_CONFIG_SETTING_ECONOMY_TYPE_FROZEN                          :Đóng băng
 STR_CONFIG_SETTING_ALLOW_SHARES                                 :Cho phép mua cổ phần của các công ty khác: {STRING}
 STR_CONFIG_SETTING_ALLOW_SHARES_HELPTEXT                        :Nếu bật, cho phép mua và bán cổ phần công ty. Cổ phần chỉ có thể mua bán nếu công ty đã tồn tại một thời gian nhất định nào đó
 STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES                         :Tuổi công ty tối thiểu để bán cổ phần: {STRING}
@@ -1604,9 +1608,6 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Tuyến tính
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Trồng cây trong trò chơi: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Điều khiển sự xuất hiện tự dộng của cây cối khi đang chơi. Điều này có thể ảnh hưởng đến những nhà máy dựa vào cây cối, ví dự như nhà máy chế biến gỗgỗ
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :không có {RED}(nhà máy chế biến gỗ bị ngưng)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Chỉ trong rừng nhiệt đới
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Mọi nơi
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Vị trí của thanh công cụ chính: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Vị trí nằm ngang của thanh công cụ chính ở phía trên màn hình
@@ -1928,10 +1929,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Thay đ
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Ván Chơi Mạng
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Đã quảng bá
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Lựa chọn ván chơi quảng bá (ra ngoài internet) và không quảng bá (Local Area Network, LAN)
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Không
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Có
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Tên người chơi:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Đây là tên khác mà người chơi sẽ nhận ra bạn
 
@@ -1972,8 +1969,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Vào gam
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Refresh server
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Refresh thông tin server
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Tìm server
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Tìm server trong mạng
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Thêm server
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Thêm server vào danh sách luôn được chọn khi chạy game.
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Tạo server
@@ -1990,6 +1985,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Tên c
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Đặt mật khẩu
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Bảo vệ game của bạn bằng mật khẩu nếu bạn không muốn người khác vào tùy tiện
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Đã quảng bá
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Lựa chọn ván chơi quảng bá (ra ngoài internet) và không quảng bá (Local Area Network, LAN)
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Không
 STR_NETWORK_START_SERVER_ADVERTISED                             :Có
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} máy trạm
@@ -5033,6 +5030,7 @@ STR_FORMAT_BUOY_NAME                                            :Phao {TOWN}
 STR_FORMAT_BUOY_NAME_SERIAL                                     :Phao {TOWN} số #{COMMA}
 STR_FORMAT_COMPANY_NUM                                          :(Công ty {COMMA})
 STR_FORMAT_GROUP_NAME                                           :Nhóm {COMMA}
+STR_FORMAT_GROUP_VEHICLE_NAME                                   :{GROUP} #{COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} {0:TOWN}
 STR_FORMAT_WAYPOINT_NAME                                        :Điểm mốc {TOWN}
 STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Điểm mốc {TOWN} số #{COMMA}

src/lang/welsh.txt

@@ -48,9 +48,9 @@ STR_CARGO_PLURAL_WHEAT                                          :Gwenith
 STR_CARGO_PLURAL_RUBBER                                         :Rwber
 STR_CARGO_PLURAL_SUGAR                                          :Siwgr
 STR_CARGO_PLURAL_TOYS                                           :Teganau
-STR_CARGO_PLURAL_CANDY                                          :Melysion
+STR_CARGO_PLURAL_SWEETS                                         :Melysion
 STR_CARGO_PLURAL_COLA                                           :Cola
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Candifflos
+STR_CARGO_PLURAL_CANDYFLOSS                                     :Candifflos
 STR_CARGO_PLURAL_BUBBLES                                        :Swigod
 STR_CARGO_PLURAL_TOFFEE                                         :Toffi
 STR_CARGO_PLURAL_BATTERIES                                      :Baterïau
@@ -82,9 +82,9 @@ STR_CARGO_SINGULAR_WHEAT                                        :Gwenith
 STR_CARGO_SINGULAR_RUBBER                                       :Rwber
 STR_CARGO_SINGULAR_SUGAR                                        :Siwgr
 STR_CARGO_SINGULAR_TOY                                          :Tegan
-STR_CARGO_SINGULAR_CANDY                                        :Melysyn
+STR_CARGO_SINGULAR_SWEETS                                       :Melysyn
 STR_CARGO_SINGULAR_COLA                                         :Cola
-STR_CARGO_SINGULAR_COTTON_CANDY                                 :Candifflos
+STR_CARGO_SINGULAR_CANDYFLOSS                                   :Candifflos
 STR_CARGO_SINGULAR_BUBBLE                                       :Swigen
 STR_CARGO_SINGULAR_TOFFEE                                       :Toffi
 STR_CARGO_SINGULAR_BATTERY                                      :Batri
@@ -310,6 +310,8 @@ STR_SORT_BY_RANGE                                               :Maes teithio
 STR_SORT_BY_POPULATION                                          :Poblogaeth
 STR_SORT_BY_RATING                                              :Gradd
 
+# Group by options for vehicle list
+
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Oedi'r gêm
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Cyflymu'r gêm
@@ -1557,9 +1559,6 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :Caniatáu, cynl
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Gosod coed mewn gêm: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Rheoli ymddangosiad coed ar hap yn ystod y gêm. Gall hyn effeithio ar ddiwydiannau sy'n ddibynnol ar dyfiant coed, megis melinau coed
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE                    :Dim {RED}(yn torri'r felin goed)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :Mewn glawgoedwigoedd yn unig
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :Pob man
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :Safle'r prif far offer: {STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT                         :Lleoliad llorweddol y brif bar offer ar frig y sgrin
@@ -1881,10 +1880,6 @@ STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Newid te
 
 # Network server list
 STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Amlchwaraewr
-STR_NETWORK_SERVER_LIST_ADVERTISED                              :{BLACK}Hysbys
-STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP                      :{BLACK}Dewis rhwyd gêm a hysbysebir (rhyngrwyd) neu un anhysbys (rhwydwaith leol)
-STR_NETWORK_SERVER_LIST_ADVERTISED_NO                           :Na
-STR_NETWORK_SERVER_LIST_ADVERTISED_YES                          :Ia
 STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Enw chwaraewr:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Byddwch chi'n ymddangos i'r chwaraewyr eraill dan yr enw hwn
 
@@ -1925,8 +1920,6 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Ymuno â
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Adnewyddu'r gweinydd
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Adnewyddu'r wybodaeth am y gweinydd
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Canfod gweinydd
-STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Chwilio'r rhwydwaith am weinydd
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Ychwanegu gweinydd
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Ychwanegu gweinydd i'r rhestr a gaiff ei wirio bob tro am gemau sy'n rhedeg
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Dechrau gweinydd
@@ -1943,6 +1936,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Bydd y g
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Gosod cyfrinair
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Diogelwch eich gêm â chyfrinair os nad ydych am i fynediad ato fod yn gyhoeddus
 
+STR_NETWORK_START_SERVER_ADVERTISED_LABEL                       :{BLACK}Hysbys
+STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP                     :{BLACK}Dewis rhwyd gêm a hysbysebir (rhyngrwyd) neu un anhysbys (rhwydwaith leol)
 STR_NETWORK_START_SERVER_UNADVERTISED                           :Na
 STR_NETWORK_START_SERVER_ADVERTISED                             :Ia
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} gwestai

src/linkgraph/linkgraphjob.cpp

@@ -49,7 +49,7 @@ LinkGraphJob::LinkGraphJob(const LinkGraph &orig, uint duration_multiplier) :
 		join_date_ticks(GetLinkGraphJobJoinDateTicks(duration_multiplier)),
 		start_date_ticks((_date * DAY_TICKS) + _date_fract),
 		job_completed(false),
-		abort_job(false)
+		job_aborted(false)
 {
 }
 
@@ -95,6 +95,11 @@ void LinkGraphJob::FinaliseJob()
 {
 	this->JoinThread();
 
+	/* If the job has been aborted, the job state is invalid.
+	 * This should never be reached, as once the job has been marked as aborted
+	 * the only valid job operation is to clear the LinkGraphJob pool. */
+	assert(!this->IsJobAborted());
+
 	/* Link graph has been merged into another one. */
 	if (!LinkGraph::IsValidID(this->link_graph.index)) return;
 
@@ -175,55 +180,6 @@ void LinkGraphJob::FinaliseJob()
 	}
 }
 
-/**
- * Check if job has actually finished.
- * This is allowed to spuriously return an incorrect value.
- * @return True if job has actually finished.
- */
-bool LinkGraphJob::IsJobCompleted() const
-{
-#if defined(__GNUC__) || defined(__clang__)
-	return __atomic_load_n(&job_completed, __ATOMIC_RELAXED);
-#else
-	return job_completed;
-#endif
-}
-
-/**
- * Check if job has been requested to be aborted.
- * This is allowed to spuriously return a falsely negative value.
- * @return True if job abort has been requested.
- */
-bool LinkGraphJob::IsJobAborted() const
-{
-#if defined(__GNUC__) || defined(__clang__)
-	return __atomic_load_n(&abort_job, __ATOMIC_RELAXED);
-#else
-	return abort_job;
-#endif
-}
-
-/**
- * Abort job.
- * The job may exit early at the next available opportunity.
- * After this method has been called the state of the job is undefined, and the only valid operation
- * is to join the thread and discard the job data.
- */
-void LinkGraphJob::AbortJob()
-{
-	/*
-	 * Note that this it not guaranteed to be an atomic write and there are no memory barriers or other protections.
-	 * Readers of this variable in another thread may see an out of date value.
-	 * However this is OK as if this method is called the state of the job/thread does not matter anyway.
-	 */
-
-#if defined(__GNUC__) || defined(__clang__)
-	__atomic_store_n(&(abort_job), true, __ATOMIC_RELAXED);
-#else
-	abort_job = true;
-#endif
-}
-
 /**
  * Initialize the link graph job: Resize nodes and edges and populate them.
  * This is done after the constructor so that we can do it in the calculation

src/linkgraph/linkgraphjob.h

@@ -15,6 +15,7 @@
 #include "linkgraph.h"
 #include <vector>
 #include <memory>
+#include <atomic>
 
 class LinkGraphJob;
 class Path;
@@ -68,8 +69,8 @@ protected:
 	DateTicks start_date_ticks;       ///< Date when the job was started.
 	NodeAnnotationVector nodes;       ///< Extra node data necessary for link graph calculation.
 	EdgeAnnotationMatrix edges;       ///< Extra edge data necessary for link graph calculation.
-	bool job_completed;               ///< Is the job still running. This is accessed by multiple threads and is permitted to be spuriously incorrect.
-	bool abort_job;                   ///< Abort the job at the next available opportunity. This is accessed by multiple threads.
+	std::atomic<bool> job_completed;  ///< Is the job still running. This is accessed by multiple threads and reads may be stale.
+	std::atomic<bool> job_aborted;    ///< Has the job been aborted. This is accessed by multiple threads and reads may be stale.
 
 	void EraseFlows(NodeID from);
 	void JoinThread();
@@ -79,8 +80,6 @@ public:
 
 	DynUniformArenaAllocator path_allocator; ///< Arena allocator used for paths
 
-	bool IsJobAborted() const;
-
 	/**
 	 * A job edge. Wraps a link graph edge and an edge annotation. The
 	 * annotation can be modified, the edge is constant.
@@ -293,7 +292,7 @@ public:
 	 * settings have to be brutally const-casted in order to populate them.
 	 */
 	LinkGraphJob() : settings(_settings_game.linkgraph),
-			join_date_ticks(INVALID_DATE), start_date_ticks(INVALID_DATE), job_completed(false), abort_job(false) {}
+			join_date_ticks(INVALID_DATE), start_date_ticks(INVALID_DATE), job_completed(false), job_aborted(false) {}
 
 	LinkGraphJob(const LinkGraph &orig, uint duration_multiplier);
 	~LinkGraphJob();
@@ -301,15 +300,34 @@ public:
 	void Init();
 	void FinaliseJob();
 
-	bool IsJobCompleted() const;
-	void AbortJob();
+	/**
+	 * Check if job has actually finished.
+	 * This is allowed to spuriously return an incorrect value.
+	 * @return True if job has actually finished.
+	 */
+	inline bool IsJobCompleted() const { return this->job_completed.load(std::memory_order_acquire); }
+
+	/**
+	 * Check if job has been aborted.
+	 * This is allowed to spuriously return false incorrectly, but is not allowed to incorrectly return true.
+	 * @return True if job has been aborted.
+	 */
+	inline bool IsJobAborted() const { return this->job_aborted.load(std::memory_order_acquire); }
+
+	/**
+	 * Abort job.
+	 * The job may exit early at the next available opportunity.
+	 * After this method has been called the state of the job is undefined, and the only valid operation
+	 * is to join the thread and discard the job data.
+	 */
+	inline void AbortJob() { this->job_aborted.store(true, std::memory_order_release); }
 
 	/**
 	 * Check if job is supposed to be finished.
 	 * @param tick_offset Optional number of ticks to add to the current date
 	 * @return True if job should be finished by now, false if not.
 	 */
-	inline bool IsFinished(int tick_offset = 0) const { return this->join_date_ticks <= (_date * DAY_TICKS) + _date_fract + tick_offset; }
+	inline bool IsScheduledToBeJoined(int tick_offset = 0) const { return this->join_date_ticks <= (_date * DAY_TICKS) + _date_fract + tick_offset; }
 
 	/**
 	 * Get the date when the job should be finished.

src/linkgraph/linkgraphschedule.cpp

@@ -115,7 +115,7 @@ void LinkGraphSchedule::SpawnNext()
 bool LinkGraphSchedule::IsJoinWithUnfinishedJobDue() const
 {
 	for (JobList::const_iterator it = this->running.begin(); it != this->running.end(); ++it) {
-		if (!((*it)->IsFinished(2))) {
+		if (!((*it)->IsScheduledToBeJoined(2))) {
 			/* job is not due to be joined yet */
 			return false;
 		}
@@ -133,7 +133,7 @@ bool LinkGraphSchedule::IsJoinWithUnfinishedJobDue() const
 void LinkGraphSchedule::JoinNext()
 {
 	while (!(this->running.empty())) {
-		if (!this->running.front()->IsFinished()) return;
+		if (!this->running.front()->IsScheduledToBeJoined()) return;
 		std::unique_ptr<LinkGraphJob> next = std::move(this->running.front());
 		this->running.pop_front();
 		LinkGraphID id = next->LinkGraphIndex();
@@ -160,19 +160,16 @@ void LinkGraphSchedule::JoinNext()
 	}
 
 	/*
-	 * Note that this it not guaranteed to be an atomic write and there are no memory barriers or other protections.
 	 * Readers of this variable in another thread may see an out of date value.
-	 * However this is OK as this will only happen just as a job is completing, and the real synchronisation is provided
-	 * by the thread join operation. In the worst case the main thread will be paused for longer than strictly necessary before
-	 * joining.
-	 * This is just a hint variable to avoid performing the join excessively early and blocking the main thread.
+	 * However this is OK as this will only happen just as a job is completing,
+	 * and the real synchronisation is provided by the thread join operation.
+	 * In the worst case the main thread will be paused for longer than
+	 * strictly necessary before joining.
+	 * This is just a hint variable to avoid performing the join excessively
+	 * early and blocking the main thread.
 	 */
 
-#if defined(__GNUC__) || defined(__clang__)
-	__atomic_store_n(&(job->job_completed), true, __ATOMIC_RELAXED);
-#else
-	job->job_completed = true;
-#endif
+	job->job_completed.store(true, std::memory_order_release);
 }
 
 /**
@@ -310,9 +307,11 @@ LinkGraphJobGroup::JobInfo::JobInfo(LinkGraphJob *job) :
 		job(job), cost_estimate(job->Graph().CalculateCostEstimate()) { }
 
 /**
- * Pause the game if on the next _date_fract tick, we would do a join with the next
+ * Pause the game if in 2 _date_fract ticks, we would do a join with the next
  * link graph job, but it is still running.
- * If we previous paused, unpause if the job is now ready to be joined with
+ * The check is done 2 _date_fract ticks early instead of 1, as in multiplayer
+ * calls to DoCommandP are executed after a delay of 1 _date_fract tick.
+ * If we previously paused, unpause if the job is now ready to be joined with.
  */
 void StateGameLoop_LinkGraphPauseControl()
 {
@@ -339,8 +338,9 @@ void StateGameLoop_LinkGraphPauseControl()
 }
 
 /**
- * Pause the game on load if we would do a join with the next link graph job, but it is still running, and it would not
- * be caught by a call to StateGameLoop_LinkGraphPauseControl().
+ * Pause the game on load if we would do a join with the next link graph job,
+ * but it is still running, and it would not be caught by a call to
+ * StateGameLoop_LinkGraphPauseControl().
  */
 void AfterLoad_LinkGraphPauseControl()
 {

src/linkgraph/linkgraphschedule.h

@@ -107,4 +107,7 @@ public:
 	static void ExecuteJobSet(std::vector<JobInfo> jobs);
 };
 
+void StateGameLoop_LinkGraphPauseControl();
+void AfterLoad_LinkGraphPauseControl();
+
 #endif /* LINKGRAPHSCHEDULE_H */

src/network/network_gui.cpp

@@ -57,15 +57,6 @@ static const StringID _connection_types_dropdown[] = {
 	INVALID_STRING_ID
 };
 
-/**
- * Advertisement options in the server list
- */
-static const StringID _lan_internet_types_dropdown[] = {
-	STR_NETWORK_SERVER_LIST_ADVERTISED_NO,
-	STR_NETWORK_SERVER_LIST_ADVERTISED_YES,
-	INVALID_STRING_ID
-};
-
 static std::vector<StringID> _language_dropdown;
 
 void SortNetworkLanguages()
@@ -518,27 +509,12 @@ public:
 		this->last_sorting = this->servers.GetListing();
 	}
 
-	void SetStringParameters(int widget) const override
-	{
-		switch (widget) {
-			case WID_NG_CONN_BTN:
-				SetDParam(0, _lan_internet_types_dropdown[_settings_client.network.lan_internet]);
-				break;
-		}
-	}
-
 	void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override
 	{
 		switch (widget) {
-			case WID_NG_CONN_BTN:
-				*size = maxdim(*size, maxdim(GetStringBoundingBox(_lan_internet_types_dropdown[0]), GetStringBoundingBox(_lan_internet_types_dropdown[1])));
-				size->width += padding.width;
-				size->height += padding.height;
-				break;
-
 			case WID_NG_MATRIX:
 				resize->height = WD_MATRIX_TOP + max(GetSpriteSize(SPR_BLOT).height, (uint)FONT_HEIGHT_NORMAL) + WD_MATRIX_BOTTOM;
-				size->height = 10 * resize->height;
+				size->height = 12 * resize->height;
 				break;
 
 			case WID_NG_LASTJOINED:
@@ -575,10 +551,6 @@ public:
 				SetDParamMaxValue(0, 5);
 				*size = maxdim(*size, GetStringBoundingBox(STR_JUST_INT));
 				break;
-
-			case WID_NG_DETAILS_SPACER:
-				size->height = 20 + 12 * FONT_HEIGHT_NORMAL;
-				break;
 		}
 	}
 
@@ -642,7 +614,8 @@ public:
 		this->GetWidget<NWidgetStacked>(WID_NG_NEWGRF_MISSING_SEL)->SetDisplayedPlane(sel == nullptr || !sel->online || sel->info.grfconfig == nullptr || !sel->info.version_compatible || sel->info.compatible);
 
 #ifdef __EMSCRIPTEN__
-		this->SetWidgetDisabledState(WID_NG_FIND, true);
+		this->SetWidgetDisabledState(WID_NG_SEARCH_INTERNET, true);
+		this->SetWidgetDisabledState(WID_NG_SEARCH_LAN, true);
 		this->SetWidgetDisabledState(WID_NG_ADD, true);
 		this->SetWidgetDisabledState(WID_NG_START, true);
 #endif
@@ -730,10 +703,6 @@ public:
 				DeleteWindowById(WC_NETWORK_WINDOW, WN_NETWORK_WINDOW_GAME);
 				break;
 
-			case WID_NG_CONN_BTN: // 'Connection' droplist
-				ShowDropDownMenu(this, _lan_internet_types_dropdown, _settings_client.network.lan_internet, WID_NG_CONN_BTN, 0, 0); // do it for widget WID_NSS_CONN_BTN
-				break;
-
 			case WID_NG_NAME:    // Sort by name
 			case WID_NG_CLIENTS: // Sort by connected clients
 			case WID_NG_MAPSIZE: // Sort by map size
@@ -778,11 +747,12 @@ public:
 				break;
 			}
 
-			case WID_NG_FIND: // Find server automatically
-				switch (_settings_client.network.lan_internet) {
-					case 0: NetworkUDPSearchGame(); break;
-					case 1: NetworkUDPQueryMasterServer(); break;
-				}
+			case WID_NG_SEARCH_INTERNET:
+				NetworkUDPQueryMasterServer();
+				break;
+
+			case WID_NG_SEARCH_LAN:
+				NetworkUDPSearchGame();
 				break;
 
 			case WID_NG_ADD: // Add a server
@@ -820,20 +790,6 @@ public:
 		}
 	}
 
-	void OnDropdownSelect(int widget, int index) override
-	{
-		switch (widget) {
-			case WID_NG_CONN_BTN:
-				_settings_client.network.lan_internet = index;
-				break;
-
-			default:
-				NOT_REACHED();
-		}
-
-		this->SetDirty();
-	}
-
 	/**
 	 * Some data on this window has become invalid.
 	 * @param data Information about the changed data.
@@ -979,12 +935,6 @@ static const NWidgetPart _nested_network_game_widgets[] = {
 			NWidget(NWID_HORIZONTAL), SetPIP(10, 7, 10),
 				/* LEFT SIDE */
 				NWidget(NWID_VERTICAL), SetPIP(0, 7, 0),
-					NWidget(NWID_HORIZONTAL), SetPIP(0, 7, 0),
-						NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, WID_NG_CONNECTION), SetDataTip(STR_NETWORK_SERVER_LIST_ADVERTISED, STR_NULL),
-						NWidget(WWT_DROPDOWN, COLOUR_LIGHT_BLUE, WID_NG_CONN_BTN),
-											SetDataTip(STR_BLACK_STRING, STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP),
-						NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
-					EndContainer(),
 					NWidget(NWID_HORIZONTAL), SetPIP(0, 7, 0),
 						NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, WID_NG_FILTER_LABEL), SetDataTip(STR_LIST_FILTER_TITLE, STR_NULL),
 						NWidget(WWT_EDITBOX, COLOUR_LIGHT_BLUE, WID_NG_FILTER), SetMinimalSize(251, 12), SetFill(1, 0), SetResize(1, 0),
@@ -1044,7 +994,8 @@ static const NWidgetPart _nested_network_game_widgets[] = {
 			NWidget(NWID_HORIZONTAL),
 				NWidget(NWID_VERTICAL),
 					NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(10, 7, 4),
-						NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_FIND), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_NETWORK_SERVER_LIST_FIND_SERVER, STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP),
+						NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_SEARCH_INTERNET), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET, STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET_TOOLTIP),
+						NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_SEARCH_LAN), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN, STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN_TOOLTIP),
 						NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_ADD), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_NETWORK_SERVER_LIST_ADD_SERVER, STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP),
 						NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_START), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_NETWORK_SERVER_LIST_START_SERVER, STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP),
 						NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_CANCEL), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_BUTTON_CANCEL, STR_NULL),
@@ -1312,8 +1263,8 @@ static const NWidgetPart _nested_network_start_server_window_widgets[] = {
 
 			NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(10, 6, 10),
 				NWidget(NWID_VERTICAL), SetPIP(0, 1, 0),
-					NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, WID_NSS_CONNTYPE_LABEL), SetFill(1, 0), SetDataTip(STR_NETWORK_SERVER_LIST_ADVERTISED, STR_NULL),
-					NWidget(WWT_DROPDOWN, COLOUR_LIGHT_BLUE, WID_NSS_CONNTYPE_BTN), SetFill(1, 0), SetDataTip(STR_BLACK_STRING, STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP),
+					NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, WID_NSS_CONNTYPE_LABEL), SetFill(1, 0), SetDataTip(STR_NETWORK_START_SERVER_ADVERTISED_LABEL, STR_NULL),
+					NWidget(WWT_DROPDOWN, COLOUR_LIGHT_BLUE, WID_NSS_CONNTYPE_BTN), SetFill(1, 0), SetDataTip(STR_BLACK_STRING, STR_NETWORK_START_SERVER_ADVERTISED_TOOLTIP),
 				EndContainer(),
 				NWidget(NWID_VERTICAL), SetPIP(0, 1, 0),
 					NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, WID_NSS_LANGUAGE_LABEL), SetFill(1, 0), SetDataTip(STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN, STR_NULL),

src/newgrf_roadtype.cpp

@@ -45,7 +45,7 @@
 			const Town *t = nullptr;
 			if (IsRoadDepotTile(this->tile)) {
 				t = Depot::GetByTile(this->tile)->town;
-			} else if (IsTileType(this->tile, MP_ROAD)) {
+			} else {
 				t = ClosestTownFromTile(this->tile, UINT_MAX);
 			}
 			return t != nullptr ? GetTownRadiusGroup(t, this->tile) : HZB_TOWN_EDGE;

src/openttd.cpp

@@ -1787,7 +1787,6 @@ CommandCost CmdDesyncCheck(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 void StateGameLoop()
 {
 	if (!_networking || _network_server) {
-		extern void StateGameLoop_LinkGraphPauseControl();
 		StateGameLoop_LinkGraphPauseControl();
 	}
 

src/saveload/afterload.cpp

@@ -3691,6 +3691,14 @@ bool AfterLoadGame()
 		}
 	}
 
+	/* Make sure all industries exclusive supplier/consumer set correctly. */
+	if (IsSavegameVersionBefore(SLV_GS_INDUSTRY_CONTROL)) {
+		for (Industry *i : Industry::Iterate()) {
+			i->exclusive_supplier = INVALID_OWNER;
+			i->exclusive_consumer = INVALID_OWNER;
+		}
+	}
+
 	/* Compute station catchment areas. This is needed here in case UpdateStationAcceptance is called below. */
 	Station::RecomputeCatchmentForAll();
 

src/saveload/linkgraph_sl.cpp

@@ -11,6 +11,7 @@
 #include "../linkgraph/linkgraph.h"
 #include "../linkgraph/linkgraphjob.h"
 #include "../linkgraph/linkgraphschedule.h"
+#include "../network/network.h"
 #include "../settings_internal.h"
 #include "saveload.h"
 
@@ -286,6 +287,10 @@ void AfterLoadLinkGraphs()
 	}
 
 	LinkGraphSchedule::instance.SpawnAll();
+
+	if (!_networking || _network_server) {
+		AfterLoad_LinkGraphPauseControl();
+	}
 }
 
 /**

src/script/api/script_controller.cpp

@@ -77,9 +77,9 @@ ScriptController::ScriptController(CompanyID company) :
 
 ScriptController::~ScriptController()
 {
-	for (LoadedLibraryList::iterator iter = this->loaded_library.begin(); iter != this->loaded_library.end(); iter++) {
-		free((*iter).second);
-		free((*iter).first);
+	for (const auto &item : this->loaded_library) {
+		free(item.second);
+		free(item.first);
 	}
 
 	this->loaded_library.clear();
@@ -116,11 +116,6 @@ ScriptController::~ScriptController()
 	Squirrel *engine = ScriptObject::GetActiveInstance()->engine;
 	HSQUIRRELVM vm = engine->GetVM();
 
-	/* Internally we store libraries as 'library.version' */
-	char library_name[1024];
-	seprintf(library_name, lastof(library_name), "%s.%d", library, version);
-	strtolower(library_name);
-
 	ScriptInfo *lib = ScriptObject::GetActiveInstance()->FindLibrary(library, version);
 	if (lib == nullptr) {
 		char error[1024];
@@ -128,15 +123,20 @@ ScriptController::~ScriptController()
 		throw sq_throwerror(vm, error);
 	}
 
+	/* Internally we store libraries as 'library.version' */
+	char library_name[1024];
+	seprintf(library_name, lastof(library_name), "%s.%d", library, version);
+	strtolower(library_name);
+
 	/* Get the current table/class we belong to */
 	HSQOBJECT parent;
 	sq_getstackobj(vm, 1, &parent);
 
 	char fake_class[1024];
 
-	LoadedLibraryList::iterator iter = controller->loaded_library.find(library_name);
-	if (iter != controller->loaded_library.end()) {
-		strecpy(fake_class, (*iter).second, lastof(fake_class));
+	LoadedLibraryList::iterator it = controller->loaded_library.find(library_name);
+	if (it != controller->loaded_library.end()) {
+		strecpy(fake_class, (*it).second, lastof(fake_class));
 	} else {
 		int next_number = ++controller->loaded_library_count;
 

src/script/api/script_controller.hpp

@@ -23,7 +23,6 @@
  *  script that matches to the specified version as close as possible. It tries
  *  (from first to last, stopping as soon as the attempt succeeds)
  *
- *  - load the exact same version of the same script,
  *  - load the latest version of the same script that supports loading data from
  *    the saved version (the version of saved data must be equal or greater
  *    than ScriptInfo::MinVersionToLoad),

src/script/script_config.cpp

@@ -32,9 +32,9 @@ void ScriptConfig::Change(const char *name, int version, bool force_exact_match,
 	if (_game_mode == GM_NORMAL && this->info != nullptr) {
 		/* If we're in an existing game and the Script is changed, set all settings
 		 *  for the Script that have the random flag to a random value. */
-		for (ScriptConfigItemList::const_iterator it = this->info->GetConfigList()->begin(); it != this->info->GetConfigList()->end(); it++) {
-			if ((*it).flags & SCRIPTCONFIG_RANDOM) {
-				this->SetSetting((*it).name, InteractiveRandomRange((*it).max_value + 1 - (*it).min_value) + (*it).min_value);
+		for (const auto &item : *this->info->GetConfigList()) {
+			if (item.flags & SCRIPTCONFIG_RANDOM) {
+				this->SetSetting(item.name, InteractiveRandomRange(item.max_value + 1 - item.min_value) + item.min_value);
 			}
 		}
 		this->AddRandomDeviation();
@@ -49,8 +49,8 @@ ScriptConfig::ScriptConfig(const ScriptConfig *config)
 	this->config_list = nullptr;
 	this->is_random = config->is_random;
 
-	for (SettingValueList::const_iterator it = config->settings.begin(); it != config->settings.end(); it++) {
-		this->settings[stredup((*it).first)] = (*it).second;
+	for (const auto &item : config->settings) {
+		this->settings[stredup(item.first)] = item.second;
 	}
 	this->AddRandomDeviation();
 }
@@ -79,24 +79,24 @@ const ScriptConfigItemList *ScriptConfig::GetConfigList()
 
 void ScriptConfig::ClearConfigList()
 {
-	for (SettingValueList::iterator it = this->settings.begin(); it != this->settings.end(); it++) {
-		free((*it).first);
+	for (const auto &item : this->settings) {
+		free(item.first);
 	}
 	this->settings.clear();
 }
 
 void ScriptConfig::AnchorUnchangeableSettings()
 {
-	for (ScriptConfigItemList::const_iterator it = this->GetConfigList()->begin(); it != this->GetConfigList()->end(); it++) {
-		if (((*it).flags & SCRIPTCONFIG_INGAME) == 0) {
-			this->SetSetting((*it).name, this->GetSetting((*it).name));
+	for (const auto &item : *this->GetConfigList()) {
+		if ((item.flags & SCRIPTCONFIG_INGAME) == 0) {
+			this->SetSetting(item.name, this->GetSetting(item.name));
 		}
 	}
 }
 
 int ScriptConfig::GetSetting(const char *name) const
 {
-	SettingValueList::const_iterator it = this->settings.find(name);
+	const auto it = this->settings.find(name);
 	if (it == this->settings.end()) return this->info->GetSettingDefaultValue(name);
 	return (*it).second;
 }
@@ -111,7 +111,7 @@ void ScriptConfig::SetSetting(const char *name, int value)
 
 	value = Clamp(value, config_item->min_value, config_item->max_value);
 
-	SettingValueList::iterator it = this->settings.find(name);
+	const auto it = this->settings.find(name);
 	if (it != this->settings.end()) {
 		(*it).second = value;
 	} else {
@@ -121,17 +121,17 @@ void ScriptConfig::SetSetting(const char *name, int value)
 
 void ScriptConfig::ResetSettings()
 {
-	for (SettingValueList::iterator it = this->settings.begin(); it != this->settings.end(); it++) {
-		free((*it).first);
+	for (const auto &item : this->settings) {
+		free(item.first);
 	}
 	this->settings.clear();
 }
 
 void ScriptConfig::AddRandomDeviation()
 {
-	for (ScriptConfigItemList::const_iterator it = this->GetConfigList()->begin(); it != this->GetConfigList()->end(); it++) {
-		if ((*it).random_deviation != 0) {
-			this->SetSetting((*it).name, InteractiveRandomRange((*it).random_deviation * 2 + 1) - (*it).random_deviation + this->GetSetting((*it).name));
+	for (const auto &item : *this->GetConfigList()) {
+		if (item.random_deviation != 0) {
+			this->SetSetting(item.name, InteractiveRandomRange(item.random_deviation * 2 + 1) - item.random_deviation + this->GetSetting(item.name));
 		}
 	}
 }
@@ -186,16 +186,16 @@ void ScriptConfig::SettingsToString(char *string, const char *last) const
 {
 	char *s = string;
 	*s = '\0';
-	for (SettingValueList::const_iterator it = this->settings.begin(); it != this->settings.end(); it++) {
+	for (const auto &item : this->settings) {
 		char no[10];
-		seprintf(no, lastof(no), "%d", (*it).second);
+		seprintf(no, lastof(no), "%d", item.second);
 
 		/* Check if the string would fit in the destination */
-		size_t needed_size = strlen((*it).first) + 1 + strlen(no);
+		size_t needed_size = strlen(item.first) + 1 + strlen(no);
 		/* If it doesn't fit, skip the next settings */
 		if (string + needed_size > last) break;
 
-		s = strecat(s, (*it).first, last);
+		s = strecat(s, item.first, last);
 		s = strecat(s, "=", last);
 		s = strecat(s, no, last);
 		s = strecat(s, ",", last);

src/script/script_info.cpp

@@ -20,14 +20,14 @@
 ScriptInfo::~ScriptInfo()
 {
 	/* Free all allocated strings */
-	for (ScriptConfigItemList::iterator it = this->config_list.begin(); it != this->config_list.end(); it++) {
-		free((*it).name);
-		free((*it).description);
-		if (it->labels != nullptr) {
-			for (auto &lbl_map : *(*it).labels) {
+	for (const auto &item : this->config_list) {
+		free(item.name);
+		free(item.description);
+		if (item.labels != nullptr) {
+			for (auto &lbl_map : *item.labels) {
 				free(lbl_map.second);
 			}
-			delete it->labels;
+			delete item.labels;
 		}
 	}
 	this->config_list.clear();
@@ -232,8 +232,8 @@ SQInteger ScriptInfo::AddLabels(HSQUIRRELVM vm)
 	ValidateString(setting_name);
 
 	ScriptConfigItem *config = nullptr;
-	for (ScriptConfigItemList::iterator it = this->config_list.begin(); it != this->config_list.end(); it++) {
-		if (strcmp((*it).name, setting_name) == 0) config = &(*it);
+	for (auto &item : this->config_list) {
+		if (strcmp(item.name, setting_name) == 0) config = &item;
 	}
 
 	if (config == nullptr) {
@@ -284,22 +284,22 @@ const ScriptConfigItemList *ScriptInfo::GetConfigList() const
 
 const ScriptConfigItem *ScriptInfo::GetConfigItem(const char *name) const
 {
-	for (ScriptConfigItemList::const_iterator it = this->config_list.begin(); it != this->config_list.end(); it++) {
-		if (strcmp((*it).name, name) == 0) return &(*it);
+	for (const auto &item : this->config_list) {
+		if (strcmp(item.name, name) == 0) return &item;
 	}
 	return nullptr;
 }
 
 int ScriptInfo::GetSettingDefaultValue(const char *name) const
 {
-	for (ScriptConfigItemList::const_iterator it = this->config_list.begin(); it != this->config_list.end(); it++) {
-		if (strcmp((*it).name, name) != 0) continue;
+	for (const auto &item : this->config_list) {
+		if (strcmp(item.name, name) != 0) continue;
 		/* The default value depends on the difficulty level */
 		switch (GetGameSettings().script.settings_profile) {
-			case SP_EASY:   return (*it).easy_value;
-			case SP_MEDIUM: return (*it).medium_value;
-			case SP_HARD:   return (*it).hard_value;
-			case SP_CUSTOM: return (*it).custom_value;
+			case SP_EASY:   return item.easy_value;
+			case SP_MEDIUM: return item.medium_value;
+			case SP_HARD:   return item.hard_value;
+			case SP_CUSTOM: return item.custom_value;
 			default: NOT_REACHED();
 		}
 	}

src/script/script_scanner.cpp

@@ -103,14 +103,12 @@ void ScriptScanner::RescanDir()
 
 void ScriptScanner::Reset()
 {
-	ScriptInfoList::iterator it = this->info_list.begin();
-	for (; it != this->info_list.end(); it++) {
-		free((*it).first);
-		delete (*it).second;
+	for (const auto &item : this->info_list) {
+		free(item.first);
+		delete item.second;
 	}
-	it = this->info_single_list.begin();
-	for (; it != this->info_single_list.end(); it++) {
-		free((*it).first);
+	for (const auto &item : this->info_single_list) {
+		free(item.first);
 	}
 
 	this->info_list.clear();
@@ -171,9 +169,8 @@ char *ScriptScanner::GetConsoleList(char *p, const char *last, bool newest_only)
 {
 	p += seprintf(p, last, "List of %s:\n", this->GetScannerName());
 	const ScriptInfoList &list = newest_only ? this->info_single_list : this->info_list;
-	ScriptInfoList::const_iterator it = list.begin();
-	for (; it != list.end(); it++) {
-		ScriptInfo *i = (*it).second;
+	for (const auto &item : list) {
+		ScriptInfo *i = item.second;
 		p += seprintf(p, last, "%10s (v%d): %s\n", i->GetName(), i->GetVersion(), i->GetDescription());
 	}
 	p += seprintf(p, last, "\n");
@@ -273,16 +270,16 @@ static bool IsSameScript(const ContentInfo *ci, bool md5sum, ScriptInfo *info, S
 
 bool ScriptScanner::HasScript(const ContentInfo *ci, bool md5sum)
 {
-	for (ScriptInfoList::iterator it = this->info_list.begin(); it != this->info_list.end(); it++) {
-		if (IsSameScript(ci, md5sum, (*it).second, this->GetDirectory())) return true;
+	for (const auto &item : this->info_list) {
+		if (IsSameScript(ci, md5sum, item.second, this->GetDirectory())) return true;
 	}
 	return false;
 }
 
 const char *ScriptScanner::FindMainScript(const ContentInfo *ci, bool md5sum)
 {
-	for (ScriptInfoList::iterator it = this->info_list.begin(); it != this->info_list.end(); it++) {
-		if (IsSameScript(ci, md5sum, (*it).second, this->GetDirectory())) return (*it).second->GetMainScript();
+	for (const auto &item : this->info_list) {
+		if (IsSameScript(ci, md5sum, item.second, this->GetDirectory())) return item.second->GetMainScript();
 	}
 	return nullptr;
 }

src/settings_type.h

@@ -317,7 +317,6 @@ struct NetworkSettings {
 	char   admin_password[NETWORK_PASSWORD_LENGTH];       ///< password for the admin network
 	char   settings_password[NETWORK_PASSWORD_LENGTH];    ///< password for game settings (server side)
 	bool   server_advertise;                              ///< advertise the server to the masterserver
-	uint8  lan_internet;                                  ///< search on the LAN or internet for servers
 	char   client_name[NETWORK_CLIENT_NAME_LENGTH];       ///< name of the player (as client)
 	char   default_company_pass[NETWORK_PASSWORD_LENGTH]; ///< default password for new companies in encrypted form
 	char   connect_to_ip[NETWORK_HOSTNAME_LENGTH];        ///< default for the "Add server" query

src/station_gui.cpp

@@ -796,14 +796,14 @@ static const NWidgetPart _nested_station_view_widgets[] = {
 		NWidget(WWT_DEFSIZEBOX, COLOUR_GREY),
 		NWidget(WWT_STICKYBOX, COLOUR_GREY),
 	EndContainer(),
-	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_SORT_ORDER), SetMinimalSize(81, 12), SetFill(1, 1), SetDataTip(STR_BUTTON_SORT_BY, STR_TOOLTIP_SORT_ORDER),
-		NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_SV_SORT_BY), SetMinimalSize(168, 12), SetResize(1, 0), SetFill(0, 1), SetDataTip(0x0, STR_TOOLTIP_SORT_CRITERIA),
-	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_SV_GROUP), SetMinimalSize(81, 12), SetFill(1, 1), SetDataTip(STR_STATION_VIEW_GROUP, 0x0),
 		NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_SV_GROUP_BY), SetMinimalSize(168, 12), SetResize(1, 0), SetFill(0, 1), SetDataTip(0x0, STR_TOOLTIP_GROUP_ORDER),
 	EndContainer(),
+	NWidget(NWID_HORIZONTAL),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_SORT_ORDER), SetMinimalSize(81, 12), SetFill(1, 1), SetDataTip(STR_BUTTON_SORT_BY, STR_TOOLTIP_SORT_ORDER),
+		NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_SV_SORT_BY), SetMinimalSize(168, 12), SetResize(1, 0), SetFill(0, 1), SetDataTip(0x0, STR_TOOLTIP_SORT_CRITERIA),
+	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_PANEL, COLOUR_GREY, WID_SV_WAITING), SetMinimalSize(237, 44), SetResize(1, 10), SetScrollbar(WID_SV_SCROLLBAR), EndContainer(),
 		NWidget(NWID_VSCROLLBAR, COLOUR_GREY, WID_SV_SCROLLBAR),

src/table/cargo_const.h

@@ -7,157 +7,91 @@
 
 /** @file cargo_const.h Table of all default cargo types */
 
-/** Construction macro for a #CargoSpec structure. */
-#define MK(bt, label, c, e, f, g, h, fr, te, ks1, ks2, ks3, ks4, ks5, l, m, cmult) \
-		{bt, label, c, c, e, cmult, f, {g, h}, fr, te, 0, 0, ks1, ks2, ks3, ks4, ks5, l, m, nullptr, nullptr, 0}
+/** Construction macros for the #CargoSpec StringID entries. */
+#define MK_STR_CARGO_PLURAL(label_plural) STR_CARGO_PLURAL_ ## label_plural
+#define MK_STR_CARGO_SINGULAR(label_singular) STR_CARGO_SINGULAR_ ## label_singular
+#define MK_STR_QUANTITY(label_plural) STR_QUANTITY_ ## label_plural
+#define MK_STR_ABBREV(label_plural) STR_ABBREV_ ## label_plural
+/** Construction macros for the #CargoSpec SpriteID entry. */
+#define MK_SPRITE(label_plural) SPR_CARGO_ ## label_plural
+
+/**
+ * Construction macro for a #CargoSpec structure.
+ * The order of arguments matches the order in which they are defined in #CargoSpec.
+ * Some macros are used to automatically expand to the correct StringID consts, this
+ * means that adding/changing a cargo spec requires updating of the following strings:
+ * - STR_CARGO_PLURAL_<str_plural>
+ * - STR_CARGO_SINGULAR_<str_singular>
+ * - STR_QUANTITY_<str_plural>
+ * - STR_ABBREV_<str_plural>
+ * And the following sprite:
+ * - SPR_CARGO_<str_plural>
+ *
+ * @param bt           Cargo bit number, is #INVALID_CARGO for a non-used spec.
+ * @param label        Unique label of the cargo type.
+ * @param colour       CargoSpec->legend_colour and CargoSpec->rating_colour.
+ * @param weight       Weight of a single unit of this cargo type in 1/16 ton (62.5 kg).
+ * @param mult         Capacity multiplier for vehicles. (8 fractional bits).
+ * @param ip           CargoSpec->initial_payment.
+ * @param td1          CargoSpec->transit_days[0].
+ * @param td2          CargoSpec->transit_days[1].
+ * @param freight      Cargo type is considered to be freight (affects train freight multiplier).
+ * @param te           The effect that delivering this cargo type has on towns. Also affects destination of subsidies.
+ * @param str_plural   The name suffix used to populate CargoSpec->name, CargoSpec->quantifier,
+ *                     CargoSpec->abbrev and CargoSpec->sprite. See above for more detailed information.
+ * @param str_singular The name suffix used to populate CargoSpec->name_single. See above for more information.
+ * @param str_volume   Name of a single unit of cargo of this type.
+ * @param classes      Classes of this cargo type. @see CargoClass
+ */
+#define MK(bt, label, colour, weight, mult, ip, td1, td2, freight, te, str_plural, str_singular, str_volume, classes) \
+		{bt, label, colour, colour, weight, mult, ip, {td1, td2}, freight, te, 0, 0, \
+		MK_STR_CARGO_PLURAL(str_plural), MK_STR_CARGO_SINGULAR(str_singular), str_volume, MK_STR_QUANTITY(str_plural), MK_STR_ABBREV(str_plural), \
+		MK_SPRITE(str_plural), classes, nullptr, nullptr, 0}
+
 /** Cargo types available by default. */
 static const CargoSpec _default_cargo[] = {
-	MK(  0, 'PASS', 152,  1, 3185,  0,  24, false, TE_PASSENGERS,
-		STR_CARGO_PLURAL_PASSENGERS,     STR_CARGO_SINGULAR_PASSENGER,      STR_PASSENGERS, STR_QUANTITY_PASSENGERS,   STR_ABBREV_PASSENGERS,
-		SPR_CARGO_PASSENGER,     CC_PASSENGERS,                    0x400),
-
-	MK(  1, 'COAL',   6, 16, 5916,  7, 255, true,  TE_NONE,
-		STR_CARGO_PLURAL_COAL,           STR_CARGO_SINGULAR_COAL,           STR_TONS,       STR_QUANTITY_COAL,         STR_ABBREV_COAL,
-		SPR_CARGO_COAL,          CC_BULK,                          0x100),
-
-	MK(  2, 'MAIL',  15,  4, 4550, 20,  90, false, TE_MAIL,
-		STR_CARGO_PLURAL_MAIL,           STR_CARGO_SINGULAR_MAIL,           STR_BAGS,       STR_QUANTITY_MAIL,         STR_ABBREV_MAIL,
-		SPR_CARGO_MAIL,          CC_MAIL,                          0x200),
-
+	MK(   0, 'PASS', 152,  1, 0x400, 3185,  0,  24, false, TE_PASSENGERS,   PASSENGERS,    PASSENGER, STR_PASSENGERS, CC_PASSENGERS),
+	MK(   1, 'COAL',   6, 16, 0x100, 5916,  7, 255,  true,       TE_NONE,         COAL,         COAL,       STR_TONS, CC_BULK),
+	MK(   2, 'MAIL',  15,  4, 0x200, 4550, 20,  90, false,       TE_MAIL,         MAIL,         MAIL,       STR_BAGS, CC_MAIL),
 	/* Oil in temperate and arctic */
-	MK(  3, 'OIL_', 174, 16, 4437, 25, 255, true,  TE_NONE,
-		STR_CARGO_PLURAL_OIL,            STR_CARGO_SINGULAR_OIL,            STR_LITERS,     STR_QUANTITY_OIL,          STR_ABBREV_OIL,
-		SPR_CARGO_OIL,           CC_LIQUID,                        0x100),
-
+	MK(   3, 'OIL_', 174, 16, 0x100, 4437, 25, 255,  true,       TE_NONE,          OIL,          OIL,     STR_LITERS, CC_LIQUID),
 	/* Oil in subtropic */
-	MK(  3, 'OIL_', 174, 16, 4892, 25, 255, true,  TE_NONE,
-		STR_CARGO_PLURAL_OIL,            STR_CARGO_SINGULAR_OIL,            STR_LITERS,     STR_QUANTITY_OIL,          STR_ABBREV_OIL,
-		SPR_CARGO_OIL,           CC_LIQUID,                        0x100),
-
-	MK(  4, 'LVST', 208,  3, 4322,  4,  18, true,  TE_NONE,
-		STR_CARGO_PLURAL_LIVESTOCK,      STR_CARGO_SINGULAR_LIVESTOCK,      STR_ITEMS,      STR_QUANTITY_LIVESTOCK,    STR_ABBREV_LIVESTOCK,
-		SPR_CARGO_LIVESTOCK,     CC_PIECE_GOODS,                   0x100),
-
-	MK(  5, 'GOOD', 194,  8, 6144,  5,  28, true,  TE_GOODS,
-		STR_CARGO_PLURAL_GOODS,          STR_CARGO_SINGULAR_GOODS,          STR_CRATES,     STR_QUANTITY_GOODS,        STR_ABBREV_GOODS,
-		SPR_CARGO_GOODS,         CC_EXPRESS,                       0x200),
-
-	MK(  6, 'GRAI', 191, 16, 4778,  4,  40, true,  TE_NONE,
-		STR_CARGO_PLURAL_GRAIN,          STR_CARGO_SINGULAR_GRAIN,          STR_TONS,       STR_QUANTITY_GRAIN,        STR_ABBREV_GRAIN,
-		SPR_CARGO_GRAIN,         CC_BULK,                          0x100),
-
-	MK(  6, 'WHEA', 191, 16, 4778,  4,  40, true,  TE_NONE,
-		STR_CARGO_PLURAL_WHEAT,          STR_CARGO_SINGULAR_WHEAT,          STR_TONS,       STR_QUANTITY_WHEAT,        STR_ABBREV_WHEAT,
-		SPR_CARGO_GRAIN,         CC_BULK,                          0x100),
-
-	MK(  6, 'MAIZ', 191, 16, 4322,  4,  40, true,  TE_NONE,
-		STR_CARGO_PLURAL_MAIZE,          STR_CARGO_SINGULAR_MAIZE,          STR_TONS,       STR_QUANTITY_MAIZE,        STR_ABBREV_MAIZE,
-		SPR_CARGO_GRAIN,         CC_BULK,                          0x100),
-
+	MK(   3, 'OIL_', 174, 16, 0x100, 4892, 25, 255,  true,       TE_NONE,          OIL,          OIL,     STR_LITERS, CC_LIQUID),
+	MK(   4, 'LVST', 208,  3, 0x100, 4322,  4,  18,  true,       TE_NONE,    LIVESTOCK,    LIVESTOCK,      STR_ITEMS, CC_PIECE_GOODS),
+	MK(   5, 'GOOD', 194,  8, 0x200, 6144,  5,  28,  true,      TE_GOODS,        GOODS,        GOODS,     STR_CRATES, CC_EXPRESS),
+	MK(   6, 'GRAI', 191, 16, 0x100, 4778,  4,  40,  true,       TE_NONE,        GRAIN,        GRAIN,       STR_TONS, CC_BULK),
+	MK(   6, 'WHEA', 191, 16, 0x100, 4778,  4,  40,  true,       TE_NONE,        WHEAT,        WHEAT,       STR_TONS, CC_BULK),
+	MK(   6, 'MAIZ', 191, 16, 0x100, 4322,  4,  40,  true,       TE_NONE,        MAIZE,        MAIZE,       STR_TONS, CC_BULK),
 	/* Wood in temperate and arctic */
-	MK(  7, 'WOOD',  84, 16, 5005, 15, 255, true,  TE_NONE,
-		STR_CARGO_PLURAL_WOOD,           STR_CARGO_SINGULAR_WOOD,           STR_TONS,       STR_QUANTITY_WOOD,         STR_ABBREV_WOOD,
-		SPR_CARGO_WOOD,          CC_PIECE_GOODS,                   0x100),
-
+	MK(   7, 'WOOD',  84, 16, 0x100, 5005, 15, 255,  true,       TE_NONE,         WOOD,         WOOD,       STR_TONS, CC_PIECE_GOODS),
 	/* Wood in subtropic */
-	MK(  7, 'WOOD',  84, 16, 7964, 15, 255, true,  TE_NONE,
-		STR_CARGO_PLURAL_WOOD,           STR_CARGO_SINGULAR_WOOD,           STR_TONS,       STR_QUANTITY_WOOD,         STR_ABBREV_WOOD,
-		SPR_CARGO_WOOD,          CC_PIECE_GOODS,                   0x100),
-
-	MK(  8, 'IORE', 184, 16, 5120,  9, 255, true,  TE_NONE,
-		STR_CARGO_PLURAL_IRON_ORE,       STR_CARGO_SINGULAR_IRON_ORE,       STR_TONS,       STR_QUANTITY_IRON_ORE,     STR_ABBREV_IRON_ORE,
-		SPR_CARGO_IRON_ORE,      CC_BULK,                          0x100),
-
-	MK(  9, 'STEL',  10, 16, 5688,  7, 255, true,  TE_NONE,
-		STR_CARGO_PLURAL_STEEL,          STR_CARGO_SINGULAR_STEEL,          STR_TONS,       STR_QUANTITY_STEEL,        STR_ABBREV_STEEL,
-		SPR_CARGO_STEEL,         CC_PIECE_GOODS,                   0x100),
-
-	MK( 10, 'VALU', 202,  2, 7509,  1,  32, true,  TE_NONE,
-		STR_CARGO_PLURAL_VALUABLES,      STR_CARGO_SINGULAR_VALUABLES,      STR_BAGS,       STR_QUANTITY_VALUABLES,    STR_ABBREV_VALUABLES,
-		SPR_CARGO_VALUES_GOLD,   CC_ARMOURED,                      0x100),
-
-	MK( 10, 'GOLD', 202,  8, 5802, 10,  40, true,  TE_NONE,
-		STR_CARGO_PLURAL_GOLD,           STR_CARGO_SINGULAR_GOLD,           STR_BAGS,       STR_QUANTITY_GOLD,         STR_ABBREV_GOLD,
-		SPR_CARGO_VALUES_GOLD,   CC_ARMOURED,                      0x100),
-
-	MK( 10, 'DIAM', 202,  2, 5802, 10, 255, true,  TE_NONE,
-		STR_CARGO_PLURAL_DIAMONDS,       STR_CARGO_SINGULAR_DIAMOND,        STR_BAGS,       STR_QUANTITY_DIAMONDS,     STR_ABBREV_DIAMONDS,
-		SPR_CARGO_DIAMONDS,      CC_ARMOURED,                      0x100),
-
-	MK( 11, 'PAPR',  10, 16, 5461,  7,  60, true,  TE_NONE,
-		STR_CARGO_PLURAL_PAPER,          STR_CARGO_SINGULAR_PAPER,          STR_TONS,       STR_QUANTITY_PAPER,        STR_ABBREV_PAPER,
-		SPR_CARGO_PAPER,         CC_PIECE_GOODS,                   0x100),
-
-	MK( 12, 'FOOD',  48, 16, 5688,  0,  30, true,  TE_FOOD,
-		STR_CARGO_PLURAL_FOOD,           STR_CARGO_SINGULAR_FOOD,           STR_TONS,       STR_QUANTITY_FOOD,         STR_ABBREV_FOOD,
-		SPR_CARGO_FOOD,          CC_EXPRESS     | CC_REFRIGERATED, 0x100),
-
-	MK( 13, 'FRUT', 208, 16, 4209,  0,  15, true,  TE_NONE,
-		STR_CARGO_PLURAL_FRUIT,          STR_CARGO_SINGULAR_FRUIT,          STR_TONS,       STR_QUANTITY_FRUIT,        STR_ABBREV_FRUIT,
-		SPR_CARGO_FRUIT,         CC_BULK        | CC_REFRIGERATED, 0x100),
-
-	MK( 14, 'CORE', 184, 16, 4892, 12, 255, true,  TE_NONE,
-		STR_CARGO_PLURAL_COPPER_ORE,     STR_CARGO_SINGULAR_COPPER_ORE,     STR_TONS,       STR_QUANTITY_COPPER_ORE,   STR_ABBREV_COPPER_ORE,
-		SPR_CARGO_COPPER_ORE,    CC_BULK,                          0x100),
-
-	MK( 15, 'WATR',  10, 16, 4664, 20,  80, true,  TE_WATER,
-		STR_CARGO_PLURAL_WATER,          STR_CARGO_SINGULAR_WATER,          STR_LITERS,     STR_QUANTITY_WATER,        STR_ABBREV_WATER,
-		SPR_CARGO_WATERCOLA,     CC_LIQUID,                        0x100),
-
-	MK( 16, 'RUBR',   6, 16, 4437,  2,  20, true,  TE_NONE,
-		STR_CARGO_PLURAL_RUBBER,         STR_CARGO_SINGULAR_RUBBER,         STR_LITERS,     STR_QUANTITY_RUBBER,       STR_ABBREV_RUBBER,
-		SPR_CARGO_RUBBER,        CC_LIQUID,                        0x100),
-
-	MK( 17, 'SUGR',   6, 16, 4437, 20, 255, true,  TE_NONE,
-		STR_CARGO_PLURAL_SUGAR,          STR_CARGO_SINGULAR_SUGAR,          STR_TONS,       STR_QUANTITY_SUGAR,        STR_ABBREV_SUGAR,
-		SPR_CARGO_SUGAR,         CC_BULK,                          0x100),
-
-	MK( 18, 'TOYS', 174,  2, 5574, 25, 255, true,  TE_NONE,
-		STR_CARGO_PLURAL_TOYS,           STR_CARGO_SINGULAR_TOY,            STR_ITEMS,      STR_QUANTITY_TOYS,         STR_ABBREV_TOYS,
-		SPR_CARGO_TOYS,          CC_PIECE_GOODS,                   0x100),
-
-	MK( 19, 'BATT', 208,  4, 4322,  2,  30, true,  TE_NONE,
-		STR_CARGO_PLURAL_BATTERIES,      STR_CARGO_SINGULAR_BATTERY,        STR_ITEMS,      STR_QUANTITY_BATTERIES,    STR_ABBREV_BATTERIES,
-		SPR_CARGO_BATTERIES,     CC_PIECE_GOODS,                   0x100),
-
-	MK( 20, 'SWET', 194,  5, 6144,  8,  40, true,  TE_GOODS,
-		STR_CARGO_PLURAL_CANDY,          STR_CARGO_SINGULAR_CANDY,          STR_BAGS,       STR_QUANTITY_SWEETS,       STR_ABBREV_SWEETS,
-		SPR_CARGO_CANDY,         CC_EXPRESS,                       0x200),
-
-	MK( 21, 'TOFF', 191, 16, 4778, 14,  60, true,  TE_NONE,
-		STR_CARGO_PLURAL_TOFFEE,         STR_CARGO_SINGULAR_TOFFEE,         STR_TONS,       STR_QUANTITY_TOFFEE,       STR_ABBREV_TOFFEE,
-		SPR_CARGO_TOFFEE,        CC_BULK,                          0x100),
-
-	MK( 22, 'COLA',  84, 16, 4892,  5,  75, true,  TE_NONE,
-		STR_CARGO_PLURAL_COLA,           STR_CARGO_SINGULAR_COLA,           STR_LITERS,     STR_QUANTITY_COLA,         STR_ABBREV_COLA,
-		SPR_CARGO_WATERCOLA,     CC_LIQUID,                        0x100),
-
-	MK( 23, 'CTCD', 184, 16, 5005, 10,  25, true,  TE_NONE,
-		STR_CARGO_PLURAL_COTTON_CANDY,   STR_CARGO_SINGULAR_COTTON_CANDY,   STR_TONS,       STR_QUANTITY_CANDYFLOSS,   STR_ABBREV_CANDYFLOSS,
-		SPR_CARGO_COTTONCANDY,   CC_BULK,                          0x100),
-
-	MK( 24, 'BUBL',  10,  1, 5077, 20,  80, true,  TE_NONE,
-		STR_CARGO_PLURAL_BUBBLES,        STR_CARGO_SINGULAR_BUBBLE,         STR_ITEMS,      STR_QUANTITY_BUBBLES,      STR_ABBREV_BUBBLES,
-		SPR_CARGO_BUBBLES,       CC_PIECE_GOODS,                   0x100),
-
-	MK( 25, 'PLST', 202, 16, 4664, 30, 255, true,  TE_NONE,
-		STR_CARGO_PLURAL_PLASTIC,        STR_CARGO_SINGULAR_PLASTIC,        STR_LITERS,     STR_QUANTITY_PLASTIC,      STR_ABBREV_PLASTIC,
-		SPR_CARGO_PLASTIC,       CC_LIQUID,                        0x100),
-
-	MK( 26, 'FZDR',  48,  2, 6250, 30,  50, true,  TE_FOOD,
-		STR_CARGO_PLURAL_FIZZY_DRINKS,   STR_CARGO_SINGULAR_FIZZY_DRINK,    STR_ITEMS,      STR_QUANTITY_FIZZY_DRINKS, STR_ABBREV_FIZZY_DRINKS,
-		SPR_CARGO_FIZZYDRINK,    CC_PIECE_GOODS,                   0x100),
+	MK(   7, 'WOOD',  84, 16, 0x100, 7964, 15, 255,  true,       TE_NONE,         WOOD,         WOOD,       STR_TONS, CC_PIECE_GOODS),
+	MK(   8, 'IORE', 184, 16, 0x100, 5120,  9, 255,  true,       TE_NONE,     IRON_ORE,     IRON_ORE,       STR_TONS, CC_BULK),
+	MK(   9, 'STEL',  10, 16, 0x100, 5688,  7, 255,  true,       TE_NONE,        STEEL,        STEEL,       STR_TONS, CC_PIECE_GOODS),
+	MK(  10, 'VALU', 202,  2, 0x100, 7509,  1,  32,  true,       TE_NONE,    VALUABLES,    VALUABLES,       STR_BAGS, CC_ARMOURED),
+	MK(  10, 'GOLD', 202,  8, 0x100, 5802, 10,  40,  true,       TE_NONE,         GOLD,         GOLD,       STR_BAGS, CC_ARMOURED),
+	MK(  10, 'DIAM', 202,  2, 0x100, 5802, 10, 255,  true,       TE_NONE,     DIAMONDS,      DIAMOND,       STR_BAGS, CC_ARMOURED),
+	MK(  11, 'PAPR',  10, 16, 0x100, 5461,  7,  60,  true,       TE_NONE,        PAPER,        PAPER,       STR_TONS, CC_PIECE_GOODS),
+	MK(  12, 'FOOD',  48, 16, 0x100, 5688,  0,  30,  true,       TE_FOOD,         FOOD,         FOOD,       STR_TONS, CC_EXPRESS | CC_REFRIGERATED),
+	MK(  13, 'FRUT', 208, 16, 0x100, 4209,  0,  15,  true,       TE_NONE,        FRUIT,        FRUIT,       STR_TONS, CC_BULK | CC_REFRIGERATED),
+	MK(  14, 'CORE', 184, 16, 0x100, 4892, 12, 255,  true,       TE_NONE,   COPPER_ORE,   COPPER_ORE,       STR_TONS, CC_BULK),
+	MK(  15, 'WATR',  10, 16, 0x100, 4664, 20,  80,  true,      TE_WATER,        WATER,        WATER,     STR_LITERS, CC_LIQUID),
+	MK(  16, 'RUBR',   6, 16, 0x100, 4437,  2,  20,  true,       TE_NONE,       RUBBER,       RUBBER,     STR_LITERS, CC_LIQUID),
+	MK(  17, 'SUGR',   6, 16, 0x100, 4437, 20, 255,  true,       TE_NONE,        SUGAR,        SUGAR,       STR_TONS, CC_BULK),
+	MK(  18, 'TOYS', 174,  2, 0x100, 5574, 25, 255,  true,       TE_NONE,         TOYS,          TOY,      STR_ITEMS, CC_PIECE_GOODS),
+	MK(  19, 'BATT', 208,  4, 0x100, 4322,  2,  30,  true,       TE_NONE,    BATTERIES,      BATTERY,      STR_ITEMS, CC_PIECE_GOODS),
+	MK(  20, 'SWET', 194,  5, 0x200, 6144,  8,  40,  true,      TE_GOODS,       SWEETS,       SWEETS,       STR_BAGS, CC_EXPRESS),
+	MK(  21, 'TOFF', 191, 16, 0x100, 4778, 14,  60,  true,       TE_NONE,       TOFFEE,       TOFFEE,       STR_TONS, CC_BULK),
+	MK(  22, 'COLA',  84, 16, 0x100, 4892,  5,  75,  true,       TE_NONE,         COLA,         COLA,     STR_LITERS, CC_LIQUID),
+	MK(  23, 'CTCD', 184, 16, 0x100, 5005, 10,  25,  true,       TE_NONE,   CANDYFLOSS,   CANDYFLOSS,       STR_TONS, CC_BULK),
+	MK(  24, 'BUBL',  10,  1, 0x100, 5077, 20,  80,  true,       TE_NONE,      BUBBLES,       BUBBLE,      STR_ITEMS, CC_PIECE_GOODS),
+	MK(  25, 'PLST', 202, 16, 0x100, 4664, 30, 255,  true,       TE_NONE,      PLASTIC,      PLASTIC,     STR_LITERS, CC_LIQUID),
+	MK(  26, 'FZDR',  48,  2, 0x100, 6250, 30,  50,  true,       TE_FOOD, FIZZY_DRINKS,  FIZZY_DRINK,      STR_ITEMS, CC_PIECE_GOODS),
 
 	/* Void slot in temperate */
-	MK( 0xFF,    0,   1,  0, 5688,  0,  30, true,  TE_NONE,
-		STR_CARGO_PLURAL_NOTHING,        STR_CARGO_SINGULAR_NOTHING,        STR_TONS,       STR_QUANTITY_NOTHING,      STR_ABBREV_NOTHING,
-		SPR_ASCII_SPACE,         CC_NOAVAILABLE,                   0x100),
-
+	MK(0xFF,      0,   1,  0, 0x100, 5688,  0,  30,  true,       TE_NONE,      NOTHING,      NOTHING,       STR_TONS, CC_NOAVAILABLE),
 	/* Void slot in arctic */
-	MK( 0xFF,    0, 184,  0, 5120,  9, 255, true,  TE_NONE,
-		STR_CARGO_PLURAL_NOTHING,        STR_CARGO_SINGULAR_NOTHING,        STR_TONS,       STR_QUANTITY_NOTHING,      STR_ABBREV_NOTHING,
-		SPR_ASCII_SPACE,         CC_NOAVAILABLE,                   0x100),
-
+	MK(0xFF,      0, 184,  0, 0x100, 5120,  9, 255,  true,       TE_NONE,      NOTHING,      NOTHING,       STR_TONS, CC_NOAVAILABLE),
 };
 
 

src/table/settings.ini

@@ -3596,10 +3596,10 @@ from     = SLV_132
 guiflags = SGF_MULTISTRING
 def      = 2
 min      = 0
-max      = 2
+max      = 3
 str      = STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT
 strhelp  = STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT
-strval   = STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NONE
+strval   = STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_SPREAD
 cat      = SC_BASIC
 
 ;; construction.tree_placement_drag_limit, construction.ingame_tree_line_height, construction.tree_growth_rate
@@ -5673,15 +5673,6 @@ flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
 def      = false
 
-[SDTC_VAR]
-var      = network.lan_internet
-type     = SLE_UINT8
-flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NETWORK_ONLY
-def      = 1
-min      = 0
-max      = 1
-
 [SDTC_STR]
 var      = network.client_name
 type     = SLE_STRB

src/table/sprites.h

@@ -1175,33 +1175,38 @@ static const SpriteID SPR_IT_TOY_FACTORY_ROBOT        = 4720;
 static const SpriteID SPR_IT_POWER_PLANT_TRANSFORMERS = 2054;
 
 /* small icons of cargo available in station waiting*/
-static const SpriteID SPR_CARGO_PASSENGER             = 4297;
+static const SpriteID SPR_CARGO_PASSENGERS            = 4297;
 static const SpriteID SPR_CARGO_COAL                  = 4298;
 static const SpriteID SPR_CARGO_MAIL                  = 4299;
 static const SpriteID SPR_CARGO_OIL                   = 4300;
 static const SpriteID SPR_CARGO_LIVESTOCK             = 4301;
 static const SpriteID SPR_CARGO_GOODS                 = 4302;
-static const SpriteID SPR_CARGO_GRAIN                 = 4303;
+static const SpriteID SPR_CARGO_GRAIN                 = 4303;  // shared sprite with SPR_CARGO_WHEAT, SPR_CARGO_MAIZE
+static const SpriteID SPR_CARGO_WHEAT                 = 4303;  // shared sprite with SPR_CARGO_GRAIN, SPR_CARGO_MAIZE
+static const SpriteID SPR_CARGO_MAIZE                 = 4303;  // shared sprite with SPR_CARGO_GRAIN, SPR_CARGO_WHEAT
 static const SpriteID SPR_CARGO_WOOD                  = 4304;
 static const SpriteID SPR_CARGO_IRON_ORE              = 4305;
 static const SpriteID SPR_CARGO_STEEL                 = 4306;
-static const SpriteID SPR_CARGO_VALUES_GOLD           = 4307;  // shared between temperate and arctic
+static const SpriteID SPR_CARGO_VALUABLES             = 4307;  // shared between temperate and arctic ( SPR_CARGO_GOLD )
+static const SpriteID SPR_CARGO_GOLD                  = 4307;  // shared between temperate and arctic ( SPR_CARGO_VALUABLES )
 static const SpriteID SPR_CARGO_FRUIT                 = 4308;
 static const SpriteID SPR_CARGO_COPPER_ORE            = 4309;
-static const SpriteID SPR_CARGO_WATERCOLA             = 4310;  // shared between desert and toyland
+static const SpriteID SPR_CARGO_WATER                 = 4310;  // shared between desert and toyland ( SPR_CARGO_COLA )
+static const SpriteID SPR_CARGO_COLA                  = 4310;  // shared between desert and toyland ( SPR_CARGO_WATER )
 static const SpriteID SPR_CARGO_DIAMONDS              = 4311;
 static const SpriteID SPR_CARGO_FOOD                  = 4312;
 static const SpriteID SPR_CARGO_PAPER                 = 4313;
 static const SpriteID SPR_CARGO_RUBBER                = 4314;
-static const SpriteID SPR_CARGO_CANDY                 = 4315;
+static const SpriteID SPR_CARGO_SWEETS                = 4315;
 static const SpriteID SPR_CARGO_SUGAR                 = 4316;
 static const SpriteID SPR_CARGO_TOYS                  = 4317;
-static const SpriteID SPR_CARGO_COTTONCANDY           = 4318;
-static const SpriteID SPR_CARGO_FIZZYDRINK            = 4319;
+static const SpriteID SPR_CARGO_CANDYFLOSS            = 4318;
+static const SpriteID SPR_CARGO_FIZZY_DRINKS          = 4319;
 static const SpriteID SPR_CARGO_TOFFEE                = 4320;
 static const SpriteID SPR_CARGO_BUBBLES               = 4321;
 static const SpriteID SPR_CARGO_PLASTIC               = 4322;
 static const SpriteID SPR_CARGO_BATTERIES             = 4323;
+static const SpriteID SPR_CARGO_NOTHING               = SPR_ASCII_SPACE; // Placeholder for void cargo slots.
 
 /* Effect vehicles */
 static const SpriteID SPR_BULLDOZER_NE = 1416;

src/town_cmd.cpp

@@ -1239,6 +1239,48 @@ static bool GrowTownWithRoad(const Town *t, TileIndex tile, RoadBits rcmd)
 	return false;
 }
 
+/**
+ * Checks if a town road can be continued on the other side of a bridge.
+ *
+ * @param end_tile The end tile of the bridge
+ * @param bridge_dir The direction of the bridge
+ * @return true if the road can be continued, else false
+ */
+static bool CanRoadContinueAfterBridge(const Town* t, const TileIndex end_tile, const DiagDirection bridge_dir)
+{
+	const int delta = TileOffsByDiagDir(bridge_dir); // +1 tile in the direction of the bridge
+	TileIndex next_tile = end_tile + delta; // The tile beyond the bridge
+	RoadBits rcmd = DiagDirToRoadBits(ReverseDiagDir(bridge_dir));
+	RoadType rt = GetTownRoadType(t);
+
+	/* Before we try anything, make sure the tile is on the map and not the void. */
+	if (!IsValidTile(next_tile)) return false;
+
+	/* If the next tile is a bridge or tunnel, allow if it's a road bridge/tunnel continuing in the same direction. */
+	if (IsTileType(next_tile, MP_TUNNELBRIDGE)) {
+		return GetTunnelBridgeTransportType(next_tile) == TRANSPORT_ROAD && GetTunnelBridgeDirection(next_tile) == bridge_dir;
+	}
+
+	/* If the next tile is a station, allow if it's a road station facing the proper direction. Otherwise return false. */
+	if (IsTileType(next_tile, MP_STATION)) {
+		/* If the next tile is a road station, allow if it's facing the same direction, otherwise disallow. */
+		return IsRoadStop(next_tile) && GetRoadStopDir(next_tile) == ReverseDiagDir(bridge_dir);
+	}
+
+	/* If the next tile is a road depot, allow if it's facing the new bridge. */
+	if (IsTileType(next_tile, MP_ROAD)) {
+		return IsRoadDepot(next_tile) && GetRoadDepotDirection(next_tile) == ReverseDiagDir(bridge_dir);
+	}
+
+	/* If the next tile is a railroad track, check if towns are allowed to build level crossings.
+	 * If level crossing are not allowed, reject the bridge. Else allow DoCommand to determine if the rail track is buildable. */
+	if (IsTileType(next_tile, MP_RAILWAY) && !_settings_game.economy.allow_town_level_crossings) return false;
+
+	/* If a road tile can be built, the bridge is allowed.
+	 * If not, the bridge is rejected. */
+	return DoCommand(next_tile, rcmd | (rt << 4), t->index, DC_AUTO | DC_NO_WATER, CMD_BUILD_ROAD).Succeeded();
+}
+
 /**
  * Grows the town with a bridge.
  *  At first we check if a bridge is reasonable.
@@ -1288,12 +1330,15 @@ static bool GrowTownWithBridge(const Town *t, const TileIndex tile, const DiagDi
 		} while (IsValidTile(bridge_tile) && (IsWaterTile(bridge_tile) || IsPlainRailTile(bridge_tile) || (IsNormalRoadTile(bridge_tile) && GetDisallowedRoadDirections(bridge_tile) != DRD_NONE)));
 	}
 
-	/* no water tiles in between? */
+	/* Don't allow a bridge where the start and end tiles are adjacent with no span between. */
 	if (bridge_length == 1) return false;
 
 	if (!MayTownModifyRoad(bridge_tile)) return false;
 	if (IsValidTile(bridge_tile + delta) && !MayTownModifyRoad(bridge_tile + delta)) return false;
 
+	/* Make sure the road can be continued past the bridge. At this point, bridge_tile holds the end tile of the bridge. */
+	if (!CanRoadContinueAfterBridge(t, bridge_tile, bridge_dir)) return false;
+
 	std::bitset <MAX_BRIDGES> tried;
 	uint n = MAX_BRIDGES;
 	byte bridge_type = RandomRange (n);
@@ -1325,7 +1370,6 @@ static bool GrowTownWithBridge(const Town *t, const TileIndex tile, const DiagDi
 	return false;
 }
 
-
 /**
  * Checks whether at least one surrounding roads allows to build a house here
  *

src/tracerestrict_gui.cpp

@@ -3222,7 +3222,8 @@ public:
 
 		this->vscroll = this->GetScrollbar(WID_TRSL_LIST_VEHICLE_SCROLLBAR);
 		this->slot_sb = this->GetScrollbar(WID_TRSL_LIST_SLOTS_SCROLLBAR);
-		this->sorting = &_sorting.train;
+		this->sorting = &_sorting[GB_NONE].train;
+		this->grouping = GB_NONE;
 
 		this->vli.index = ALL_TRAINS_TRACE_RESTRICT_SLOT_ID;
 		this->slot_sel = INVALID_TRACE_RESTRICT_SLOT_ID;
@@ -3230,9 +3231,9 @@ public:
 		this->slot_set_max_occupancy = false;
 		this->slot_over = INVALID_TRACE_RESTRICT_SLOT_ID;
 
-		this->vehicles.SetListing(*this->sorting);
-		this->vehicles.ForceRebuild();
-		this->vehicles.NeedResort();
+		this->vehgroups.SetListing(*this->sorting);
+		this->vehgroups.ForceRebuild();
+		this->vehgroups.NeedResort();
 
 		this->BuildVehicleList();
 		this->SortVehicleList();
@@ -3247,7 +3248,7 @@ public:
 
 	~TraceRestrictSlotWindow()
 	{
-		*this->sorting = this->vehicles.GetListing();
+		*this->sorting = this->vehgroups.GetListing();
 	}
 
 	virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override
@@ -3301,10 +3302,10 @@ public:
 	{
 		if (data == 0) {
 			/* This needs to be done in command-scope to enforce rebuilding before resorting invalid data */
-			this->vehicles.ForceRebuild();
+			this->vehgroups.ForceRebuild();
 			this->slots.ForceRebuild();
 		} else {
-			this->vehicles.ForceResort();
+			this->vehgroups.ForceResort();
 			this->slots.ForceResort();
 		}
 
@@ -3343,7 +3344,7 @@ public:
 		this->BuildSlotList(this->owner);
 
 		this->slot_sb->SetCount(this->slots.size());
-		this->vscroll->SetCount(this->vehicles.size());
+		this->vscroll->SetCount(this->vehgroups.size());
 
 		/* Disable the slot specific function when we select all vehicles */
 		this->SetWidgetsDisabledState(this->vli.index == ALL_TRAINS_TRACE_RESTRICT_SLOT_ID || _local_company != this->vli.company,
@@ -3363,7 +3364,7 @@ public:
 				WIDGET_LIST_END);
 
 		/* Set text of sort by dropdown */
-		this->GetWidget<NWidgetCore>(WID_TRSL_SORT_BY_DROPDOWN)->widget_data = this->vehicle_sorter_names[this->vehicles.SortType()];
+		this->GetWidget<NWidgetCore>(WID_TRSL_SORT_BY_DROPDOWN)->widget_data = this->vehicle_group_none_sorter_names[this->vehgroups.SortType()];
 
 		this->GetWidget<NWidgetCore>(WID_TRSL_FILTER_BY_CARGO)->widget_data = this->cargo_filter_texts[this->cargo_filter_criteria];
 
@@ -3393,7 +3394,7 @@ public:
 			}
 
 			case WID_TRSL_SORT_BY_ORDER:
-				this->DrawSortButtonState(WID_TRSL_SORT_BY_ORDER, this->vehicles.IsDescSortOrder() ? SBS_DOWN : SBS_UP);
+				this->DrawSortButtonState(WID_TRSL_SORT_BY_ORDER, this->vehgroups.IsDescSortOrder() ? SBS_DOWN : SBS_UP);
 				break;
 
 			case WID_TRSL_LIST_VEHICLE:
@@ -3415,12 +3416,12 @@ public:
 	{
 		switch (widget) {
 			case WID_TRSL_SORT_BY_ORDER: // Flip sorting method ascending/descending
-				this->vehicles.ToggleSortOrder();
+				this->vehgroups.ToggleSortOrder();
 				this->SetDirty();
 				break;
 
 			case WID_TRSL_SORT_BY_DROPDOWN: // Select sorting criteria dropdown menu
-				ShowDropDownMenu(this, this->vehicle_sorter_names, this->vehicles.SortType(),  WID_TRSL_SORT_BY_DROPDOWN, 0, 0);
+				ShowDropDownMenu(this, this->vehicle_group_none_sorter_names, this->vehgroups.SortType(),  WID_TRSL_SORT_BY_DROPDOWN, 0, 0);
 				return;
 
 			case WID_TRSL_FILTER_BY_CARGO: // Cargo filter dropdown
@@ -3431,7 +3432,7 @@ public:
 				if (this->vli.index != ALL_TRAINS_TRACE_RESTRICT_SLOT_ID) {
 					this->vli.index = ALL_TRAINS_TRACE_RESTRICT_SLOT_ID;
 					this->slot_sel = INVALID_TRACE_RESTRICT_SLOT_ID;
-					this->vehicles.ForceRebuild();
+					this->vehgroups.ForceRebuild();
 					this->SetDirty();
 				}
 				break;
@@ -3442,14 +3443,14 @@ public:
 
 				this->slot_sel = this->vli.index = this->slots[id_s]->index;
 
-				this->vehicles.ForceRebuild();
+				this->vehgroups.ForceRebuild();
 				this->SetDirty();
 				break;
 			}
 
 			case WID_TRSL_LIST_VEHICLE: { // Matrix Vehicle
 				uint id_v = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_TRSL_LIST_VEHICLE);
-				if (id_v >= this->vehicles.size()) return; // click out of list bound
+				if (id_v >= this->vehgroups.size()) return; // click out of list bound
 
 				const Vehicle *v = this->vehicles[id_v];
 				if (VehicleClicked(v)) break;
@@ -3523,7 +3524,7 @@ public:
 				this->SetDirty();
 
 				uint id_v = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_TRSL_LIST_VEHICLE);
-				if (id_v >= this->vehicles.size()) return; // click out of list bound
+				if (id_v >= this->vehgroups.size()) return; // click out of list bound
 
 				const Vehicle *v = this->vehicles[id_v];
 				if (!VehicleClicked(v) && vindex == v->index) {
@@ -3565,7 +3566,7 @@ public:
 	{
 		switch (widget) {
 			case WID_TRSL_SORT_BY_DROPDOWN:
-				this->vehicles.SetSortType(index);
+				this->vehgroups.SetSortType(index);
 				break;
 
 			case WID_TRSL_FILTER_BY_CARGO: // Select a cargo filter criteria
@@ -3580,7 +3581,7 @@ public:
 
 	virtual void OnGameTick() override
 	{
-		if (this->slots.NeedResort() || this->vehicles.NeedResort()) {
+		if (this->slots.NeedResort() || this->vehgroups.NeedResort()) {
 			this->SetDirty();
 		}
 	}

src/tree_cmd.cpp

@@ -42,9 +42,10 @@ enum TreePlacer {
 
 /** Where to place trees while in-game? */
 enum ExtraTreePlacement {
-	ETP_NONE,       ///< Place trees on no tiles
-	ETP_RAINFOREST, ///< Place trees only on rainforest tiles
-	ETP_ALL,        ///< Place trees on all tiles
+	ETP_NO_SPREAD,           ///< Grow trees on tiles that have them but don't spread to new ones
+	ETP_SPREAD_RAINFOREST,   ///< Grow trees on tiles that have them, only spread to new ones in rainforests
+	ETP_SPREAD_ALL,          ///< Grow trees and spread them without restrictions
+	ETP_NO_GROWTH_NO_SPREAD, ///< Don't grow trees and don't spread them at all
 };
 
 /** Determines when to consider building more trees. */
@@ -732,8 +733,8 @@ static void TileLoopTreesAlps(TileIndex tile)
 static bool CanPlantExtraTrees(TileIndex tile)
 {
 	return ((_settings_game.game_creation.landscape == LT_TROPIC && GetTropicZone(tile) == TROPICZONE_RAINFOREST) ?
-		_settings_game.construction.extra_tree_placement != ETP_NONE :
-		_settings_game.construction.extra_tree_placement == ETP_ALL);
+		(_settings_game.construction.extra_tree_placement == ETP_SPREAD_ALL || _settings_game.construction.extra_tree_placement == ETP_SPREAD_RAINFOREST) :
+		_settings_game.construction.extra_tree_placement == ETP_SPREAD_ALL);
 }
 
 static void TileLoop_Trees(TileIndex tile)
@@ -759,6 +760,9 @@ static void TileLoop_Trees(TileIndex tile)
 			MarkTileDirtyByTile(tile, VMDF_NOT_MAP_MODE);
 		}
 	}
+
+	if (_settings_game.construction.extra_tree_placement == ETP_NO_GROWTH_NO_SPREAD) return;
+
 	if (GetTreeCounter(tile) < 15) {
 		if (_settings_game.construction.tree_growth_rate > 0) {
 			/* slow, very slow, extremely slow */
@@ -787,7 +791,7 @@ static void TileLoop_Trees(TileIndex tile)
 						break;
 
 					case 1: // add a tree
-						if (GetTreeCount(tile) < 4) {
+						if (GetTreeCount(tile) < 4 && CanPlantExtraTrees(tile)) {
 							AddTreeCount(tile, 1);
 							SetTreeGrowth(tile, 0);
 							break;
@@ -819,13 +823,13 @@ static void TileLoop_Trees(TileIndex tile)
 			break;
 
 		case 6: // final stage of tree destruction
-			if (GetTreeCount(tile) > 1) {
+			 if (!CanPlantExtraTrees(tile)) {
+				/* if trees can't spread just plant a new one to prevent deforestation */
+				SetTreeGrowth(tile, 0);
+			} else if (GetTreeCount(tile) > 1) {
 				/* more than one tree, delete it */
 				AddTreeCount(tile, -1);
 				SetTreeGrowth(tile, 3);
-			} else if (!CanPlantExtraTrees(tile)) {
-				/* if trees can't spread just plant a new one to prevent deforestation */
-				SetTreeGrowth(tile, 0);
 			} else {
 				/* just one tree, change type into MP_CLEAR */
 				switch (GetTreeGround(tile)) {
@@ -861,8 +865,8 @@ static void TileLoop_Trees(TileIndex tile)
 
 void OnTick_Trees()
 {
-	/* Don't place trees if that's not allowed */
-	if (_settings_game.construction.extra_tree_placement == ETP_NONE) return;
+	/* Don't spread trees if that's not allowed */
+	if (_settings_game.construction.extra_tree_placement == ETP_NO_SPREAD || _settings_game.construction.extra_tree_placement == ETP_NO_GROWTH_NO_SPREAD) return;
 
 	uint32 r;
 	TileIndex tile;
@@ -877,7 +881,7 @@ void OnTick_Trees()
 	}
 
 	/* byte underflow */
-	if (--_trees_tick_ctr != 0 || _settings_game.construction.extra_tree_placement != ETP_ALL) return;
+	if (--_trees_tick_ctr != 0 || _settings_game.construction.extra_tree_placement == ETP_SPREAD_RAINFOREST) return;
 
 	/* place a tree at a random spot */
 	r = Random();

src/vehicle_gui.cpp

@@ -43,27 +43,41 @@
 #include "depot_base.h"
 
 #include <vector>
+#include <algorithm>
 
 #include "safeguards.h"
 
 
-Sorting _sorting;
+BaseVehicleListWindow::GroupBy _grouping[VLT_END][VEH_COMPANY_END];
+Sorting _sorting[BaseVehicleListWindow::GB_END];
 
-static GUIVehicleList::SortFunction VehicleNumberSorter;
-static GUIVehicleList::SortFunction VehicleNameSorter;
-static GUIVehicleList::SortFunction VehicleAgeSorter;
-static GUIVehicleList::SortFunction VehicleProfitThisYearSorter;
-static GUIVehicleList::SortFunction VehicleProfitLifetimeSorter;
-static GUIVehicleList::SortFunction VehicleProfitLastYearSorter;
-static GUIVehicleList::SortFunction VehicleCargoSorter;
-static GUIVehicleList::SortFunction VehicleReliabilitySorter;
-static GUIVehicleList::SortFunction VehicleMaxSpeedSorter;
-static GUIVehicleList::SortFunction VehicleModelSorter;
-static GUIVehicleList::SortFunction VehicleValueSorter;
-static GUIVehicleList::SortFunction VehicleLengthSorter;
-static GUIVehicleList::SortFunction VehicleTimeToLiveSorter;
-static GUIVehicleList::SortFunction VehicleTimetableDelaySorter;
-static GUIVehicleList::SortFunction VehicleAverageOrderOccupancySorter;
+static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleNumberSorter;
+static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleNameSorter;
+static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleAgeSorter;
+static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleProfitThisYearSorter;
+static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleProfitLastYearSorter;
+static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleProfitLifetimeSorter;
+static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleCargoSorter;
+static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleReliabilitySorter;
+static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleMaxSpeedSorter;
+static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleModelSorter;
+static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleValueSorter;
+static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleLengthSorter;
+static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleTimeToLiveSorter;
+static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleTimetableDelaySorter;
+static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleAverageOrderOccupancySorter;
+static BaseVehicleListWindow::VehicleGroupSortFunction VehicleGroupLengthSorter;
+static BaseVehicleListWindow::VehicleGroupSortFunction VehicleGroupTotalProfitThisYearSorter;
+static BaseVehicleListWindow::VehicleGroupSortFunction VehicleGroupTotalProfitLastYearSorter;
+static BaseVehicleListWindow::VehicleGroupSortFunction VehicleGroupAverageProfitThisYearSorter;
+static BaseVehicleListWindow::VehicleGroupSortFunction VehicleGroupAverageProfitLastYearSorter;
+
+/** Wrapper to convert a VehicleIndividualSortFunction to a VehicleGroupSortFunction */
+template <BaseVehicleListWindow::VehicleIndividualSortFunction func>
+static bool VehicleIndividualToGroupSorterWrapper(GUIVehicleGroup const &a, GUIVehicleGroup const &b)
+{
+	return func(*(a.vehicles_begin), *(b.vehicles_begin));
+}
 
 enum VehicleSortType
 {
@@ -84,25 +98,25 @@ enum VehicleSortType
 	VST_AVERAGE_ORDER_OCCUPANCY,
 };
 
-GUIVehicleList::SortFunction * const BaseVehicleListWindow::vehicle_sorter_funcs[] = {
-	&VehicleNumberSorter,
-	&VehicleNameSorter,
-	&VehicleAgeSorter,
-	&VehicleProfitThisYearSorter,
-	&VehicleProfitLastYearSorter,
-	&VehicleProfitLifetimeSorter,
-	&VehicleCargoSorter,
-	&VehicleReliabilitySorter,
-	&VehicleMaxSpeedSorter,
-	&VehicleModelSorter,
-	&VehicleValueSorter,
-	&VehicleLengthSorter,
-	&VehicleTimeToLiveSorter,
-	&VehicleTimetableDelaySorter,
-	&VehicleAverageOrderOccupancySorter,
+BaseVehicleListWindow::VehicleGroupSortFunction * const BaseVehicleListWindow::vehicle_group_none_sorter_funcs[] = {
+	&VehicleIndividualToGroupSorterWrapper<VehicleNumberSorter>,
+	&VehicleIndividualToGroupSorterWrapper<VehicleNameSorter>,
+	&VehicleIndividualToGroupSorterWrapper<VehicleAgeSorter>,
+	&VehicleIndividualToGroupSorterWrapper<VehicleProfitThisYearSorter>,
+	&VehicleIndividualToGroupSorterWrapper<VehicleProfitLastYearSorter>,
+	&VehicleIndividualToGroupSorterWrapper<VehicleProfitLifetimeSorter>,
+	&VehicleIndividualToGroupSorterWrapper<VehicleCargoSorter>,
+	&VehicleIndividualToGroupSorterWrapper<VehicleReliabilitySorter>,
+	&VehicleIndividualToGroupSorterWrapper<VehicleMaxSpeedSorter>,
+	&VehicleIndividualToGroupSorterWrapper<VehicleModelSorter>,
+	&VehicleIndividualToGroupSorterWrapper<VehicleValueSorter>,
+	&VehicleIndividualToGroupSorterWrapper<VehicleLengthSorter>,
+	&VehicleIndividualToGroupSorterWrapper<VehicleTimeToLiveSorter>,
+	&VehicleIndividualToGroupSorterWrapper<VehicleTimetableDelaySorter>,
+	&VehicleIndividualToGroupSorterWrapper<VehicleAverageOrderOccupancySorter>,
 };
 
-const StringID BaseVehicleListWindow::vehicle_sorter_names[] = {
+const StringID BaseVehicleListWindow::vehicle_group_none_sorter_names[] = {
 	STR_SORT_BY_NUMBER,
 	STR_SORT_BY_NAME,
 	STR_SORT_BY_AGE,
@@ -121,6 +135,29 @@ const StringID BaseVehicleListWindow::vehicle_sorter_names[] = {
 	INVALID_STRING_ID
 };
 
+BaseVehicleListWindow::VehicleGroupSortFunction * const BaseVehicleListWindow::vehicle_group_shared_orders_sorter_funcs[] = {
+	&VehicleGroupLengthSorter,
+	&VehicleGroupTotalProfitThisYearSorter,
+	&VehicleGroupTotalProfitLastYearSorter,
+	&VehicleGroupAverageProfitThisYearSorter,
+	&VehicleGroupAverageProfitLastYearSorter,
+};
+
+const StringID BaseVehicleListWindow::vehicle_group_shared_orders_sorter_names[] = {
+	STR_SORT_BY_NUM_VEHICLES,
+	STR_SORT_BY_TOTAL_PROFIT_THIS_YEAR,
+	STR_SORT_BY_TOTAL_PROFIT_LAST_YEAR,
+	STR_SORT_BY_AVERAGE_PROFIT_THIS_YEAR,
+	STR_SORT_BY_AVERAGE_PROFIT_LAST_YEAR,
+	INVALID_STRING_ID
+};
+
+const StringID BaseVehicleListWindow::vehicle_group_by_names[] = {
+	STR_GROUP_BY_NONE,
+	STR_GROUP_BY_SHARED_ORDERS,
+	INVALID_STRING_ID
+};
+
 const StringID BaseVehicleListWindow::vehicle_depot_name[] = {
 	STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT,
 	STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT,
@@ -135,6 +172,32 @@ const StringID BaseVehicleListWindow::vehicle_depot_sell_name[] = {
 	STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR_SELL
 };
 
+BaseVehicleListWindow::BaseVehicleListWindow(WindowDesc *desc, WindowNumber wno) : Window(desc), vli(VehicleListIdentifier::UnPack(wno))
+{
+	this->grouping = _grouping[vli.type][vli.vtype];
+	this->vehicle_sel = INVALID_VEHICLE;
+	this->UpdateSortingFromGrouping();
+}
+
+/**
+ * Get the number of digits of space required for the given number.
+ * @param number The number.
+ * @return The number of digits to allocate space for.
+ */
+uint CountDigitsForAllocatingSpace(uint number)
+{
+	if (number >= 10000) return 5;
+	if (number >= 1000) return 4;
+	if (number >= 100) return 3;
+
+	/*
+	 * When the smallest unit number is less than 10, it is
+	 * quite likely that it will expand to become more than
+	 * 10 quite soon.
+	 */
+	return 2;
+}
+
 /**
  * Get the number of digits the biggest unit number of a set of vehicles has.
  * @param vehicles The list of vehicles.
@@ -147,42 +210,74 @@ uint GetUnitNumberDigits(VehicleList &vehicles)
 		unitnumber = max<uint>(unitnumber, v->unitnumber);
 	}
 
-	if (unitnumber >= 10000) return 5;
-	if (unitnumber >=  1000) return 4;
-	if (unitnumber >=   100) return 3;
-
-	/*
-	 * When the smallest unit number is less than 10, it is
-	 * quite likely that it will expand to become more than
-	 * 10 quite soon.
-	 */
-	return 2;
+	return CountDigitsForAllocatingSpace(unitnumber);
 }
 
 void BaseVehicleListWindow::CountOwnVehicles()
 {
 	this->own_vehicles = 0;
-	for (const Vehicle *v : vehicles) {
-		if (v->owner == _local_company) this->own_vehicles++;
+	for (const GUIVehicleGroup &vg : this->vehgroups) {
+		if ((*(vg.vehicles_begin))->owner == _local_company) this->own_vehicles++;
 	}
 	this->own_company = _local_company;
 }
 
 void BaseVehicleListWindow::BuildVehicleList()
 {
-	if (!this->vehicles.NeedRebuild()) return;
+	if (!this->vehgroups.NeedRebuild()) return;
 
 	DEBUG(misc, 3, "Building vehicle list type %d for company %d given index %d", this->vli.type, this->vli.company, this->vli.index);
 
+	this->vehgroups.clear();
+
 	GenerateVehicleSortList(&this->vehicles, this->vli);
 
-	this->FilterVehicleList();
+	if (this->grouping == GB_NONE) {
+		uint max_unitnumber = 0;
+		for (auto it = this->vehicles.begin(); it != this->vehicles.end(); ++it) {
+			this->vehgroups.emplace_back(it, it + 1, (*it)->GetDisplayProfitThisYear(), (*it)->GetDisplayProfitLastYear(), (*it)->age);
 
-	this->unitnumber_digits = GetUnitNumberDigits(this->vehicles);
+			max_unitnumber = max<uint>(max_unitnumber, (*it)->unitnumber);
+		}
+		this->unitnumber_digits = CountDigitsForAllocatingSpace(max_unitnumber);
+	} else {
+		/* Sort by the primary vehicle; we just want all vehicles that share the same orders to form a contiguous range. */
+		std::stable_sort(this->vehicles.begin(), this->vehicles.end(), [](const Vehicle * const &u, const Vehicle * const &v) {
+			return u->FirstShared() < v->FirstShared();
+		});
+
+		uint max_num_vehicles = 0;
+
+		VehicleList::const_iterator begin = this->vehicles.begin();
+		while (begin != this->vehicles.end()) {
+			VehicleList::const_iterator end = std::find_if_not(begin, this->vehicles.cend(), [first_shared = (*begin)->FirstShared()](const Vehicle * const &v) {
+				return v->FirstShared() == first_shared;
+			});
+
+			Money display_profit_this_year = 0;
+			Money display_profit_last_year = 0;
+			Date age = 0;
+			for (auto it = begin; it != end; ++it) {
+				const Vehicle * const v = (*it);
+				display_profit_this_year += v->GetDisplayProfitThisYear();
+				display_profit_last_year += v->GetDisplayProfitLastYear();
+				age = max<Date>(age, v->age);
+			}
+
+			this->vehgroups.emplace_back(begin, end, display_profit_this_year, display_profit_last_year, age);
+
+			max_num_vehicles = max<uint>(max_num_vehicles, static_cast<uint>(end - begin));
+
+			begin = end;
+		}
+
+		this->unitnumber_digits = CountDigitsForAllocatingSpace(max_num_vehicles);
+	}
+	this->FilterVehicleList();
 	this->CountOwnVehicles();
 
-	this->vehicles.RebuildDone();
-	this->vscroll->SetCount((uint)this->vehicles.size());
+	this->vehgroups.RebuildDone();
+	this->vscroll->SetCount(static_cast<int>(this->vehgroups.size()));
 }
 
 /** Cargo filter functions */
@@ -219,8 +314,17 @@ static bool CDECL CargoFilter(const Vehicle * const *vid, const CargoID cid)
 	}
 }
 
-static GUIVehicleList::FilterFunction * const _filter_funcs[] = {
-	&CargoFilter,
+static bool CDECL GroupCargoFilter(const GUIVehicleGroup* group, const CargoID cid)
+{
+	if (cid == BaseVehicleListWindow::CF_ANY) return true;
+	for (VehicleList::const_iterator v = group->vehicles_begin; v != group->vehicles_end; ++v) {
+		if (CargoFilter(&(*v), cid)) return true;
+	}
+	return false;
+}
+
+static GUIVehicleGroupList::FilterFunction * const _filter_funcs[] = {
+	&GroupCargoFilter,
 };
 
 /** Set cargo filter list item index. */
@@ -229,9 +333,9 @@ void BaseVehicleListWindow::SetCargoFilterIndex(int index)
 	if (this->cargo_filter_criteria != index) {
 		this->cargo_filter_criteria = index;
 		/* deactivate filter if criteria is 'Show All', activate it otherwise */
-		this->vehicles.SetFilterState(this->cargo_filter[this->cargo_filter_criteria] != CF_ANY);
-		this->vehicles.SetFilterType(0);
-		this->vehicles.ForceRebuild();
+		this->vehgroups.SetFilterState(this->cargo_filter[this->cargo_filter_criteria] != CF_ANY);
+		this->vehgroups.SetFilterType(0);
+		this->vehgroups.ForceRebuild();
 	}
 }
 
@@ -268,14 +372,14 @@ void BaseVehicleListWindow::SetCargoFilterArray()
 	/* Terminate the filter list. */
 	this->cargo_filter_texts[filter_items] = INVALID_STRING_ID;
 
-	this->vehicles.SetFilterFuncs(_filter_funcs);
-	this->vehicles.SetFilterState(this->cargo_filter[this->cargo_filter_criteria] != CF_ANY);
+	this->vehgroups.SetFilterFuncs(_filter_funcs);
+	this->vehgroups.SetFilterState(this->cargo_filter[this->cargo_filter_criteria] != CF_ANY);
 }
 
 /** Filter the engine list against the currently selected cargo filter */
 void BaseVehicleListWindow::FilterVehicleList()
 {
-	this->vehicles.Filter(this->cargo_filter[this->cargo_filter_criteria]);
+	this->vehgroups.Filter(this->cargo_filter[this->cargo_filter_criteria]);
 	if (0 == this->vehicles.size()) {
 		// no vehicle passed through the filter, invalidate the previously selected vehicle
 		this->vehicle_sel = INVALID_VEHICLE;
@@ -384,7 +488,7 @@ static const Vehicle *_last_vehicle[2] = { nullptr, nullptr };
 
 void BaseVehicleListWindow::SortVehicleList()
 {
-	if (this->vehicles.Sort()) return;
+	if (this->vehgroups.Sort()) return;
 
 	/* invalidate cached values for name sorter - vehicle names could change */
 	_last_vehicle[0] = _last_vehicle[1] = nullptr;
@@ -397,16 +501,16 @@ void DepotSortList(VehicleList *list)
 }
 
 /** draw the vehicle profit button in the vehicle list window. */
-static void DrawVehicleProfitButton(const Vehicle *v, int x, int y)
+static void DrawVehicleProfitButton(Date age, Money display_profit_last_year, uint num_vehicles, int x, int y)
 {
 	SpriteID spr;
 
 	/* draw profit-based coloured icons */
-	if (v->age <= VEHICLE_PROFIT_MIN_AGE) {
+	if (age <= VEHICLE_PROFIT_MIN_AGE) {
 		spr = SPR_PROFIT_NA;
-	} else if (v->GetDisplayProfitLastYear() < 0) {
+	} else if (display_profit_last_year < 0) {
 		spr = SPR_PROFIT_NEGATIVE;
-	} else if (v->GetDisplayProfitLastYear() < VEHICLE_PROFIT_THRESHOLD) {
+	} else if (display_profit_last_year < VEHICLE_PROFIT_THRESHOLD * num_vehicles) {
 		spr = SPR_PROFIT_SOME;
 	} else {
 		spr = SPR_PROFIT_LOT;
@@ -1346,6 +1450,36 @@ StringID GetCargoSubtypeText(const Vehicle *v)
 	return STR_EMPTY;
 }
 
+/** Sort vehicle groups by the number of vehicles in the group */
+static bool VehicleGroupLengthSorter(const GUIVehicleGroup &a, const GUIVehicleGroup &b)
+{
+	return a.NumVehicles() < b.NumVehicles();
+}
+
+/** Sort vehicle groups by the total profit this year */
+static bool VehicleGroupTotalProfitThisYearSorter(const GUIVehicleGroup &a, const GUIVehicleGroup &b)
+{
+	return a.display_profit_this_year < b.display_profit_this_year;
+}
+
+/** Sort vehicle groups by the total profit last year */
+static bool VehicleGroupTotalProfitLastYearSorter(const GUIVehicleGroup &a, const GUIVehicleGroup &b)
+{
+	return a.display_profit_last_year < b.display_profit_last_year;
+}
+
+/** Sort vehicle groups by the average profit this year */
+static bool VehicleGroupAverageProfitThisYearSorter(const GUIVehicleGroup &a, const GUIVehicleGroup &b)
+{
+	return a.display_profit_this_year * static_cast<uint>(b.NumVehicles()) < b.display_profit_this_year * static_cast<uint>(a.NumVehicles());
+}
+
+/** Sort vehicle groups by the average profit last year */
+static bool VehicleGroupAverageProfitLastYearSorter(const GUIVehicleGroup &a, const GUIVehicleGroup &b)
+{
+	return a.display_profit_last_year * static_cast<uint>(b.NumVehicles()) < b.display_profit_last_year * static_cast<uint>(a.NumVehicles());
+}
+
 /** Sort vehicles by their number */
 static bool VehicleNumberSorter(const Vehicle * const &a, const Vehicle * const &b)
 {
@@ -1484,6 +1618,7 @@ static bool VehicleAverageOrderOccupancySorter(const Vehicle * const &a, const V
 
 void InitializeGUI()
 {
+	MemSetT(&_grouping, 0);
 	MemSetT(&_sorting, 0);
 }
 
@@ -1534,14 +1669,19 @@ static const NWidgetPart _nested_vehicle_list[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_GREY),
 	EndContainer(),
 
+	NWidget(NWID_HORIZONTAL),
+		NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_VL_GROUP_ORDER), SetMinimalSize(81, 12), SetFill(0, 1), SetDataTip(STR_STATION_VIEW_GROUP, STR_TOOLTIP_GROUP_ORDER),
+		NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_VL_GROUP_BY_PULLDOWN), SetMinimalSize(167, 12), SetFill(0, 1), SetDataTip(0x0, STR_TOOLTIP_GROUP_ORDER),
+		NWidget(WWT_PANEL, COLOUR_GREY), SetMinimalSize(12, 12), SetFill(1, 1), SetResize(1, 0), EndContainer(),
+	EndContainer(),
+
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_VL_SORT_ORDER), SetMinimalSize(81, 12), SetFill(0, 1), SetDataTip(STR_BUTTON_SORT_BY, STR_TOOLTIP_SORT_ORDER),
 		NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_VL_SORT_BY_PULLDOWN), SetMinimalSize(167, 12), SetFill(0, 1), SetDataTip(0x0, STR_TOOLTIP_SORT_CRITERIA),
 		NWidget(NWID_SELECTION, INVALID_COLOUR, WID_VL_FILTER_BY_CARGO_SEL),
 			NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_VL_FILTER_BY_CARGO), SetMinimalSize(167, 12), SetFill(0, 1), SetDataTip(STR_JUST_STRING, STR_TOOLTIP_FILTER_CRITERIA),
 		EndContainer(),
-		NWidget(WWT_PANEL, COLOUR_GREY), SetMinimalSize(12, 12), SetFill(1, 1), SetResize(1, 0),
-		EndContainer(),
+		NWidget(WWT_PANEL, COLOUR_GREY), SetMinimalSize(12, 12), SetFill(1, 1), SetResize(1, 0), EndContainer(),
 	EndContainer(),
 
 	NWidget(NWID_HORIZONTAL),
@@ -1600,6 +1740,25 @@ static void DrawSmallOrderList(const Vehicle *v, int left, int right, int y, Veh
 	} while (oid != start);
 }
 
+/** Draw small order list in the vehicle GUI, but without the little black arrow.  This is used for shared order groups. */
+static void DrawSmallOrderList(const Order *order, int left, int right, int y)
+{
+	bool rtl = _current_text_dir == TD_RTL;
+	int l_offset = rtl ? 0 : ScaleGUITrad(6);
+	int r_offset = rtl ? ScaleGUITrad(6) : 0;
+	int i = 0;
+	while (order != nullptr) {
+		if (order->IsType(OT_GOTO_STATION)) {
+			SetDParam(0, order->GetDestination());
+			DrawString(left + l_offset, right - r_offset, y, STR_TINY_BLACK_STATION);
+
+			y += FONT_HEIGHT_SMALL;
+			if (++i == 4) break;
+		}
+		order = order->next;
+	}
+}
+
 /**
  * Draws an image of a vehicle chain
  * @param v         Front vehicle
@@ -1667,16 +1826,18 @@ void BaseVehicleListWindow::DrawVehicleListItems(VehicleID selected_vehicle, int
 	int vehicle_button_x = rtl ? right - GetSpriteSize(SPR_PROFIT_LOT).width : left;
 
 	int y = r.top;
-	uint max = min(this->vscroll->GetPosition() + this->vscroll->GetCapacity(), (uint)this->vehicles.size());
+	uint max = min(this->vscroll->GetPosition() + this->vscroll->GetCapacity(), static_cast<uint>(this->vehgroups.size()));
 	for (uint i = this->vscroll->GetPosition(); i < max; ++i) {
-		const Vehicle *v = this->vehicles[i];
+		const GUIVehicleGroup &vehgroup = this->vehgroups[i];
+		if (this->grouping == GB_NONE) {
+			const Vehicle *v = vehgroup.GetSingleVehicle();
 
 			SetDParam(0, STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR);
 			SetDParam(1, v->GetDisplayProfitThisYear());
 			SetDParam(2, v->GetDisplayProfitLastYear());
 
 			StringID str;
-		switch (this->vehicles.SortType()) {
+			switch (this->vehgroups.SortType()) {
 				case VST_AGE: {
 					str = (v->age + DAYS_IN_YEAR < v->max_age) ? STR_VEHICLE_LIST_AGE : STR_VEHICLE_LIST_AGE_RED;
 					SetDParam(3, v->age / DAYS_IN_LEAP_YEAR);
@@ -1784,6 +1945,19 @@ void BaseVehicleListWindow::DrawVehicleListItems(VehicleID selected_vehicle, int
 				}
 				GfxFillRect((text_right - 1) - (FONT_HEIGHT_SMALL - 2), y + 1, text_right - 1, (y + 1) + (FONT_HEIGHT_SMALL - 2), ccolour, FILLRECT_OPAQUE);
 			}
+		} else {
+			SetDParam(0, vehgroup.display_profit_this_year);
+			SetDParam(1, vehgroup.display_profit_last_year);
+			DrawString(text_left, text_right, y + line_height - FONT_HEIGHT_SMALL - WD_FRAMERECT_BOTTOM - 1, STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR);
+		}
+
+		DrawVehicleProfitButton(vehgroup.age, vehgroup.display_profit_last_year, vehgroup.NumVehicles(), vehicle_button_x, y + FONT_HEIGHT_NORMAL + 3);
+
+		switch (this->grouping) {
+			case GB_NONE: {
+				const Vehicle *v = vehgroup.GetSingleVehicle();
+
+				DrawVehicleImage(v, image_left, image_right, y + FONT_HEIGHT_SMALL - 1, selected_vehicle, EIT_IN_LIST, 0);
 
 				if (!v->name.empty()) {
 					/* The vehicle got a name so we will print it */
@@ -1797,6 +1971,7 @@ void BaseVehicleListWindow::DrawVehicleListItems(VehicleID selected_vehicle, int
 
 				if (show_orderlist) DrawSmallOrderList(v, orderlist_left, orderlist_right, y, v->cur_real_order_index);
 
+				StringID str;
 				if (v->IsChainInDepot()) {
 					str = STR_BLUE_COMMA;
 				} else {
@@ -1805,13 +1980,63 @@ void BaseVehicleListWindow::DrawVehicleListItems(VehicleID selected_vehicle, int
 
 				SetDParam(0, v->unitnumber);
 				DrawString(left, right, y + 2, str);
+				break;
+			}
 
-		DrawVehicleProfitButton(v, vehicle_button_x, y + FONT_HEIGHT_NORMAL + 3);
+			case GB_SHARED_ORDERS:
+
+				assert(vehgroup.NumVehicles() > 0);
+
+				for (int i = 0; i < static_cast<int>(vehgroup.NumVehicles()); ++i) {
+					if (image_left + 8 * i >= image_right) break; // Break if there is no more space to draw any more vehicles anyway.
+					DrawVehicleImage(vehgroup.vehicles_begin[i], image_left + 8 * i, image_right, y + FONT_HEIGHT_SMALL - 1, selected_vehicle, EIT_IN_LIST, 0);
+				}
+
+				if (show_orderlist) DrawSmallOrderList((vehgroup.vehicles_begin[0])->GetFirstOrder(), orderlist_left, orderlist_right, y);
+
+				SetDParam(0, vehgroup.NumVehicles());
+				DrawString(left, right, y + 2, STR_BLACK_COMMA);
+				break;
+
+			default:
+				NOT_REACHED();
+		}
 
 		y += line_height;
 	}
 }
 
+void BaseVehicleListWindow::UpdateSortingFromGrouping()
+{
+	/* Set up sorting. Make the window-specific _sorting variable
+	 * point to the correct global _sorting struct so we are freed
+	 * from having conditionals during window operation */
+	switch (this->vli.vtype) {
+		case VEH_TRAIN:    this->sorting = &_sorting[this->grouping].train; break;
+		case VEH_ROAD:     this->sorting = &_sorting[this->grouping].roadveh; break;
+		case VEH_SHIP:     this->sorting = &_sorting[this->grouping].ship; break;
+		case VEH_AIRCRAFT: this->sorting = &_sorting[this->grouping].aircraft; break;
+		default: NOT_REACHED();
+	}
+	this->vehgroups.SetSortFuncs(this->GetVehicleSorterFuncs());
+	this->vehgroups.SetListing(*this->sorting);
+	this->vehgroups.ForceRebuild();
+	this->vehgroups.NeedResort();
+}
+
+void BaseVehicleListWindow::UpdateVehicleGroupBy(GroupBy group_by)
+{
+	if (this->grouping != group_by) {
+		/* Save the old sorting option, so that if we change the grouping option back later on,
+		 * UpdateSortingFromGrouping() will automatically restore the saved sorting option. */
+		*this->sorting = this->vehgroups.GetListing();
+
+		this->grouping = group_by;
+		_grouping[this->vli.type][this->vli.vtype] = group_by;
+		this->UpdateSortingFromGrouping();
+	}
+}
+
 /**
  * Window for the (old) vehicle listing.
  *
@@ -1843,26 +2068,12 @@ private:
 public:
 	VehicleListWindow(WindowDesc *desc, WindowNumber window_number) : BaseVehicleListWindow(desc, window_number)
 	{
-		/* Set up sorting. Make the window-specific _sorting variable
-		 * point to the correct global _sorting struct so we are freed
-		 * from having conditionals during window operation */
-		switch (this->vli.vtype) {
-			case VEH_TRAIN:    this->sorting = &_sorting.train; break;
-			case VEH_ROAD:     this->sorting = &_sorting.roadveh; break;
-			case VEH_SHIP:     this->sorting = &_sorting.ship; break;
-			case VEH_AIRCRAFT: this->sorting = &_sorting.aircraft; break;
-			default: NOT_REACHED();
-		}
-
 		this->CreateNestedTree();
 
 		this->CheckCargoFilterEnableState(WID_VL_FILTER_BY_CARGO_SEL, false, this->vli.type != VL_SHARED_ORDERS && this->vli.type != VL_SINGLE_VEH);
 
 		this->vscroll = this->GetScrollbar(WID_VL_SCROLLBAR);
 
-		this->vehicles.SetListing(*this->sorting);
-		this->vehicles.ForceRebuild();
-		this->vehicles.NeedResort();
 		this->BuildVehicleList();
 		this->SortVehicleList();
 
@@ -1871,6 +2082,10 @@ public:
 
 		if (this->vli.type == VL_SHARED_ORDERS) {
 			this->GetWidget<NWidgetCore>(WID_VL_CAPTION)->widget_data = STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION;
+			/* If we are in the shared orders window, then disable the group-by dropdown menu.
+			 * Remove this when the group-by dropdown menu has another option apart from grouping by shared orders. */
+			this->SetWidgetDisabledState(WID_VL_GROUP_ORDER, true);
+			this->SetWidgetDisabledState(WID_VL_GROUP_BY_PULLDOWN, true);
 		} else {
 			this->GetWidget<NWidgetCore>(WID_VL_CAPTION)->widget_data = STR_VEHICLE_LIST_TRAIN_CAPTION + this->vli.vtype;
 		}
@@ -1881,7 +2096,7 @@ public:
 
 	~VehicleListWindow()
 	{
-		*this->sorting = this->vehicles.GetListing();
+		*this->sorting = this->vehgroups.GetListing();
 	}
 
 	void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override
@@ -1941,26 +2156,26 @@ public:
 							 * and we should close the window when deleting the order. */
 							NOT_REACHED();
 						}
-						SetDParam(0, this->vscroll->GetCount());
+						SetDParam(0, this->vehicles.size());
 						break;
 
 					case VL_STANDARD: // Company Name
 						SetDParam(0, STR_COMPANY_NAME);
 						SetDParam(1, this->vli.index);
-						SetDParam(3, this->vscroll->GetCount());
+						SetDParam(3, this->vehicles.size());
 						break;
 
 					case VL_STATION_LIST: // Station/Waypoint Name
 						SetDParam(0, Station::IsExpected(BaseStation::Get(this->vli.index)) ? STR_STATION_NAME : STR_WAYPOINT_NAME);
 						SetDParam(1, this->vli.index);
-						SetDParam(3, this->vscroll->GetCount());
+						SetDParam(3, this->vehicles.size());
 						break;
 
 					case VL_DEPOT_LIST:
 						SetDParam(0, STR_DEPOT_CAPTION);
 						SetDParam(1, this->vli.vtype);
 						SetDParam(2, this->vli.index);
-						SetDParam(3, this->vscroll->GetCount());
+						SetDParam(3, this->vehicles.size());
 						break;
 					default: NOT_REACHED();
 				}
@@ -1974,7 +2189,7 @@ public:
 		switch (widget) {
 			case WID_VL_SORT_ORDER:
 				/* draw arrow pointing up/down for ascending/descending sorting */
-				this->DrawSortButtonState(widget, this->vehicles.IsDescSortOrder() ? SBS_DOWN : SBS_UP);
+				this->DrawSortButtonState(widget, this->vehgroups.IsDescSortOrder() ? SBS_DOWN : SBS_UP);
 				break;
 
 			case WID_VL_LIST:
@@ -2012,8 +2227,11 @@ public:
 				WIDGET_LIST_END);
 		}
 
+		/* Set text of group by dropdown widget. */
+		this->GetWidget<NWidgetCore>(WID_VL_GROUP_BY_PULLDOWN)->widget_data = this->vehicle_group_by_names[this->grouping];
+
 		/* Set text of sort by dropdown widget. */
-		this->GetWidget<NWidgetCore>(WID_VL_SORT_BY_PULLDOWN)->widget_data = this->vehicle_sorter_names[this->vehicles.SortType()];
+		this->GetWidget<NWidgetCore>(WID_VL_SORT_BY_PULLDOWN)->widget_data = this->GetVehicleSorterNames()[this->vehgroups.SortType()];
 
 		this->GetWidget<NWidgetCore>(WID_VL_FILTER_BY_CARGO)->widget_data = this->cargo_filter_texts[this->cargo_filter_criteria];
 
@@ -2024,12 +2242,16 @@ public:
 	{
 		switch (widget) {
 			case WID_VL_SORT_ORDER: // Flip sorting method ascending/descending
-				this->vehicles.ToggleSortOrder();
+				this->vehgroups.ToggleSortOrder();
 				this->SetDirty();
 				break;
 
-			case WID_VL_SORT_BY_PULLDOWN:// Select sorting criteria dropdown menu
-				ShowDropDownMenu(this, this->vehicle_sorter_names, this->vehicles.SortType(), WID_VL_SORT_BY_PULLDOWN, 0,
+			case WID_VL_GROUP_BY_PULLDOWN: // Select sorting criteria dropdown menu
+				ShowDropDownMenu(this, this->vehicle_group_by_names, this->grouping, WID_VL_GROUP_BY_PULLDOWN, 0, 0);
+				return;
+
+			case WID_VL_SORT_BY_PULLDOWN: // Select sorting criteria dropdown menu
+				ShowDropDownMenu(this, this->GetVehicleSorterNames(), this->vehgroups.SortType(), WID_VL_SORT_BY_PULLDOWN, 0,
 						(this->vli.vtype == VEH_TRAIN || this->vli.vtype == VEH_ROAD) ? 0 : this->vehicle_sorter_non_ground_veh_disable_mask, 0, DDSF_LOST_FOCUS);
 				return;
 
@@ -2039,9 +2261,12 @@ public:
 
 			case WID_VL_LIST: { // Matrix to show vehicles
 				uint id_v = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_VL_LIST);
-				if (id_v >= this->vehicles.size()) return; // click out of list bound
+				if (id_v >= this->vehgroups.size()) return; // click out of list bound
 
-				const Vehicle *v = this->vehicles[id_v];
+				const GUIVehicleGroup &vehgroup = this->vehgroups[id_v];
+				switch (this->grouping) {
+					case GB_NONE: {
+						const Vehicle *v = vehgroup.GetSingleVehicle();
 						if (!VehicleClicked(v)) {
 							if (_ctrl_pressed) {
 								ShowCompanyGroupForVehicle(v);
@@ -2052,6 +2277,19 @@ public:
 						break;
 					}
 
+					case GB_SHARED_ORDERS:
+						assert(vehgroup.NumVehicles() > 0);
+						/* We do not support VehicleClicked() here since the contextual action may only make sense for individual vehicles */
+
+						ShowVehicleListWindow(vehgroup.vehicles_begin[0]);
+						break;
+
+					default: NOT_REACHED();
+				}
+
+				break;
+			}
+
 			case WID_VL_AVAILABLE_VEHICLES:
 				ShowBuildVehicleWindow(INVALID_TILE, this->vli.vtype);
 				break;
@@ -2074,12 +2312,18 @@ public:
 	void OnDropdownSelect(int widget, int index) override
 	{
 		switch (widget) {
-			case WID_VL_SORT_BY_PULLDOWN:
-				this->vehicles.SetSortType(index);
+			case WID_VL_GROUP_BY_PULLDOWN:
+				this->UpdateVehicleGroupBy(static_cast<GroupBy>(index));
 				break;
+
+			case WID_VL_SORT_BY_PULLDOWN:
+				this->vehgroups.SetSortType(index);
+				break;
+
 			case WID_VL_FILTER_BY_CARGO:
 				this->SetCargoFilterIndex(index);
 				break;
+
 			case WID_VL_MANAGE_VEHICLES_DROPDOWN:
 				switch (index) {
 					case ADI_REPLACE: // Replace window
@@ -2125,6 +2369,7 @@ public:
 					default: NOT_REACHED();
 				}
 				break;
+
 			default: NOT_REACHED();
 		}
 		this->SetDirty();
@@ -2181,7 +2426,7 @@ public:
 
 	void OnGameTick() override
 	{
-		if (this->vehicles.NeedResort()) {
+		if (this->vehgroups.NeedResort()) {
 			StationID station = (this->vli.type == VL_STATION_LIST) ? this->vli.index : INVALID_STATION;
 
 			DEBUG(misc, 3, "Periodic resort %d list company %d at station %d", this->vli.vtype, this->owner, station);
@@ -2205,19 +2450,19 @@ public:
 			/* Needs to be done in command-scope, so everything stays valid */
 			this->vli.index = GB(data, 0, 20);
 			this->window_number = this->vli.Pack();
-			this->vehicles.ForceRebuild();
+			this->vehgroups.ForceRebuild();
 			return;
 		}
 
 		if (data == 0) {
 			/* This needs to be done in command-scope to enforce rebuilding before resorting invalid data */
-			this->vehicles.ForceRebuild();
+			this->vehgroups.ForceRebuild();
 			if (this->vli.type == VL_SHARED_ORDERS && !_settings_client.gui.enable_single_veh_shared_order_gui && this->vehicles.size() == 1) {
 				delete this;
 				return;
 			}
 		} else {
-			this->vehicles.ForceResort();
+			this->vehgroups.ForceResort();
 		}
 
 		this->CheckCargoFilterEnableState(WID_VL_FILTER_BY_CARGO_SEL, true, this->vli.type != VL_SHARED_ORDERS && this->vli.type != VL_SINGLE_VEH);

src/vehicle_gui_base.h

@@ -10,24 +10,63 @@
 #ifndef VEHICLE_GUI_BASE_H
 #define VEHICLE_GUI_BASE_H
 
+#include "core/smallvec_type.hpp"
+#include "date_type.h"
+#include "economy_type.h"
 #include "sortlist_type.h"
 #include "vehiclelist.h"
 #include "window_gui.h"
 #include "widgets/dropdown_type.h"
 #include "cargo_type.h"
+#include <iterator>
 
 typedef GUIList<const Vehicle*, CargoID> GUIVehicleList;
 
+struct GUIVehicleGroup {
+	VehicleList::const_iterator vehicles_begin;    ///< Pointer to beginning element of this vehicle group.
+	VehicleList::const_iterator vehicles_end;      ///< Pointer to past-the-end element of this vehicle group.
+	Money display_profit_this_year;                ///< Total profit for the vehicle group this year.
+	Money display_profit_last_year;                ///< Total profit for the vehicle group laste year.
+	Date age;                                      ///< Age in days of oldest vehicle in the group.
+
+	GUIVehicleGroup(VehicleList::const_iterator vehicles_begin, VehicleList::const_iterator vehicles_end, Money display_profit_this_year, Money display_profit_last_year, Date age)
+		: vehicles_begin(vehicles_begin), vehicles_end(vehicles_end), display_profit_this_year(display_profit_this_year), display_profit_last_year(display_profit_last_year), age(age) {}
+
+	std::ptrdiff_t NumVehicles() const
+	{
+		return std::distance(vehicles_begin, vehicles_end);
+	}
+	const Vehicle *GetSingleVehicle() const
+	{
+		assert(NumVehicles() == 1);
+		return vehicles_begin[0];
+	}
+};
+
+typedef GUIList<GUIVehicleGroup, CargoID> GUIVehicleGroupList;
+
 struct BaseVehicleListWindow : public Window {
-	GUIVehicleList vehicles;  ///< The list of vehicles
+	enum GroupBy : byte {
+		GB_NONE,
+		GB_SHARED_ORDERS,
+
+		GB_END,
+	};
+
+	GroupBy grouping;                         ///< How we want to group the list.
+	VehicleList vehicles;                     ///< List of vehicles.  This is the buffer for `vehgroups` to point into; if this is structurally modified, `vehgroups` must be rebuilt.
 	uint own_vehicles = 0;                    ///< Count of vehicles of the local company
 	CompanyID own_company;                    ///< Company ID used for own_vehicles
+	GUIVehicleGroupList vehgroups;            ///< List of (groups of) vehicles.  This stores iterators of `vehicles`, and should be rebuilt if `vehicles` is structurally changed.
 	Listing *sorting;                         ///< Pointer to the vehicle type related sorting.
-	byte unitnumber_digits;   ///< The number of digits of the highest unit number
+	byte unitnumber_digits;                   ///< The number of digits of the highest unit number.
 	Scrollbar *vscroll;
 	VehicleListIdentifier vli;                ///< Identifier of the vehicle list we want to currently show.
 	VehicleID vehicle_sel;                    ///< Selected vehicle
 
+	typedef GUIVehicleGroupList::SortFunction VehicleGroupSortFunction;
+	typedef GUIVehicleList::SortFunction VehicleIndividualSortFunction;
+
 	/** Special cargo filter criteria */
 	enum CargoFilterSpecialType {
 		CF_ANY = CT_NO_REFIT,                   ///< Show all vehicles independent of carried cargo (i.e. no filtering)
@@ -56,17 +95,21 @@ struct BaseVehicleListWindow : public Window {
 
 	static const StringID vehicle_depot_name[];
 	static const StringID vehicle_depot_sell_name[];
-	static const StringID vehicle_sorter_names[];
-	static GUIVehicleList::SortFunction * const vehicle_sorter_funcs[];
+
+	static const StringID vehicle_group_by_names[];
+	static const StringID vehicle_group_none_sorter_names[];
+	static const StringID vehicle_group_shared_orders_sorter_names[];
+	static VehicleGroupSortFunction * const vehicle_group_none_sorter_funcs[];
+	static VehicleGroupSortFunction * const vehicle_group_shared_orders_sorter_funcs[];
+
 	const uint vehicle_sorter_non_ground_veh_disable_mask = (1 << 11); // STR_SORT_BY_LENGTH
 
-	BaseVehicleListWindow(WindowDesc *desc, WindowNumber wno) : Window(desc), vli(VehicleListIdentifier::UnPack(wno))
-	{
-		this->vehicle_sel = INVALID_VEHICLE;
-		this->vehicles.SetSortFuncs(this->vehicle_sorter_funcs);
-	}
+	BaseVehicleListWindow(WindowDesc *desc, WindowNumber wno);
+
+	void UpdateSortingFromGrouping();
 
 	void DrawVehicleListItems(VehicleID selected_vehicle, int line_height, const Rect &r) const;
+	void UpdateVehicleGroupBy(GroupBy group_by);
 	void SortVehicleList();
 	void CountOwnVehicles();
 	void BuildVehicleList();
@@ -79,6 +122,30 @@ struct BaseVehicleListWindow : public Window {
 	DropDownList BuildActionDropdownList(bool show_autoreplace, bool show_group, bool show_template_replace,
 			StringID change_order_str = 0, bool show_create_group = false, bool consider_top_level = false);
 	bool ShouldShowActionDropdownList() const;
+
+	const StringID *GetVehicleSorterNames()
+	{
+		switch (this->grouping) {
+			case GB_NONE:
+				return vehicle_group_none_sorter_names;
+			case GB_SHARED_ORDERS:
+				return vehicle_group_shared_orders_sorter_names;
+			default:
+				NOT_REACHED();
+		}
+	}
+
+	VehicleGroupSortFunction * const *GetVehicleSorterFuncs()
+	{
+		switch (this->grouping) {
+			case GB_NONE:
+				return vehicle_group_none_sorter_funcs;
+			case GB_SHARED_ORDERS:
+				return vehicle_group_shared_orders_sorter_funcs;
+			default:
+				NOT_REACHED();
+		}
+	}
 };
 
 uint GetVehicleListHeight(VehicleType type, uint divisor = 1);
@@ -90,6 +157,7 @@ struct Sorting {
 	Listing train;
 };
 
-extern Sorting _sorting;
+extern BaseVehicleListWindow::GroupBy _grouping[VLT_END][VEH_COMPANY_END];
+extern Sorting _sorting[BaseVehicleListWindow::GB_END];
 
 #endif /* VEHICLE_GUI_BASE_H */

src/video/win32_v.cpp

@@ -48,18 +48,18 @@ typedef BOOL (WINAPI *PFNTRACKMOUSEEVENT)(LPTRACKMOUSEEVENT lpEventTrack);
 static PFNTRACKMOUSEEVENT _pTrackMouseEvent = nullptr;
 
 static struct {
-	HWND main_wnd;
-	HBITMAP dib_sect;
-	void *buffer_bits;
-	HPALETTE gdi_palette;
-	RECT update_rect;
-	int width;
-	int height;
-	int width_org;
-	int height_org;
-	bool fullscreen;
-	bool has_focus;
-	bool running;
+	HWND main_wnd;        ///< Handle to system window.
+	HBITMAP dib_sect;     ///< System bitmap object referencing our rendering buffer.
+	void *buffer_bits;    ///< Internal rendering buffer.
+	HPALETTE gdi_palette; ///< Palette object for 8bpp blitter.
+	RECT update_rect;     ///< Current dirty rect.
+	int width;            ///< Width in pixels of our display surface.
+	int height;           ///< Height in pixels of our display surface.
+	int width_org;        ///< Original monitor resolution width, before we changed it.
+	int height_org;       ///< Original monitor resolution height, before we changed it.
+	bool fullscreen;      ///< Whether to use (true) fullscreen mode.
+	bool has_focus;       ///< Does our window have system focus?
+	bool running;         ///< Is the main loop running?
 } _wnd;
 
 bool _force_full_redraw;
@@ -266,6 +266,8 @@ static void CALLBACK TrackMouseTimerProc(HWND hwnd, UINT msg, UINT_PTR event, DW
  */
 bool VideoDriver_Win32::MakeWindow(bool full_screen)
 {
+	/* full_screen is whether the new window should be fullscreen,
+	 * _wnd.fullscreen is whether the current window is. */
 	_fullscreen = full_screen;
 
 	/* recreate window? */

src/widgets/group_widget.h

@@ -14,6 +14,8 @@
 enum GroupListWidgets {
 	WID_GL_LIST_VEHICLE,             ///< List of the vehicles, this must be first, see: DirtyVehicleListWindowForVehicle
 	WID_GL_CAPTION,                  ///< Caption of the window.
+	WID_GL_GROUP_BY_ORDER,           ///< Group order.
+	WID_GL_GROUP_BY_DROPDOWN,        ///< Group by dropdown list.
 	WID_GL_SORT_BY_ORDER,            ///< Sort order.
 	WID_GL_SORT_BY_DROPDOWN,         ///< Sort by dropdown list.
 	WID_GL_FILTER_BY_CARGO,          ///< Filter vehicle by cargo type.

src/widgets/network_widget.h

@@ -14,8 +14,6 @@
 enum NetworkGameWidgets {
 	WID_NG_MAIN,               ///< Main panel.
 
-	WID_NG_CONNECTION,         ///< Label in front of connection droplist.
-	WID_NG_CONN_BTN,           ///< 'Connection' droplist button.
 	WID_NG_CLIENT_LABEL,       ///< Label in front of client name edit box.
 	WID_NG_CLIENT,             ///< Panel with editbox to set client name.
 	WID_NG_FILTER_LABEL,       ///< Label in front of the filter/search edit box.
@@ -45,7 +43,8 @@ enum NetworkGameWidgets {
 	WID_NG_NEWGRF_MISSING,     ///< 'Find missing NewGRF online' button.
 	WID_NG_NEWGRF_MISSING_SEL, ///< Selection widget for the above button.
 
-	WID_NG_FIND,               ///< 'Find server' button.
+	WID_NG_SEARCH_INTERNET,    ///< 'Search internet server' button.
+	WID_NG_SEARCH_LAN,         ///< 'Search LAN server' button.
 	WID_NG_ADD,                ///< 'Add server' button.
 	WID_NG_START,              ///< 'Start server' button.
 	WID_NG_CANCEL,             ///< 'Cancel' button.